nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-26 22:31:16 +00:00
Code Releases Activity

Add option to start directly into web gui (fixes #578)

Browse source
This commit is contained in:
Felix Ableitner 2017-09-04 02:01:24 +09:00
parent f2071be81c
commit 3ddf526679
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/com/nutomic/syncthingandroid/activities/FirstStartActivity.java
View file

@ -60,11 +60,18 @@ public class FirstStartActivity extends Activity implements Button.OnClickListen
if (isFirstStart) {
mPreferences.edit().putBoolean("first_start", false).apply();
}
Intent intent = new Intent(this, MainActivity.class);
intent.putExtra(MainActivity.EXTRA_FIRST_START, isFirstStart);
startActivity(intent);
finish();
// In case start_into_web_gui option is enabled, start both activities so that back
// navigation works as expected.
Intent mainIntent = new Intent(this, MainActivity.class);
mainIntent.putExtra(MainActivity.EXTRA_FIRST_START, isFirstStart);
Intent webIntent = new Intent(this, WebGuiActivity.class);
if (mPreferences.getBoolean("start_into_web_gui", false)) {
startActivities(new Intent[] {mainIntent, webIntent});
} else {
startActivity(mainIntent);
}
finish();
}
private boolean haveStoragePermission() {

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

@ -277,6 +277,10 @@ Please report any problems you encounter via Github.</string>
<string name="preference_language_summary">Change the app language</string>
<string name="start_into_web_gui_title">Start directly into web GUI</string>
<string name="start_into_web_gui_summary">When starting the app, open web GUI instead of the main screen</string>
<string name="pref_language_default">Default Language</string>
<string-array name="versioning_types">

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

@ -54,6 +54,12 @@
android:title="@string/preference_language_title"
android:summary="@string/preference_language_summary" />
<CheckBoxPreference
android:key="start_into_web_gui"
android:title="@string/start_into_web_gui_title"
android:summary="@string/start_into_web_gui_summary"
android:defaultValue="false"/>
</PreferenceScreen>
<PreferenceScreen