From 3e8ef39322ff515677cb7e7ddc443a1a62dd9d71 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Wed, 14 May 2014 17:08:19 +0200
Subject: [PATCH] Formatting fixes.

---
 build.gradle                                  | 70 +++++++++----------
 src/main/AndroidManifest.xml                  | 22 +++---
 .../syncthingandroid/service/GetTask.java     |  5 +-
 src/main/res/values/strings.xml               | 28 ++++----
 src/main/res/xml/settings.xml                 |  6 +-
 5 files changed, 63 insertions(+), 68 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9ffff20e..6a43dc9b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,58 +1,54 @@
 buildscript {
-    repositories {
-        mavenCentral()
-    }
+	repositories {
+		mavenCentral()
+	}
 
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.9.0+'
-        classpath 'com.alexvasilkov:android_sign:0.2'
-    }
+	dependencies {
+		classpath 'com.android.tools.build:gradle:0.9.0+'
+		classpath 'com.alexvasilkov:android_sign:0.2'
+	}
 }
 
 apply plugin: 'android'
 apply plugin: 'android_sign'
 
 repositories {
-    mavenCentral()
-    maven {
-        url "http://4thline.org/m2"
-    }
+	mavenCentral()
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:13.0.+'
+	compile 'com.android.support:support-v4:13.0.+'
 }
 
-
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.0.3"
-    sourceSets {
+	compileSdkVersion 19
+	buildToolsVersion "19.0.3"
+	sourceSets {
 		main {
 			jniLibs.srcDir file("libs/")
 			jniLibs.srcDir file("obj/")
 		}
 	}
-    signingConfigs {
-        release {
-            // Android Studio does not pass environment variables.
-            // This means you have to use the command line for release builds.
-            def ks = System.getenv("KEYSTORE")
-            def ka = System.getenv("KEY_ALIAS")
-            if (ks != null && ka != null) {
-                storeFile file(ks)
-                keyAlias ka
-            }
-        }
-    }
+	signingConfigs {
+		release {
+			// Android Studio does not pass environment variables.
+			// This means you have to use the command line for release builds.
+			def ks = System.getenv("KEYSTORE")
+			def ka = System.getenv("KEY_ALIAS")
+			if (ks != null && ka != null) {
+				storeFile file(ks)
+				keyAlias ka
+			}
+		}
+	}
 
-    buildTypes {
-        debug {
-            packageNameSuffix ".debug"
-            debuggable true
-        }
-        release {
-            signingConfig signingConfigs.release
-        }
-    }
+	buildTypes {
+		debug {
+			packageNameSuffix ".debug"
+			debuggable true
+		}
+		release {
+			signingConfig signingConfigs.release
+		}
+	}
 }
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 5e601650..c7dd88dd 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.nutomic.syncthingandroid"
-	android:versionCode="1"
-	android:versionName="0.1.0" >
+		package="com.nutomic.syncthingandroid"
+		android:versionCode="1"
+		android:versionName="0.1.0" >
 
 	<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19" />
 
@@ -26,16 +26,14 @@
 		</activity>
 
 		<activity
-			android:name=".SettingsActivity"
-			android:label="@string/settings_title" >
-
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".WebGuiActivity" />
-
-        </activity>
+				android:name=".SettingsActivity"
+				android:label="@string/settings_title" >
+			<meta-data
+					android:name="android.support.PARENT_ACTIVITY"
+					android:value=".WebGuiActivity" />
+		</activity>
 
 		<service android:name=".service.SyncthingService" />
 
- 	</application>
+	</application>
 </manifest> 
