From d39f70867ffad0205cce2c41500d495f147ce5df Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 9 Dec 2020 18:17:19 +0100 Subject: [PATCH] Prevent restart --- app/src/main/java/eu/faircode/email/ActivitySetup.java | 8 ++++++-- app/src/main/java/eu/faircode/email/ApplicationEx.java | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java index 20ac359ba2..ef27307cbf 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySetup.java +++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java @@ -965,8 +965,12 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) continue; - if ("language".equals(key)) - continue; // language might not be supported + // Prevent restart + if ("secure".equals(key) || + "shortcuts".equals(key) || + "language".equals(key) || + "query_threads".equals(key)) + continue; if (key != null && key.startsWith("widget.")) continue; diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java index 0dfdfe0782..cb34df4c09 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -189,6 +189,7 @@ public class ApplicationEx extends Application implements SharedPreferences.OnSh case "shortcuts": // misc case "language": // misc case "query_threads": // misc + // Should be excluded for import restart(); break; }