Cleanup

app/src/main/java/eu/faircode/email/Core.java

@@ -3972,10 +3972,7 @@ class Core {
             message.tls = helper.getTLS();
             message.dkim = MessageHelper.getAuthentication("dkim", authentication);
             if (Boolean.TRUE.equals(message.dkim))
-                if (BuildConfig.DEBUG && dkim_verify)
-                    message.dkim = helper.verifyDKIM(context);
-                else
-                    message.dkim = helper.checkDKIMRequirements();
+                message.dkim = helper.checkDKIMRequirements();
             message.spf = MessageHelper.getAuthentication("spf", authentication);
             if (message.spf == null && helper.getSPF())
                 message.spf = true;

app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java

@@ -171,7 +171,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
     private SwitchCompat swLogarithmicBackoff;
     private SwitchCompat swExactAlarms;
     private SwitchCompat swInfra;
-    private SwitchCompat swDkimVerify;
     private SwitchCompat swDupMsgId;
     private SwitchCompat swTestIab;
     private Button btnImportProviders;
@@ -337,7 +336,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         swLogarithmicBackoff = view.findViewById(R.id.swLogarithmicBackoff);
         swExactAlarms = view.findViewById(R.id.swExactAlarms);
         swInfra = view.findViewById(R.id.swInfra);
-        swDkimVerify = view.findViewById(R.id.swDkimVerify);
         swDupMsgId = view.findViewById(R.id.swDupMsgId);
         swTestIab = view.findViewById(R.id.swTestIab);
         btnImportProviders = view.findViewById(R.id.btnImportProviders);
@@ -1138,14 +1136,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
             }
         });
 
-        swDkimVerify.setVisibility(BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
-        swDkimVerify.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("dkim_verify", checked).apply();
-            }
-        });
-
         swDupMsgId.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -1737,7 +1727,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         swLogarithmicBackoff.setChecked(prefs.getBoolean("logarithmic_backoff", true));
         swExactAlarms.setChecked(prefs.getBoolean("exact_alarms", true));
         swInfra.setChecked(prefs.getBoolean("infra", false));
-        swDkimVerify.setChecked(prefs.getBoolean("dkim_verify", false));
         swDupMsgId.setChecked(prefs.getBoolean("dup_msgids", false));
         swTestIab.setChecked(prefs.getBoolean("test_iab", false));
 

app/src/main/java/eu/faircode/email/MessageHelper.java

@@ -1868,10 +1868,6 @@ public class MessageHelper {
         return true;
     }
 
-    boolean verifyDKIM(Context context) throws MessagingException {
-        return true;
-    }
-
     Address[] getMailFrom(String[] headers) {
         if (headers == null)
             return null;

app/src/main/res/layout/fragment_options_misc.xml

@@ -1356,17 +1356,6 @@
                     app:srcCompat="@drawable/infra_zoho"
                     tools:ignore="MissingConstraints" />
 
-                <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/swDkimVerify"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:text="@string/title_advanced_dkim_verify"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/flowInfra"
-                    app:switchPadding="12dp" />
-
                 <eu.faircode.email.FixedTextView
                     android:id="@+id/tvDkimVerifyHint"
                     android:layout_width="0dp"
@@ -1378,7 +1367,7 @@
                     android:textStyle="italic"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swDkimVerify" />
+                    app:layout_constraintTop_toBottomOf="@id/flowInfra" />
 
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/swDupMsgId"

app/src/main/res/values/strings.xml

@@ -742,7 +742,6 @@
     <string name="title_advanced_empty_pool" translatable="false">Empty connection pool</string>
     <string name="title_advanced_exact_alarms" translatable="false">Use exact timers</string>
     <string name="title_advanced_infra" translatable="false">Show infrastructure</string>
-    <string name="title_advanced_dkim_verify" translatable="false">DKIM verification</string>
     <string name="title_advanced_dup_msgid" translatable="false">Duplicates by message ID</string>
     <string name="title_advanced_test_iab" translatable="false">Test IAB</string>
     <string name="title_advanced_import_providers" translatable="false">Import providers</string>