From ae4e9dc18d440c49a34d88bf49f86c06dd85788b Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 8 Jan 2025 08:58:10 +0100 Subject: [PATCH] Disable thread by reference by default for Play Store version --- app/src/main/java/eu/faircode/email/ApplicationEx.java | 3 +++ app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java | 2 +- app/src/main/java/eu/faircode/email/MessageHelper.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 3e6741b974..b32ac70da0 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -1067,6 +1067,9 @@ public class ApplicationEx extends Application editor.putBoolean("beige", false); } + if (version < 2259) + editor.putBoolean("thread_byref", true); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG) editor.remove("background_service"); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java index 2d3607ca16..d22fadea8c 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java @@ -2617,7 +2617,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc swTldFlags.setChecked(prefs.getBoolean("tld_flags", false)); swJsonLd.setChecked(prefs.getBoolean("json_ld", false)); swDupMsgId.setChecked(prefs.getBoolean("dup_msgids", false)); - swThreadByRef.setChecked(prefs.getBoolean("thread_byref", true)); + swThreadByRef.setChecked(prefs.getBoolean("thread_byref", !Helper.isPlayStoreInstall())); swSaveUserFlags.setChecked(prefs.getBoolean("save_user_flags", false)); swMdn.setChecked(prefs.getBoolean("mdn", swExperiments.isChecked())); swAppChooser.setChecked(prefs.getBoolean("app_chooser", false)); diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 3862b83c3a..2f81f030b4 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -1940,7 +1940,7 @@ public class MessageHelper { } // Common reference - boolean thread_byref = prefs.getBoolean("thread_byref", true); + boolean thread_byref = prefs.getBoolean("thread_byref", !Helper.isPlayStoreInstall()); if (thread == null && refs.size() > 0 && thread_byref) { // For example // Message-ID: