From 16a494120a61d906d93392252daf9909bdd5334f Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 13 Jun 2022 13:28:29 +0200 Subject: [PATCH] Prevent crash --- .../faircode/email/FragmentOptionsBehavior.java | 6 ++++-- .../faircode/email/FragmentOptionsConnection.java | 6 ++++-- .../eu/faircode/email/FragmentOptionsDisplay.java | 6 ++++-- .../faircode/email/FragmentOptionsEncryption.java | 6 ++++-- .../eu/faircode/email/FragmentOptionsMisc.java | 15 ++++++++++----- .../email/FragmentOptionsNotifications.java | 6 ++++-- .../eu/faircode/email/FragmentOptionsPrivacy.java | 6 ++++-- .../eu/faircode/email/FragmentOptionsSend.java | 6 ++++-- .../email/FragmentOptionsSynchronize.java | 6 ++++-- 9 files changed, 42 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java index 98d1b4d61c..704e5a8425 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java @@ -500,8 +500,7 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe if ("default_snooze".equals(key)) return; - if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) - setOptions(); + setOptions(); } @Override @@ -520,6 +519,9 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe } private void setOptions() { + if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) + return; + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); swSyncOnlaunch.setChecked(prefs.getBoolean("sync_on_launch", false)); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java b/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java index d26ada4084..cded76b827 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java @@ -345,8 +345,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre if ("timeout".equals(key)) return; - if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) - setOptions(); + setOptions(); } @Override @@ -391,6 +390,9 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre } private void setOptions() { + if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) + return; + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); swMetered.setChecked(prefs.getBoolean("metered", true)); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java index e3087c395e..fea3b99c07 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java @@ -1289,8 +1289,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer if ("message_zoom".equals(key)) return; - if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) - setOptions(); + setOptions(); } @Override @@ -1314,6 +1313,9 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer } private void setOptions() { + if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) + return; + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); String startup = prefs.getString("startup", "unified"); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java b/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java index 6b3dba2d43..af0766ab3d 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java @@ -577,8 +577,7 @@ public class FragmentOptionsEncryption extends FragmentBase @Override public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { - if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) - setOptions(); + setOptions(); } @Override @@ -597,6 +596,9 @@ public class FragmentOptionsEncryption extends FragmentBase } private void setOptions() { + if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) + return; + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); swSign.setChecked(prefs.getBoolean("sign_default", false)); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java index ab7bfe85cf..09b507b1e1 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java @@ -1559,11 +1559,10 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc @Override public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { - if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) { - setOptions(); - if ("last_cleanup".equals(key)) - setLastCleanup(prefs.getLong(key, -1)); - } + if ("last_cleanup".equals(key)) + setLastCleanup(prefs.getLong(key, -1)); + + setOptions(); } @Override @@ -1662,6 +1661,9 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc } private void setOptions() { + if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) + return; + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); ActivityManager am = Helper.getSystemService(getContext(), ActivityManager.class); @@ -1872,6 +1874,9 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc } private void setLastCleanup(long time) { + if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) + return; + java.text.DateFormat DTF = Helper.getDateTimeInstance(getContext()); tvLastCleanup.setText( getString(R.string.title_advanced_last_cleanup, diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java index b037d1cb1f..6e5912fe81 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java @@ -629,8 +629,7 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared @Override public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { - if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) - setOptions(); + setOptions(); } @Override @@ -649,6 +648,9 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared } private void setOptions() { + if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) + return; + boolean pro = ActivityBilling.isPro(getContext()); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java index 012dfda60c..63ab0d0a13 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java @@ -519,8 +519,7 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer @Override public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { - if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) - setOptions(); + setOptions(); } @Override @@ -539,6 +538,9 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer } private void setOptions() { + if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) + return; + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); swConfirmLinks.setChecked(prefs.getBoolean("confirm_links", true)); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java index 5c98a203cf..41f711db66 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java @@ -612,8 +612,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc @Override public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { - if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) - setOptions(); + setOptions(); } @Override @@ -632,6 +631,9 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc } private void setOptions() { + if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) + return; + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); swKeyboard.setChecked(prefs.getBoolean("keyboard", true)); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java index 50f86a8698..76e01c3605 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java @@ -530,8 +530,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr @Override public void onSharedPreferenceChanged(SharedPreferences prefs, String key) { - if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) - setOptions(); + setOptions(); } @Override @@ -556,6 +555,9 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr } private void setOptions() { + if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) + return; + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); boolean pro = ActivityBilling.isPro(getContext());