diff --git a/src/main/java/com/nutomic/syncthingandroid/service/GetTask.java b/src/main/java/com/nutomic/syncthingandroid/service/GetTask.java
index 06d766b4..49d901c9 100644
--- a/src/main/java/com/nutomic/syncthingandroid/service/GetTask.java
+++ b/src/main/java/com/nutomic/syncthingandroid/service/GetTask.java
@@ -28,8 +28,8 @@ public class GetTask extends AsyncTask<String, Void, String> {
 	 */
 	public static final String URI_VERSION = SyncthingService.SYNCTHING_URL + "/rest/version";
 
-    @Override
-	 protected String doInBackground(String... uri) {
+	@Override
+	protected String doInBackground(String... uri) {
 		HttpClient httpclient = new DefaultHttpClient();
 		HttpGet get = new HttpGet(uri[0]);
 		String responseString = null;
@@ -57,4 +57,5 @@ public class GetTask extends AsyncTask<String, Void, String> {
 		}
 		return null;
 	}
+
 }
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f5589f9e..d7ba5d14 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
 
 	<string name="app_name">Syncthing</string>
 
-    <!-- WebGuiActivity -->
+	<!-- WebGuiActivity -->
 
 	<!-- Text for WebGuiActivity loading view -->
 	<string name="web_gui_loading">Waiting for GUI</string>
@@ -11,13 +11,13 @@
 	<!-- Shown instead of web_gui_loading if the key does not exist and has to be created -->
 	<string name="web_gui_creating_key">Generating keys. This may take a while.</string>
 
-    <!-- Menu item that stops Activity and Service -->
-    <string name="exit">Exit</string>
+	<!-- Menu item that stops Activity and Service -->
+	<string name="exit">Exit</string>
 
-    <!-- Title for dialog displayed on first start -->
-    <string name="welcome_title">First Start</string>
+	<!-- Title for dialog displayed on first start -->
+	<string name="welcome_title">First Start</string>
 
-    <!-- Text for dialog displayed on first start -->
+	<!-- Text for dialog displayed on first start -->
 	<string name="welcome_text">Welcome to Syncthing for Android!\n\n\
 This app is currently in Alpha state, and you may experience bugs, performance problems or data loss.\n\n\
 NOTE: At the moment, dynamic discovery does not work, you will have to hardcode all node IPs on at least one side.\n\n
@@ -25,23 +25,23 @@ There is currently no special handling for mobile data, so it may use up your da
 Please report any problems you encounter.
 	</string>
 
-    <!-- SettingsActivity -->
+	<!-- SettingsActivity -->
 
-    <string name="settings_title">Settings</string>
+	<string name="settings_title">Settings</string>
 
 	<!-- Settings item that opens issue tracker -->
 	<string name="report_issue_title">Report Issue</string>
 
-    <!-- Summary for the issue tracker settings item -->
-    <string name="report_issue_summary">Open the Syncthing-Android issue tracker</string>
+	<!-- Summary for the issue tracker settings item -->
+	<string name="report_issue_summary">Open the Syncthing-Android issue tracker</string>
 
 	<!-- URL of the issue tracker -->
 	<string name="issue_tracker_url" translatable="false">https://github.com/Nutomic/syncthing-android/issues</string>
 
-    <!-- Title of the preference showing upstream version name -->
-    <string name="syncthing_version_title">Syncthing Version</string>
+	<!-- Title of the preference showing upstream version name -->
+	<string name="syncthing_version_title">Syncthing Version</string>
 
-    <!-- Displayed instead of the version string if it could not be read -->
-    <string name="syncthing_version_error">Could not read version</string>
+	<!-- Displayed instead of the version string if it could not be read -->
+	<string name="syncthing_version_error">Could not read version</string>
 
 </resources>
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
index ab5c3204..aba5d7e7 100644
--- a/src/main/res/xml/settings.xml
+++ b/src/main/res/xml/settings.xml
@@ -4,11 +4,11 @@
 	<Preference
 		android:key="report_issue"
 		android:title="@string/report_issue_title"
-        android:summary="@string/report_issue_summary"/>
+		android:summary="@string/report_issue_summary"/>
 
 	<Preference
-        android:key="syncthing_version"
+		android:key="syncthing_version"
 		android:title="@string/syncthing_version_title"
-        style="?android:preferenceInformationStyle" />
+		style="?android:preferenceInformationStyle" />
 
 </PreferenceScreen>