mirror of
https://github.com/syncthing/syncthing-android.git
synced 2024-11-26 14:21:16 +00:00
Removed exit button (closes #6).
This has become useless, as the service would be automatically restarted whenever a network/battery/boot intent is received.
This commit is contained in:
parent
b0006db5c8
commit
6eeb161036
3 changed files with 4 additions and 12 deletions
|
@ -285,11 +285,6 @@ public class MainActivity extends ActionBarActivity
|
||||||
case R.id.settings:
|
case R.id.settings:
|
||||||
startActivity(new Intent(this, SettingsActivity.class));
|
startActivity(new Intent(this, SettingsActivity.class));
|
||||||
return true;
|
return true;
|
||||||
case R.id.exit:
|
|
||||||
// Make sure we unbind first.
|
|
||||||
finish();
|
|
||||||
getApplicationContext().stopService(new Intent(this, SyncthingService.class));
|
|
||||||
return true;
|
|
||||||
default:
|
default:
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,8 +29,4 @@
|
||||||
android:id="@+id/settings"
|
android:id="@+id/settings"
|
||||||
android:title="@string/settings_title" />
|
android:title="@string/settings_title" />
|
||||||
|
|
||||||
<item
|
|
||||||
android:id="@+id/exit"
|
|
||||||
android:title="@string/exit" />
|
|
||||||
|
|
||||||
</menu>
|
</menu>
|
||||||
|
|
|
@ -176,9 +176,6 @@ Please install a scanner or enter the node ID manually.</string>
|
||||||
<!-- 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 -->
|
|
||||||
<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>
|
||||||
|
|
||||||
|
@ -241,8 +238,12 @@ If this error persists, try reinstalling the app and restarting your device.\n\n
|
||||||
<!-- Message of the "syncthing disabled" dialog -->
|
<!-- Message of the "syncthing disabled" dialog -->
|
||||||
<string name="syncthing_disabled_message">Do you want to change your preferences?</string>
|
<string name="syncthing_disabled_message">Do you want to change your preferences?</string>
|
||||||
|
|
||||||
|
<!-- Button text on the "syncthing disabled" dialog -->
|
||||||
<string name="syncthing_disabled_change_settings">Change Settings</string>
|
<string name="syncthing_disabled_change_settings">Change Settings</string>
|
||||||
|
|
||||||
|
<!-- Button text on the "syncthing disabled" dialog -->
|
||||||
|
<string name="exit">Exit</string>
|
||||||
|
|
||||||
<!-- RestApi -->
|
<!-- RestApi -->
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue