From 8f788a7221d65cccdab2352bc42fe32757fad939 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 5 Mar 2023 20:32:32 +0100 Subject: [PATCH] Small behavior change --- app/src/main/java/eu/faircode/email/FragmentMessages.java | 6 +++--- .../java/eu/faircode/email/FragmentOptionsBehavior.java | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 1dbc2d9cbe..6b6775ac02 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -486,6 +486,8 @@ public class FragmentMessages extends FragmentBase if (folder > 0 && thread == null && type == null && criteria == null) Log.e("Messages for folder without type"); + accessibility = Helper.isAccessibilityEnabled(getContext()); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); hide_toolbar = prefs.getBoolean("hide_toolbar", !BuildConfig.PLAY_STORE_RELEASE); @@ -511,7 +513,7 @@ public class FragmentMessages extends FragmentBase onclose = (autoclose ? null : prefs.getString("onclose", null)); quick_scroll = prefs.getBoolean("quick_scroll", true); addresses = prefs.getBoolean("addresses", false); - auto_hide_answer = prefs.getBoolean("auto_hide_answer", true); + auto_hide_answer = prefs.getBoolean("auto_hide_answer", !accessibility); swipe_reply = prefs.getBoolean("swipe_reply", false); quick_actions = prefs.getBoolean("quick_actions", true); @@ -520,8 +522,6 @@ public class FragmentMessages extends FragmentBase colorSeparator = Helper.resolveColor(getContext(), R.attr.colorSeparator); colorWarning = Helper.resolveColor(getContext(), R.attr.colorWarning); - accessibility = Helper.isAccessibilityEnabled(getContext()); - if (criteria == null) if (thread == null) { if (folder < 0) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java index cb2f3b89fb..6890c4c0fe 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java @@ -112,6 +112,8 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe private Button btnDefaultFolder; private TextView tvDefaultFolder; + private boolean accessibility; + final static int MAX_SWIPE_SENSITIVITY = 10; final static int DEFAULT_SWIPE_SENSITIVITY = 7; @@ -189,6 +191,8 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe btnDefaultFolder = view.findViewById(R.id.btnDefaultFolder); tvDefaultFolder = view.findViewById(R.id.tvDefaultFolder); + accessibility = Helper.isAccessibilityEnabled(getContext()); + setOptions(); // Wire controls @@ -714,7 +718,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", true)); + swAutoHideAnswer.setChecked(prefs.getBoolean("auto_hide_answer", !accessibility)); swSwipeReply.setChecked(prefs.getBoolean("swipe_reply", false)); tvDefaultFolder.setText(prefs.getString("default_folder", null)); }