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 @@ + package="com.nutomic.syncthingandroid" + android:versionCode="1" + android:versionName="0.1.0" > @@ -26,16 +26,14 @@ - - - - + android:name=".SettingsActivity" + android:label="@string/settings_title" > + + - + 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 { */ 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 { } 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 @@ Syncthing - + Waiting for GUI @@ -11,13 +11,13 @@ Generating keys. This may take a while. - - Exit + + Exit - - First Start + + First Start - + 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. - + - Settings + Settings Report Issue - - Open the Syncthing-Android issue tracker + + Open the Syncthing-Android issue tracker https://github.com/Nutomic/syncthing-android/issues - - Syncthing Version + + Syncthing Version - - Could not read version + + Could not read version 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 @@ + android:summary="@string/report_issue_summary"/> + style="?android:preferenceInformationStyle" />