From 14c1c9d8fb85e84e46f89fdfdd8dcd85b29847f0 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 16 Feb 2025 15:31:11 +0100
Subject: [PATCH] Auto seen on uid

---
 .../eu/faircode/email/AdapterMessage.java     | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index cc6f4b13f5..94842b4bb5 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -8508,8 +8508,26 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             @Override
             public boolean areContentsTheSame(
                     @NonNull TupleMessageEx prev, @NonNull TupleMessageEx next) {
-                boolean same = true;
+                if (next.uid != null &&
+                        properties.getValue("expanded", next.id)) {
+                    // Mark seen when needed
+                    if (next.accountAutoSeen && !Boolean.TRUE.equals(next.ui_seen) &&
+                            !properties.getValue("auto_seen", next.id)) {
+                        properties.setValue("auto_seen", next.id, true);
+                        EntityOperation.queue(context, next, EntityOperation.SEEN, true);
+                        EntityLog.log(context, EntityLog.Type.Debug3, "Auto seen id=" + next.id);
+                    }
+
+                    // Download body when needed
+                    if (!next.content &&
+                            !properties.getValue("auto_body", next.id)) {
+                        properties.setValue("auto_body", next.id, true);
+                        EntityOperation.queue(context, next, EntityOperation.BODY);
+                        EntityLog.log(context, EntityLog.Type.Debug3, "Auto body id=" + next.id);
+                    }
+                }
 
+                boolean same = true;
                 // id
                 // account
                 // folder
@@ -8522,17 +8540,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 if (!Objects.equals(prev.uid, next.uid)) {
                     same = false;
                     log("uid changed", next.id);
-
-                    if (prev.uid == null && next.uid != null && // once only
-                            properties.getValue("expanded", next.id)) {
-                        // Mark seen when needed
-                        if (!Boolean.TRUE.equals(next.ui_seen) && next.accountAutoSeen)
-                            EntityOperation.queue(context, next, EntityOperation.SEEN, true);
-
-                        // Download body when needed
-                        if (!next.content)
-                            EntityOperation.queue(context, next, EntityOperation.BODY);
-                    }
                 }
                 if (!Objects.equals(prev.msgid, next.msgid)) {
                     // debug info