From abeae50ccc187e1c7ac4ffbab948bfe6c994b7ab Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 24 Jun 2022 22:53:26 +0200 Subject: [PATCH] Prevent crash --- .../main/java/eu/faircode/email/FragmentOptionsBehavior.java | 3 +++ .../main/java/eu/faircode/email/FragmentOptionsConnection.java | 2 ++ .../main/java/eu/faircode/email/FragmentOptionsDisplay.java | 3 +++ .../main/java/eu/faircode/email/FragmentOptionsEncryption.java | 2 ++ app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java | 3 +++ .../java/eu/faircode/email/FragmentOptionsNotifications.java | 3 +++ .../main/java/eu/faircode/email/FragmentOptionsPrivacy.java | 2 ++ app/src/main/java/eu/faircode/email/FragmentOptionsSend.java | 3 +++ .../java/eu/faircode/email/FragmentOptionsSynchronize.java | 3 +++ 9 files changed, 24 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java index 84f4a7e8ca..18fcc71167 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java @@ -50,6 +50,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.SwitchCompat; +import androidx.lifecycle.Lifecycle; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.preference.PreferenceManager; @@ -532,6 +533,8 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe private void setOptions() { if (getContext() == null) return; + if (getLifecycle().getCurrentState().equals(Lifecycle.State.DESTROYED)) + return; SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java b/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java index 3c26b2bd68..fd3582ff8a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java @@ -392,6 +392,8 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre private void setOptions() { if (getContext() == null) return; + if (getLifecycle().getCurrentState().equals(Lifecycle.State.DESTROYED)) + return; SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java index 070ec9c23e..41a834f7d1 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java @@ -52,6 +52,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.widget.SwitchCompat; import androidx.constraintlayout.widget.Group; import androidx.fragment.app.FragmentActivity; +import androidx.lifecycle.Lifecycle; import androidx.preference.PreferenceManager; import com.flask.colorpicker.ColorPickerView; @@ -1314,6 +1315,8 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer private void setOptions() { if (getContext() == null) return; + if (getLifecycle().getCurrentState().equals(Lifecycle.State.DESTROYED)) + return; SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java b/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java index 1663e061e0..419ecce3b5 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java @@ -598,6 +598,8 @@ public class FragmentOptionsEncryption extends FragmentBase private void setOptions() { if (getContext() == null) return; + if (getLifecycle().getCurrentState().equals(Lifecycle.State.DESTROYED)) + return; SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java index e03ab6b82e..7b11f65f7a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java @@ -70,6 +70,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.SwitchCompat; import androidx.cardview.widget.CardView; import androidx.constraintlayout.widget.Group; +import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Observer; import androidx.preference.PreferenceManager; @@ -1663,6 +1664,8 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc private void setOptions() { if (getContext() == null) return; + if (getLifecycle().getCurrentState().equals(Lifecycle.State.DESTROYED)) + return; SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java index 37b7b26b73..1aef3398a7 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java @@ -52,6 +52,7 @@ import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import androidx.appcompat.widget.SwitchCompat; import androidx.constraintlayout.widget.Group; +import androidx.lifecycle.Lifecycle; import androidx.preference.PreferenceManager; import java.util.List; @@ -661,6 +662,8 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared private void setOptions() { if (getContext() == null) return; + if (getLifecycle().getCurrentState().equals(Lifecycle.State.DESTROYED)) + 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 ce5c0f1f6c..b88d19b715 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java @@ -531,6 +531,8 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer private void setOptions() { if (getContext() == null) return; + if (getLifecycle().getCurrentState().equals(Lifecycle.State.DESTROYED)) + return; SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java index fbee4e50c0..a6ce6cdc92 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java @@ -46,6 +46,7 @@ import android.widget.Spinner; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.widget.SwitchCompat; +import androidx.lifecycle.Lifecycle; import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.preference.PreferenceManager; @@ -632,6 +633,8 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc private void setOptions() { if (getContext() == null) return; + if (getLifecycle().getCurrentState().equals(Lifecycle.State.DESTROYED)) + return; SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java index ed4eec6db2..0d62f229f3 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java @@ -47,6 +47,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.widget.SwitchCompat; import androidx.constraintlayout.widget.Group; import androidx.fragment.app.DialogFragment; +import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.Observer; import androidx.localbroadcastmanager.content.LocalBroadcastManager; @@ -556,6 +557,8 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr private void setOptions() { if (getContext() == null) return; + if (getLifecycle().getCurrentState().equals(Lifecycle.State.DESTROYED)) + return; SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); boolean pro = ActivityBilling.isPro(getContext());