diff options
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/settings.xml | 6 | ||||
| -rw-r--r-- | src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java | 2 | ||||
| -rw-r--r-- | src/github/daneren2005/dsub/util/Constants.java | 1 | ||||
| -rw-r--r-- | src/github/daneren2005/dsub/util/Util.java | 5 |
5 files changed, 15 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 85c94dcf..bcd4917a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -427,6 +427,8 @@ <string name="settings.menu_options.rate_summary">Show Rating in menus</string>
<string name="settings.browse_by_tags">Browse By Tags</string>
<string name="settings.browse_by_tags_summary">Browse by tags instead of by folder structure. Requires Subsonic 4.7+</string>
+ <string name="settings.disable_exit_prompt">Disable Exit Prompt</string>
+ <string name="settings.disable_exit_prompt_summary">Exit the app immediately upon pressing back from the home screen</string>
<string name="settings.override_system_language">Override System Language</string>
<string name="settings.override_system_language_summary">Display app in english even if the system language is something DSub has a translation for. May need to clear the app from memory for changes to take affect.</string>
<string name="settings.drawer_items_title">Drawer Tabs</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 91b9ea1a..4179f0a8 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -64,6 +64,12 @@ android:entries="@array/defaultDrawerItems" android:defaultValue="Home"/> + <CheckBoxPreference + android:title="@string/settings.disable_exit_prompt" + android:summary="@string/settings.disable_exit_prompt_summary" + android:key="disableExitPrompt" + android:defaultValue="false"/> + <CheckBoxPreference android:title="@string/settings.override_system_language" android:summary="@string/settings.override_system_language_summary" diff --git a/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java b/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java index 791fa1c6..74329dd0 100644 --- a/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java +++ b/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java @@ -362,7 +362,7 @@ public class SubsonicFragmentActivity extends SubsonicActivity { @Override
public void onBackPressed() {
if(onBackPressedSupport()) {
- if(lastBackPressTime < (System.currentTimeMillis() - 4000)) {
+ if(!Util.disableExitPrompt(this) && lastBackPressTime < (System.currentTimeMillis() - 4000)) {
lastBackPressTime = System.currentTimeMillis();
Util.toast(this, R.string.main_back_confirm);
} else {
diff --git a/src/github/daneren2005/dsub/util/Constants.java b/src/github/daneren2005/dsub/util/Constants.java index b0bbfe31..0102aba1 100644 --- a/src/github/daneren2005/dsub/util/Constants.java +++ b/src/github/daneren2005/dsub/util/Constants.java @@ -153,6 +153,7 @@ public final class Constants { public static final String PREFERENCES_KEY_REPLAY_GAIN_TYPE= "replayGainType"; public static final String PREFERENCES_KEY_ALBUMS_PER_FOLDER = "albumsPerFolder"; public static final String PREFERENCES_KEY_CAST_PROXY = "castProxy"; + public static final String PREFERENCES_KEY_DISABLE_EXIT_PROMPT = "disableExitPrompt"; public static final String OFFLINE_SCROBBLE_COUNT = "scrobbleCount"; public static final String OFFLINE_SCROBBLE_ID = "scrobbleID"; diff --git a/src/github/daneren2005/dsub/util/Util.java b/src/github/daneren2005/dsub/util/Util.java index d23d7300..4d2a9a1a 100644 --- a/src/github/daneren2005/dsub/util/Util.java +++ b/src/github/daneren2005/dsub/util/Util.java @@ -424,6 +424,11 @@ public final class Util { return prefs.getString(Constants.PREFERENCES_KEY_OPEN_TO_TAB, null); } + public static boolean disableExitPrompt(Context context) { + SharedPreferences prefs = getPreferences(context); + return prefs.getBoolean(Constants.PREFERENCES_KEY_DISABLE_EXIT_PROMPT, false); + } + public static String getVideoPlayerType(Context context) { SharedPreferences prefs = getPreferences(context); return prefs.getString(Constants.PREFERENCES_KEY_VIDEO_PLAYER, "raw"); |