From 20030f9ff34f50766e99237d4d4e29435460e041 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 25 Mar 2021 17:08:25 +0100 Subject: [PATCH] Disable double back by default --- app/src/main/java/eu/faircode/email/ActivityView.java | 2 +- app/src/main/java/eu/faircode/email/ApplicationEx.java | 3 +++ .../main/java/eu/faircode/email/FragmentOptionsBehavior.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index 7a88ae1bb6..c040456835 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -690,7 +690,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB super.onBackPressed(); else if (!backHandled()) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ActivityView.this); - boolean double_back = prefs.getBoolean("double_back", true); + boolean double_back = prefs.getBoolean("double_back", false); if (searching || !double_back) super.onBackPressed(); else { diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java index 7b173062f5..9352ea6798 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -461,6 +461,9 @@ public class ApplicationEx extends Application } else if (version < 1535) { editor.remove("identities_asked"); editor.remove("identities_primary_hint"); + } else if (version < 1539) { + if (!prefs.contains("double_back")) + editor.putBoolean("double_back", true); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java index 462877ab41..a9afd0fc5a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java @@ -436,7 +436,7 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); swSyncOnlaunch.setChecked(prefs.getBoolean("sync_on_launch", false)); - swDoubleBack.setChecked(prefs.getBoolean("double_back", true)); + swDoubleBack.setChecked(prefs.getBoolean("double_back", false)); swConversationActions.setChecked(prefs.getBoolean("conversation_actions", true)); swConversationActionsReplies.setChecked(prefs.getBoolean("conversation_actions_replies", true)); swConversationActionsReplies.setEnabled(swConversationActions.isChecked());