From 61b78fe6fe1055936feda6b1797638835cdf323a Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 30 Jul 2023 07:25:32 +0200 Subject: [PATCH] Auto hide answer disabled by default --- app/src/main/java/eu/faircode/email/ApplicationEx.java | 3 +++ .../main/java/eu/faircode/email/FragmentMessages.java | 9 ++++----- .../java/eu/faircode/email/FragmentOptionsBehavior.java | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java index c25817882e..a552d49406 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -730,6 +730,9 @@ public class ApplicationEx extends Application if (override_width) editor.putBoolean("overview_mode", true); editor.remove("override_width"); + } else if (version < 2089){ + if (!prefs.contains("auto_hide_answer")) + editor.putBoolean("auto_hide_answer", !Helper.isAccessibilityEnabled(context)); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 6348570e30..3df3e13f17 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -503,7 +503,7 @@ public class FragmentMessages extends FragmentBase quick_scroll = prefs.getBoolean("quick_scroll", true); addresses = prefs.getBoolean("addresses", false); hide_attachments = prefs.getBoolean("hide_attachments", false); - auto_hide_answer = prefs.getBoolean("auto_hide_answer", !accessibility); + auto_hide_answer = prefs.getBoolean("auto_hide_answer", false); swipe_reply = prefs.getBoolean("swipe_reply", false); quick_actions = prefs.getBoolean("quick_actions", true); @@ -7386,10 +7386,9 @@ public class FragmentMessages extends FragmentBase if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) return; - if (!accessibility && - (viewType == AdapterMessage.ViewType.UNIFIED || - viewType == AdapterMessage.ViewType.FOLDER)) - if (scrolling) + if (viewType == AdapterMessage.ViewType.UNIFIED || + viewType == AdapterMessage.ViewType.FOLDER) + if (auto_hide_answer && scrolling && !accessibility) fabCompose.hide(); else fabCompose.show(); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java index 4b3a9a7a5e..9efb716e71 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java @@ -732,7 +732,7 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe swAutoImportant.setChecked(prefs.getBoolean("auto_important", false)); swResetSnooze.setChecked(prefs.getBoolean("reset_snooze", true)); swAutoBlockSender.setChecked(prefs.getBoolean("auto_block_sender", true)); - swAutoHideAnswer.setChecked(prefs.getBoolean("auto_hide_answer", !accessibility)); + swAutoHideAnswer.setChecked(prefs.getBoolean("auto_hide_answer", false)); swSwipeReply.setChecked(prefs.getBoolean("swipe_reply", false)); swMoveThreadAll.setChecked(prefs.getBoolean("move_thread_all", false));