From 8424ac076d80565f8a67f73a1ed0b9844aa7be51 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 13 Jul 2023 07:57:01 +0200 Subject: [PATCH] Debug: MDN switch --- app/src/main/java/eu/faircode/email/Core.java | 3 ++- .../java/eu/faircode/email/FragmentOptionsMisc.java | 12 +++++++++++- app/src/main/res/layout/fragment_options_misc.xml | 13 ++++++++++++- app/src/main/res/values/strings.xml | 1 + 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 0f849921b4..6d88c8d65e 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -4277,6 +4277,7 @@ class Core { boolean notify_known = prefs.getBoolean("notify_known", false); boolean native_dkim = prefs.getBoolean("native_dkim", false); boolean experiments = prefs.getBoolean("experiments", false); + boolean mdn = prefs.getBoolean("mdn", experiments); boolean pro = ActivityBilling.isPro(context); long uid = ifolder.getUID(imessage); @@ -4614,7 +4615,7 @@ class Core { List
headers = (needsHeaders ? helper.getAllHeaders() : null); String body = (needsBody ? parts.getHtml(context, download_plain) : null); - if (experiments && helper.isReport()) + if (mdn && helper.isReport()) try { MessageHelper.Report r = parts.getReport(); boolean client_id = prefs.getBoolean("client_id", true); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java index 7023222b9f..edc5f023c1 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java @@ -239,6 +239,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc private SwitchCompat swTldFlags; private SwitchCompat swDupMsgId; private SwitchCompat swThreadByRef; + private SwitchCompat swMdn; private EditText etKeywords; private SwitchCompat swTestIab; private Button btnImportProviders; @@ -301,7 +302,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc "max_backoff_power", "logarithmic_backoff", "exact_alarms", "native_dkim", "native_arc", "native_arc_whitelist", - "infra", "tld_flags", "dup_msgids", "thread_byref", "global_keywords", "test_iab" + "infra", "tld_flags", "dup_msgids", "thread_byref", "mdn", "global_keywords", "test_iab" }; private final static String[] RESET_QUESTIONS = new String[]{ @@ -488,6 +489,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc swTldFlags = view.findViewById(R.id.swTldFlags); swDupMsgId = view.findViewById(R.id.swDupMsgId); swThreadByRef = view.findViewById(R.id.swThreadByRef); + swMdn = view.findViewById(R.id.swMdn); etKeywords = view.findViewById(R.id.etKeywords); swTestIab = view.findViewById(R.id.swTestIab); btnImportProviders = view.findViewById(R.id.btnImportProviders); @@ -1847,6 +1849,13 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc } }); + swMdn.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { + prefs.edit().putBoolean("mdn", checked).apply(); + } + }); + etKeywords.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { @@ -2592,6 +2601,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc swTldFlags.setChecked(prefs.getBoolean("tld_flags", false)); swDupMsgId.setChecked(prefs.getBoolean("dup_msgids", false)); swThreadByRef.setChecked(prefs.getBoolean("thread_byref", true)); + swMdn.setChecked(prefs.getBoolean("mdn", swExperiments.isChecked())); etKeywords.setText(prefs.getString("global_keywords", null)); swTestIab.setChecked(prefs.getBoolean("test_iab", false)); diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml index 6fc21eddb7..8a4a4e446f 100644 --- a/app/src/main/res/layout/fragment_options_misc.xml +++ b/app/src/main/res/layout/fragment_options_misc.xml @@ -2272,6 +2272,17 @@ app:layout_constraintTop_toBottomOf="@id/swDupMsgId" app:switchPadding="12dp" /> + + + app:layout_constraintTop_toBottomOf="@id/swMdn" /> Show TLD flags Duplicates by message ID Thread by common reference + Process MDNs Global keywords Test IAB Import providers