From b97ae1882cd86bced2a29b778cde030a45e18e0d Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 22 Apr 2024 07:28:43 +0200 Subject: [PATCH] Debug: ignore formatted size --- .../eu/faircode/email/FragmentOptionsMisc.java | 11 +++++++++++ .../main/java/eu/faircode/email/HtmlHelper.java | 5 +++++ app/src/main/res/layout/fragment_options_misc.xml | 14 +++++++++++++- app/src/main/res/values/strings.xml | 1 + 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java index c7f41c944f..b4983c59f9 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java @@ -190,6 +190,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc private SwitchCompat swBrowserZoom; private SwitchCompat swFakeDark; private EditText etViewportHeight; + private SwitchCompat swIgnoreFormattedSize; private SwitchCompat swShowRecent; private SwitchCompat swModSeq; private SwitchCompat swPreamble; @@ -283,6 +284,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc "chunk_size", "thread_range", "autoscroll_editor", "undo_manager", "browser_zoom", "fake_dark", + "ignore_formatted_size", "show_recent", "use_modseq", "preamble", "uid_command", "perform_expunge", "uid_expunge", "auth_plain", "auth_login", "auth_ntlm", "auth_sasl", "auth_apop", "use_top", "forget_top", @@ -433,6 +435,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc swBrowserZoom = view.findViewById(R.id.swBrowserZoom); swFakeDark = view.findViewById(R.id.swFakeDark); etViewportHeight = view.findViewById(R.id.etViewportHeight); + swIgnoreFormattedSize = view.findViewById(R.id.swIgnoreFormattedSize); swShowRecent = view.findViewById(R.id.swShowRecent); swModSeq = view.findViewById(R.id.swModSeq); swPreamble = view.findViewById(R.id.swPreamble); @@ -1339,6 +1342,13 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc } }); + swIgnoreFormattedSize.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { + prefs.edit().putBoolean("ignore_formatted_size", checked).apply(); + } + }); + swShowRecent.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { @@ -2363,6 +2373,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc etViewportHeight.setText(Integer.toString(vh)); } else etViewportHeight.setText(null); + swIgnoreFormattedSize.setChecked(prefs.getBoolean("ignore_formatted_size", false)); swShowRecent.setChecked(prefs.getBoolean("show_recent", false)); swModSeq.setChecked(prefs.getBoolean("use_modseq", true)); swPreamble.setChecked(prefs.getBoolean("preamble", false)); diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java index 94a5b68150..86dfac79f7 100644 --- a/app/src/main/java/eu/faircode/email/HtmlHelper.java +++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java @@ -449,6 +449,11 @@ public class HtmlHelper { } private static int getMaxFormatTextSize(Context context) { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + boolean ignore_formatted_size = prefs.getBoolean("ignore_formatted_size", false); + if (ignore_formatted_size) + return Integer.MAX_VALUE; + ActivityManager am = Helper.getSystemService(context, ActivityManager.class); int mc = am.getMemoryClass(); if (mc >= 256) diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml index 55b794d802..3398eafdf3 100644 --- a/app/src/main/res/layout/fragment_options_misc.xml +++ b/app/src/main/res/layout/fragment_options_misc.xml @@ -1275,6 +1275,18 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvViewportHeight" /> + + Use browser zoom Fake dark Viewport height + Ignore formatted size Show recent flag MODSEQ Preamble