From 8eedaa0286ce00c55ffc3ca50be962ebd9ebbd8d Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 23 Jan 2025 21:45:43 +0100 Subject: [PATCH] Fixed original message view not/showing images --- .../main/java/eu/faircode/email/WebViewEx.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/WebViewEx.java b/app/src/main/java/eu/faircode/email/WebViewEx.java index 192615007f..0035aca810 100644 --- a/app/src/main/java/eu/faircode/email/WebViewEx.java +++ b/app/src/main/java/eu/faircode/email/WebViewEx.java @@ -58,7 +58,6 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC private IWebView intf; private Runnable onPageLoaded; private String hash; - private Boolean images; private static String userAgent = null; @@ -247,6 +246,10 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC void setImages(boolean show_images, boolean inline) { WebSettings settings = getSettings(); + + if (settings.getLoadsImagesAutomatically() != show_images) + this.hash = null; + settings.setLoadsImagesAutomatically(show_images || inline); settings.setBlockNetworkLoads(!show_images); settings.setBlockNetworkImage(!show_images); @@ -256,14 +259,10 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC public void loadDataWithBaseURL(String baseUrl, String data, String mimeType, String encoding, String historyUrl) { try { // Prevent flickering - boolean i = getSettings().getLoadsImagesAutomatically(); - if (Objects.equals(this.images, i)) { - String h = (data == null ? null : Helper.md5(data.getBytes())); - if (Objects.equals(this.hash, h)) - return; - this.hash = h; - } else - this.images = i; + String h = (data == null ? null : Helper.md5(data.getBytes())); + if (Objects.equals(this.hash, h)) + return; + this.hash = h; } catch (Throwable ex) { Log.w(ex); }