From a7eeb1840ac9570697a6191a7e3476903ff55284 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 20 Nov 2022 14:22:49 +0100 Subject: [PATCH] Cleanup --- .../java/eu/faircode/email/AdapterMessage.java | 2 -- .../eu/faircode/email/FragmentOptionsMisc.java | 13 +------------ app/src/main/java/eu/faircode/email/WebViewEx.java | 13 +------------ app/src/main/res/layout/fragment_options_misc.xml | 14 +------------- app/src/main/res/values/strings.xml | 1 - 5 files changed, 3 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java index a49120eff6..137676461c 100644 --- a/app/src/main/java/eu/faircode/email/AdapterMessage.java +++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java @@ -316,7 +316,6 @@ public class AdapterMessage extends RecyclerView.Adapter callback = new DiffUtil.ItemCallback() { diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java index 6db8b4d543..776aebebae 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java @@ -193,7 +193,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc private SeekBar sbThreadRange; private ImageButton ibSqliteCache; private SwitchCompat swUndoManager; - private SwitchCompat swWebViewLegacy; private SwitchCompat swBrowserZoom; private SwitchCompat swFakeDark; private SwitchCompat swShowRecent; @@ -264,7 +263,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc "query_threads", "sqlite_integrity_check", "wal", "sqlite_checkpoints", "sqlite_analyze", "sqlite_auto_vacuum", "sqlite_sync_extra", "sqlite_cache", "chunk_size", "thread_range", "undo_manager", - "webview_legacy", "browser_zoom", "fake_dark", + "browser_zoom", "fake_dark", "show_recent", "use_modseq", "uid_command", "perform_expunge", "uid_expunge", "auth_plain", "auth_login", "auth_ntlm", "auth_sasl", "auth_apop", "use_top", @@ -410,7 +409,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc tvThreadRange = view.findViewById(R.id.tvThreadRange); sbThreadRange = view.findViewById(R.id.sbThreadRange); swUndoManager = view.findViewById(R.id.swUndoManager); - swWebViewLegacy = view.findViewById(R.id.swWebViewLegacy); swBrowserZoom = view.findViewById(R.id.swBrowserZoom); swFakeDark = view.findViewById(R.id.swFakeDark); swShowRecent = view.findViewById(R.id.swShowRecent); @@ -1394,14 +1392,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc } }); - swWebViewLegacy.setVisibility(BuildConfig.DEBUG ? View.VISIBLE : View.GONE); - swWebViewLegacy.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { - prefs.edit().putBoolean("webview_legacy", checked).apply(); - } - }); - swBrowserZoom.setVisibility(BuildConfig.DEBUG ? View.VISIBLE : View.GONE); swBrowserZoom.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override @@ -2230,7 +2220,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc sbThreadRange.setProgress(thread_range); swUndoManager.setChecked(prefs.getBoolean("undo_manager", false)); - swWebViewLegacy.setChecked(prefs.getBoolean("webview_legacy", false)); swBrowserZoom.setChecked(prefs.getBoolean("browser_zoom", false)); swFakeDark.setChecked(prefs.getBoolean("fake_dark", false)); swShowRecent.setChecked(prefs.getBoolean("show_recent", false)); diff --git a/app/src/main/java/eu/faircode/email/WebViewEx.java b/app/src/main/java/eu/faircode/email/WebViewEx.java index d60624d6da..e6eaecaf8e 100644 --- a/app/src/main/java/eu/faircode/email/WebViewEx.java +++ b/app/src/main/java/eu/faircode/email/WebViewEx.java @@ -48,7 +48,6 @@ import java.util.Objects; public class WebViewEx extends WebView implements DownloadListener, View.OnLongClickListener { private int height; private int maxHeight; - private boolean legacy; private IWebView intf; private Runnable onPageLoaded; private String hash; @@ -115,7 +114,6 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC boolean browser_zoom = (prefs.getBoolean("browser_zoom", false) && BuildConfig.DEBUG); int message_zoom = prefs.getInt("message_zoom", 100); boolean monospaced = prefs.getBoolean("monospaced", false); - legacy = (prefs.getBoolean("webview_legacy", false) && BuildConfig.DEBUG); WebSettings settings = getSettings(); @@ -247,19 +245,10 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { // Unable to create layer for WebViewEx, size 1088x16384 max size 16383 color type 4 has context 1) int limitHeight = MeasureSpec.makeMeasureSpec(16000, MeasureSpec.AT_MOST); - if (legacy) { - if (height > getMinimumHeight()) - super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST)); - else - super.onMeasure(widthMeasureSpec, limitHeight); - } else { - super.onMeasure(widthMeasureSpec, limitHeight); - } + super.onMeasure(widthMeasureSpec, limitHeight); int mh = getMeasuredHeight(); Log.i("Measured height=" + mh + " last=" + height + "/" + maxHeight + " ch=" + getContentHeight()); - if (mh == 0 && legacy) - setMeasuredDimension(getMeasuredWidth(), height); } @Override diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml index 3cf229202a..d330481530 100644 --- a/app/src/main/res/layout/fragment_options_misc.xml +++ b/app/src/main/res/layout/fragment_options_misc.xml @@ -1343,18 +1343,6 @@ app:layout_constraintTop_toBottomOf="@id/sbThreadRange" app:switchPadding="12dp" /> - - Chunk size: %1$d Thread range: %1$d days Use Android\'s undo manager - Old WebView behavior Use browser zoom Fake dark Show recent flag