From a9ab8765254991cf40819213b1071c5c1303fe87 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 24 Dec 2020 08:38:15 +0100 Subject: [PATCH] Removed check reply setting --- app/src/main/java/eu/faircode/email/Core.java | 29 +++++++++---------- .../email/FragmentOptionsSynchronize.java | 12 +------- .../layout/fragment_options_synchronize.xml | 25 +--------------- app/src/main/res/values/strings.xml | 2 -- 4 files changed, 15 insertions(+), 53 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index abeaf73cea..59e3653b9b 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -2867,6 +2867,19 @@ class Core { if (message.avatar == null && notify_known && pro) message.ui_ignored = true; + // For contact forms + boolean self = false; + if (identity != null && message.from != null) + for (Address from : message.from) + if (identity.sameAddress(from) || identity.similarAddress(from)) { + self = true; + break; + } + if (!self) { + String warning = message.checkReplyDomain(context); + message.reply_domain = (warning == null); + } + boolean check_mx = prefs.getBoolean("check_mx", false); if (check_mx) try { @@ -2882,22 +2895,6 @@ class Core { message.warning = Log.formatThrowable(ex, false); } - boolean check_reply = prefs.getBoolean("check_reply", false); - if (check_reply) { - // For contact forms - boolean self = false; - if (identity != null && message.from != null) - for (Address from : message.from) - if (identity.sameAddress(from) || identity.similarAddress(from)) { - self = true; - break; - } - if (!self) { - String warning = message.checkReplyDomain(context); - message.reply_domain = (warning == null); - } - } - boolean check_spam = prefs.getBoolean("check_spam", false); if (check_spam) { String host = helper.getReceivedFromHost(); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java index f2a639cd3c..dd698c6ba7 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java @@ -83,7 +83,6 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr private SwitchCompat swSubscriptions; private SwitchCompat swSyncSubscribed; private SwitchCompat swCheckMx; - private SwitchCompat swCheckReply; private SwitchCompat swTuneKeepAlive; private Group grpExempted; @@ -93,7 +92,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr "enabled", "poll_interval", "auto_optimize", "schedule", "schedule_start", "schedule_end", "sync_nodate", "sync_unseen", "sync_flagged", "delete_unseen", "sync_kept", "gmail_thread_id", "sync_folders", "sync_shared_folders", "subscriptions", "sync_subscribed", - "check_mx", "check_reply", "tune_keep_alive" + "check_mx", "tune_keep_alive" }; @Override @@ -138,7 +137,6 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr swSubscriptions = view.findViewById(R.id.swSubscriptions); swSyncSubscribed = view.findViewById(R.id.swSyncSubscribed); swCheckMx = view.findViewById(R.id.swCheckMx); - swCheckReply = view.findViewById(R.id.swCheckReply); swTuneKeepAlive = view.findViewById(R.id.swTuneKeepAlive); grpExempted = view.findViewById(R.id.grpExempted); @@ -328,13 +326,6 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr } }); - swCheckReply.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { - prefs.edit().putBoolean("check_reply", checked).apply(); - } - }); - swTuneKeepAlive.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { @@ -433,7 +424,6 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr swSyncSubscribed.setChecked(prefs.getBoolean("sync_subscribed", false)); swSyncSubscribed.setEnabled(swSubscriptions.isChecked()); swCheckMx.setChecked(prefs.getBoolean("check_mx", false)); - swCheckReply.setChecked(prefs.getBoolean("check_reply", false)); swTuneKeepAlive.setChecked(prefs.getBoolean("tune_keep_alive", true)); } diff --git a/app/src/main/res/layout/fragment_options_synchronize.xml b/app/src/main/res/layout/fragment_options_synchronize.xml index cc810396ab..3050bd5c47 100644 --- a/app/src/main/res/layout/fragment_options_synchronize.xml +++ b/app/src/main/res/layout/fragment_options_synchronize.xml @@ -525,29 +525,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvCheckMxHint" /> - - - - Manage folder subscriptions Automatically synchronize subscribed folders Check sender email addresses on synchronizing messages - Check reply email addresses on synchronizing messages Automatically tune the keep-alive interval Show keyboard by default @@ -553,7 +552,6 @@ Disabling this will reduce data and battery usage somewhat, but will disable updating the list of folders too This will check if DNS MX records exist This will slow down synchronizing messages - This will check if domain name of the sender and reply addresses are the same In addition to contacts provided by Android. Contact data will be stored for newly sent or received messages only when enabled. Insert \'-- \' between the text and the signature