Default dark html on confirm html only

4 years ago · bce3ed511b
parent 4e9ee66b34
commit bce3ed511b
2 changed files with 4 additions and 2 deletions
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@ -3741,7 +3741,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                CheckBox cbDark = dview.findViewById(R.id.cbDark);
                CheckBox cbAlwaysImages = dview.findViewById(R.id.cbAlwaysImages);

-                cbDark.setChecked(prefs.getBoolean("html_dark", true));
+                boolean confirm_html = prefs.getBoolean("confirm_html", true);
+                cbDark.setChecked(prefs.getBoolean("html_dark", confirm_html));
                cbAlwaysImages.setChecked(prefs.getBoolean("html_always_images", false));

                cbDark.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
--- a/app/src/main/java/eu/faircode/email/WebViewEx.java
+++ b/app/src/main/java/eu/faircode/email/WebViewEx.java
@ -49,7 +49,8 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
        boolean overview_mode = prefs.getBoolean("overview_mode", false);
        boolean safe_browsing = prefs.getBoolean("safe_browsing", false);
-        boolean html_dark = prefs.getBoolean("html_dark", true);
+        boolean confirm_html = prefs.getBoolean("confirm_html", true);
+        boolean html_dark = prefs.getBoolean("html_dark", confirm_html);

        setVerticalScrollBarEnabled(false);
        setHorizontalScrollBarEnabled(false);