From 90009955c50849043eba38b1d9491f4717597324 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 20 Jan 2021 14:03:14 +0100 Subject: [PATCH] Disable auto scroll by default --- app/src/main/java/eu/faircode/email/ApplicationEx.java | 3 +++ app/src/main/java/eu/faircode/email/FragmentMessages.java | 2 +- .../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/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java index 062400a8bf..8dcf97ca90 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -401,6 +401,9 @@ public class ApplicationEx extends Application } else if (version < 1461) { if (!prefs.contains("theme")) editor.putString("theme", "blue_orange_light"); + } else if (version < 1463) { + if (!prefs.contains("autoscroll")) + editor.putBoolean("autoscroll", true); } 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 3ee8f57895..e22f8afda6 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -4647,7 +4647,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. return; } else { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); - boolean autoscroll = prefs.getBoolean("autoscroll", true); + boolean autoscroll = prefs.getBoolean("autoscroll", false); if (autoscroll) { ActivityView activity = (ActivityView) getActivity(); if (activity != null && diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java index f0d28aefaa..05a54e42d4 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java @@ -445,7 +445,7 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe etDefaultSnooze.setHint("1"); swPull.setChecked(prefs.getBoolean("pull", true)); - swAutoScroll.setChecked(prefs.getBoolean("autoscroll", true)); + swAutoScroll.setChecked(prefs.getBoolean("autoscroll", false)); swQuickFilter.setChecked(prefs.getBoolean("quick_filter", false)); swQuickScroll.setChecked(prefs.getBoolean("quick_scroll", true));