nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-12-23 03:11:30 +00:00
Code Releases Activity

Formatting fixes.

Browse source
This commit is contained in:
Felix Ableitner 2014-05-14 17:08:19 +02:00
parent 95c2f7d98a
commit 3e8ef39322
5 changed files with 63 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
build.gradle
View file

@ -1,58 +1,54 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.9.0+' classpath 'com.android.tools.build:gradle:0.9.0+'
classpath 'com.alexvasilkov:android_sign:0.2' classpath 'com.alexvasilkov:android_sign:0.2'
} }
} }
apply plugin: 'android' apply plugin: 'android'
apply plugin: 'android_sign' apply plugin: 'android_sign'
repositories { repositories {
mavenCentral() mavenCentral()
maven {
url "http://4thline.org/m2"
}
} }
dependencies { dependencies {
compile 'com.android.support:support-v4:13.0.+' compile 'com.android.support:support-v4:13.0.+'
} }
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion "19.0.3" buildToolsVersion "19.0.3"
sourceSets { sourceSets {
main { main {
jniLibs.srcDir file("libs/") jniLibs.srcDir file("libs/")
jniLibs.srcDir file("obj/") jniLibs.srcDir file("obj/")
} }
} }
signingConfigs { signingConfigs {
release { release {
// Android Studio does not pass environment variables. // Android Studio does not pass environment variables.
// This means you have to use the command line for release builds. // This means you have to use the command line for release builds.
def ks = System.getenv("KEYSTORE") def ks = System.getenv("KEYSTORE")
def ka = System.getenv("KEY_ALIAS") def ka = System.getenv("KEY_ALIAS")
if (ks != null && ka != null) { if (ks != null && ka != null) {
storeFile file(ks) storeFile file(ks)
keyAlias ka keyAlias ka
} }
} }
} }
buildTypes { buildTypes {
debug { debug {
packageNameSuffix ".debug" packageNameSuffix ".debug"
debuggable true debuggable true
} }
release { release {
signingConfig signingConfigs.release signingConfig signingConfigs.release
} }
} }
} }

22
src/main/AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.nutomic.syncthingandroid" package="com.nutomic.syncthingandroid"
android:versionCode="1" android:versionCode="1"
android:versionName="0.1.0" > android:versionName="0.1.0" >
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19" /> <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19" />
@ -26,16 +26,14 @@
</activity> </activity>
<activity <activity
android:name=".SettingsActivity" android:name=".SettingsActivity"
android:label="@string/settings_title" > android:label="@string/settings_title" >
<meta-data
<meta-data android:name="android.support.PARENT_ACTIVITY"
android:name="android.support.PARENT_ACTIVITY" android:value=".WebGuiActivity" />
android:value=".WebGuiActivity" /> </activity>
</activity>
<service android:name=".service.SyncthingService" /> <service android:name=".service.SyncthingService" />
</application> </application>
</manifest> </manifest>

5
src/main/java/com/nutomic/syncthingandroid/service/GetTask.java
View file

@ -28,8 +28,8 @@ public class GetTask extends AsyncTask<String, Void, String> {
*/ */
public static final String URI_VERSION = SyncthingService.SYNCTHING_URL + "/rest/version"; public static final String URI_VERSION = SyncthingService.SYNCTHING_URL + "/rest/version";
@Override @Override
protected String doInBackground(String... uri) { protected String doInBackground(String... uri) {
HttpClient httpclient = new DefaultHttpClient(); HttpClient httpclient = new DefaultHttpClient();
HttpGet get = new HttpGet(uri[0]); HttpGet get = new HttpGet(uri[0]);
String responseString = null; String responseString = null;
@ -57,4 +57,5 @@ public class GetTask extends AsyncTask<String, Void, String> {
} }
return null; return null;
} }
} }

28
src/main/res/values/strings.xml
View file

@ -3,7 +3,7 @@
<string name="app_name">Syncthing</string> <string name="app_name">Syncthing</string>
<!-- WebGuiActivity --> <!-- WebGuiActivity -->
<!-- Text for WebGuiActivity loading view --> <!-- Text for WebGuiActivity loading view -->
<string name="web_gui_loading">Waiting for GUI</string> <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 --> <!-- 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> <string name="web_gui_creating_key">Generating keys. This may take a while.</string>
<!-- Menu item that stops Activity and Service --> <!-- Menu item that stops Activity and Service -->
<string name="exit">Exit</string> <string name="exit">Exit</string>
<!-- Title for dialog displayed on first start --> <!-- Title for dialog displayed on first start -->
<string name="welcome_title">First Start</string> <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\ <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\ 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 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. Please report any problems you encounter.
</string> </string>
<!-- SettingsActivity --> <!-- SettingsActivity -->
<string name="settings_title">Settings</string> <string name="settings_title">Settings</string>
<!-- Settings item that opens issue tracker --> <!-- Settings item that opens issue tracker -->
<string name="report_issue_title">Report Issue</string> <string name="report_issue_title">Report Issue</string>
<!-- Summary for the issue tracker settings item --> <!-- Summary for the issue tracker settings item -->
<string name="report_issue_summary">Open the Syncthing-Android issue tracker</string> <string name="report_issue_summary">Open the Syncthing-Android issue tracker</string>
<!-- URL of the issue tracker --> <!-- URL of the issue tracker -->
<string name="issue_tracker_url" translatable="false">https://github.com/Nutomic/syncthing-android/issues</string> <string name="issue_tracker_url" translatable="false">https://github.com/Nutomic/syncthing-android/issues</string>
<!-- Title of the preference showing upstream version name --> <!-- Title of the preference showing upstream version name -->
<string name="syncthing_version_title">Syncthing Version</string> <string name="syncthing_version_title">Syncthing Version</string>
<!-- Displayed instead of the version string if it could not be read --> <!-- Displayed instead of the version string if it could not be read -->
<string name="syncthing_version_error">Could not read version</string> <string name="syncthing_version_error">Could not read version</string>
</resources> </resources>

6
src/main/res/xml/settings.xml
View file

@ -4,11 +4,11 @@
<Preference <Preference
android:key="report_issue" android:key="report_issue"
android:title="@string/report_issue_title" android:title="@string/report_issue_title"
android:summary="@string/report_issue_summary"/> android:summary="@string/report_issue_summary"/>
<Preference <Preference
android:key="syncthing_version" android:key="syncthing_version"
android:title="@string/syncthing_version_title" android:title="@string/syncthing_version_title"
style="?android:preferenceInformationStyle" /> style="?android:preferenceInformationStyle" />
</PreferenceScreen> </PreferenceScreen>