From 367ba228f4b694eb174783a0e2afdd87c7b72e18 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 30 Dec 2018 07:58:02 +0000
Subject: [PATCH] Fixed message count

---
 .../main/java/eu/faircode/email/AdapterMessage.java | 12 ++++--------
 app/src/main/java/eu/faircode/email/DaoMessage.java | 13 +++++++++----
 .../main/java/eu/faircode/email/TupleMessageEx.java |  3 +++
 3 files changed, 16 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 4809cd2315..0da900568a 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -412,13 +412,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             else
                 ivExpander.setVisibility(View.GONE);
 
-            boolean flagged;
-            if (viewType == ViewType.THREAD)
-                flagged = (message.unflagged == 0);
-            else
-                flagged = (message.count - message.unflagged > 0);
-            ivFlagged.setImageResource(flagged ? R.drawable.baseline_star_24 : R.drawable.baseline_star_border_24);
-            ivFlagged.setImageTintList(ColorStateList.valueOf(flagged ? colorAccent : textColorSecondary));
+            int flagged = (message.count - message.unflagged);
+            ivFlagged.setImageResource(flagged > 0 ? R.drawable.baseline_star_24 : R.drawable.baseline_star_border_24);
+            ivFlagged.setImageTintList(ColorStateList.valueOf(flagged > 0 ? colorAccent : textColorSecondary));
             ivFlagged.setVisibility(message.uid == null ? View.INVISIBLE : View.VISIBLE);
 
             tvFrom.setText(MessageHelper.getFormattedAddresses(outgoing ? message.to : message.from, false));
@@ -446,7 +442,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 tvCount.setVisibility(View.GONE);
                 ivThread.setVisibility(View.GONE);
             } else {
-                tvCount.setText(Integer.toString(message.count));
+                tvCount.setText(Integer.toString(message.visible));
                 ivThread.setVisibility(View.VISIBLE);
             }
 
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 3daaed2377..721d720d69 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -49,11 +49,12 @@ public interface DaoMessage {
     @Query("SELECT message.*" +
             ", account.name AS accountName, IFNULL(identity.color, account.color) AS accountColor, account.notify AS accountNotify" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
-            ", COUNT(DISTINCT message.msgid) AS count" +
+            ", COUNT(message.id) AS count" +
             ", " + unseen_unified + " AS unseen" +
             ", " + unflagged_unified + " AS unflagged" +
             ", (SELECT COUNT(a.id) FROM attachment a WHERE a.message = message.id) AS attachments" +
             ", 0 AS duplicate" +
+            ", COUNT(DISTINCT message.msgid) AS visible" +
             ", MAX(CASE WHEN folder.unified THEN message.received ELSE 0 END) AS dummy" +
             " FROM message" +
             " JOIN account ON account.id = message.account" +
@@ -85,10 +86,11 @@ public interface DaoMessage {
     @Query("SELECT message.*" +
             ", account.name AS accountName, IFNULL(identity.color, account.color) AS accountColor, account.notify AS accountNotify" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
-            ", COUNT(DISTINCT message.msgid) AS count" +
+            ", COUNT(message.id) AS count" +
             ", " + unseen_folder + " AS unseen" +
             ", " + unflagged_folder + " AS unflagged" +
             ", (SELECT COUNT(a.id) FROM attachment a WHERE a.message = message.id) AS attachments" +
+            ", COUNT(DISTINCT message.msgid) AS visible" +
             ", 0 AS duplicate" +
             ", MAX(CASE WHEN folder.id = :folder THEN message.received ELSE 0 END) AS dummy" +
             " FROM message" +
@@ -114,10 +116,11 @@ public interface DaoMessage {
     @Query("SELECT message.*" +
             ", account.name AS accountName, IFNULL(identity.color, account.color) AS accountColor, account.notify AS accountNotify" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
-            ", (SELECT COUNT(m1.id) FROM message m1 WHERE m1.account = message.account AND m1.thread = message.thread AND NOT m1.ui_hide) AS count" +
+            ", 1 AS count" +
             ", CASE WHEN message.ui_seen THEN 0 ELSE 1 END AS unseen" +
             ", CASE WHEN message.ui_flagged THEN 0 ELSE 1 END AS unflagged" +
             ", (SELECT COUNT(a.id) FROM attachment a WHERE a.message = message.id) AS attachments" +
+            ", 1 AS visible" +
 
             ", ((folder.type = '" + EntityFolder.ARCHIVE + "' OR folder.type = '" + EntityFolder.SENT + "')" +
             " AND EXISTS (" +
@@ -194,10 +197,11 @@ public interface DaoMessage {
     @Query("SELECT message.*" +
             ", account.name AS accountName, identity.color AS accountColor, account.notify AS accountNotify" +
             ", folder.name AS folderName, folder.display AS folderDisplay, folder.type AS folderType" +
-            ", (SELECT COUNT(m1.id) FROM message m1 WHERE m1.account = message.account AND m1.thread = message.thread AND NOT m1.ui_hide) AS count" +
+            ", 1 AS count" +
             ", CASE WHEN message.ui_seen THEN 0 ELSE 1 END AS unseen" +
             ", CASE WHEN message.ui_flagged THEN 0 ELSE 1 END AS unflagged" +
             ", (SELECT COUNT(a.id) FROM attachment a WHERE a.message = message.id) AS attachments" +
+            ", 1 AS visible" +
             ", 0 AS duplicate" +
             " FROM message" +
             " JOIN account ON account.id = message.account" +
@@ -213,6 +217,7 @@ public interface DaoMessage {
             ", 1 AS unseen" +
             ", 0 AS unflagged" +
             ", 0 AS attachments" +
+            ", 1 AS visible" +
             ", 0 AS duplicate" +
             " FROM message" +
             " JOIN account ON account.id = message.account" +
diff --git a/app/src/main/java/eu/faircode/email/TupleMessageEx.java b/app/src/main/java/eu/faircode/email/TupleMessageEx.java
index 244deb9b81..102f7673d7 100644
--- a/app/src/main/java/eu/faircode/email/TupleMessageEx.java
+++ b/app/src/main/java/eu/faircode/email/TupleMessageEx.java
@@ -30,6 +30,7 @@ public class TupleMessageEx extends EntityMessage {
     public int unseen;
     public int unflagged;
     public int attachments;
+    public int visible;
     public boolean duplicate;
 
     @Override
@@ -47,6 +48,7 @@ public class TupleMessageEx extends EntityMessage {
                     this.unseen == other.unseen &&
                     this.unflagged == other.unflagged &&
                     this.attachments == other.attachments &&
+                    this.visible == other.visible &&
                     this.duplicate == other.duplicate);
         }
         return false;
@@ -67,6 +69,7 @@ public class TupleMessageEx extends EntityMessage {
                     this.unseen == other.unseen &&
                     this.unflagged == other.unflagged &&
                     this.attachments == other.attachments &&
+                    this.visible == other.visible &&
                     this.duplicate == other.duplicate);
         }
         return false;