From 84493e1d471acbe866d828aa4c8c8e0ad177a230 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 26 Feb 2022 15:55:48 +0100
Subject: [PATCH] Show if attachments in conversation

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 6 +++++-
 app/src/main/java/eu/faircode/email/DaoMessage.java     | 5 +++++
 app/src/main/java/eu/faircode/email/TupleMessageEx.java | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index c4e370a279..c8a8898d4d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1351,7 +1351,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ibSnoozed.setVisibility(message.ui_snoozed == null && !message.ui_unsnoozed ? View.GONE : View.VISIBLE);
             ivAnswered.setVisibility(message.ui_answered ? View.VISIBLE : View.GONE);
             ivForwarded.setVisibility(message.isForwarded() ? View.VISIBLE : View.GONE);
-            ivAttachments.setVisibility(message.attachments > 0 ? View.VISIBLE : View.GONE);
+            ivAttachments.setVisibility(message.totalAttachments > 0 ? View.VISIBLE : View.GONE);
 
             if (viewType == ViewType.FOLDER)
                 tvFolder.setText(outbox ? message.identityEmail : message.accountName);
@@ -7133,6 +7133,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     same = false;
                     log("visible_unseen changed " + prev.visible_unseen + "/" + next.visible_unseen, next.id);
                 }
+                if (prev.totalAttachments != next.totalAttachments) {
+                    same = false;
+                    log("totalAttachments changed " + prev.totalAttachments + "/" + next.totalAttachments, next.id);
+                }
                 if (!Objects.equals(prev.totalSize, next.totalSize)) {
                     same = false;
                     log("totalSize changed", next.id);
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 3da76991d7..7d88081676 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -66,6 +66,7 @@ public interface DaoMessage {
             "   WHEN NOT message.hash IS NULL THEN message.hash" +
             "   WHEN NOT message.msgid IS NULL THEN message.msgid" +
             "   ELSE message.id END) AS visible_unseen" +
+            ", SUM(message.attachments) AS totalAttachments" +
             ", SUM(message.total) AS totalSize" +
             ", message.priority AS ui_priority" +
             ", message.importance AS ui_importance" +
@@ -144,6 +145,7 @@ public interface DaoMessage {
             "   WHEN NOT message.hash IS NULL THEN message.hash" +
             "   WHEN NOT message.msgid IS NULL THEN message.msgid" +
             "   ELSE message.id END) AS visible_unseen" +
+            ", SUM(message.attachments) AS totalAttachments" +
             ", SUM(message.total) AS totalSize" +
             ", message.priority AS ui_priority" +
             ", message.importance AS ui_importance" +
@@ -208,6 +210,7 @@ public interface DaoMessage {
             ", (folder.type = '" + EntityFolder.DRAFTS + "') AS drafts" +
             ", 1 AS visible" +
             ", NOT message.ui_seen AS visible_unseen" +
+            ", attachments AS totalAttachments" +
             ", message.total AS totalSize" +
             ", message.priority AS ui_priority" +
             ", message.importance AS ui_importance" +
@@ -487,6 +490,7 @@ public interface DaoMessage {
             ", (folder.type = '" + EntityFolder.DRAFTS + "') AS drafts" +
             ", 1 AS visible" +
             ", NOT message.ui_seen AS visible_unseen" +
+            ", message.attachments AS totalAttachments" +
             ", message.total AS totalSize" +
             ", message.priority AS ui_priority" +
             ", message.importance AS ui_importance" +
@@ -517,6 +521,7 @@ public interface DaoMessage {
             ", 0 AS drafts" +
             ", 1 AS visible" +
             ", NOT message.ui_seen AS visible_unseen" +
+            ", message.attachments AS totalAttachments" +
             ", message.total AS totalSize" +
             ", message.priority AS ui_priority" +
             ", message.importance AS ui_importance" +
diff --git a/app/src/main/java/eu/faircode/email/TupleMessageEx.java b/app/src/main/java/eu/faircode/email/TupleMessageEx.java
index f1c2a8534f..0275e266c0 100644
--- a/app/src/main/java/eu/faircode/email/TupleMessageEx.java
+++ b/app/src/main/java/eu/faircode/email/TupleMessageEx.java
@@ -59,6 +59,7 @@ public class TupleMessageEx extends EntityMessage {
     public int drafts;
     public int visible;
     public int visible_unseen;
+    public int totalAttachments;
     public Long totalSize;
     public Integer ui_priority;
     public Integer ui_importance;
@@ -163,6 +164,7 @@ public class TupleMessageEx extends EntityMessage {
                     this.drafts == other.drafts &&
                     this.visible == other.visible &&
                     this.visible_unseen == other.visible_unseen &&
+                    this.totalAttachments == other.totalAttachments &&
                     Objects.equals(this.totalSize, other.totalSize) &&
                     Objects.equals(this.ui_priority, other.ui_priority) &&
                     Objects.equals(this.ui_importance, other.ui_importance) &&