From c6c8708bb3e5faa1efaf7ca1bff8f23bb9c316fc Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 22 Aug 2021 14:32:35 +0200
Subject: [PATCH] Skip confirm images/html globally

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 8e378d90a5..47e2f5c3d3 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4073,7 +4073,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             boolean current = properties.getValue(full ? "full" : "images", message.id);
             boolean asked = properties.getValue(full ? "full_asked" : "images_asked", message.id);
-            if (current || asked) {
+            boolean confirm = prefs.getBoolean(full ? "confirm_html" : "confirm_images", true);
+            if (current || asked || !confirm) {
                 if (current && message.from != null) {
                     SharedPreferences.Editor editor = prefs.edit();
                     for (Address sender : message.from) {
@@ -4090,7 +4091,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 properties.setValue(full ? "full" : "images", message.id, !current);
                 onShowConfirmed(message, full, !current);
-
                 return;
             }