From 4bb5e13877f0295019eaff423c1bf5c9fe394e35 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 4 Jun 2020 13:48:18 +0200
Subject: [PATCH] Experiment: show number of unseen messages in lists

---
 .../main/java/eu/faircode/email/AdapterMessage.java |  9 ++++++++-
 app/src/main/java/eu/faircode/email/DaoMessage.java | 13 +++++++++++++
 .../main/java/eu/faircode/email/TupleMessageEx.java |  2 ++
 3 files changed, 23 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 8c69a138e5..4576b56ffa 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1043,7 +1043,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 tvCount.setVisibility(threading ? View.VISIBLE : View.GONE);
                 ivThread.setVisibility(View.VISIBLE);
 
-                tvCount.setText(NF.format(message.visible));
+                if (BuildConfig.DEBUG)
+                    tvCount.setText(NF.format(message.visible_unseen) + "/" + NF.format(message.visible));
+                else
+                    tvCount.setText(NF.format(message.visible));
 
                 if (selected)
                     ivThread.setColorFilter(colorAccent);
@@ -5116,6 +5119,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     same = false;
                     log("visible changed " + prev.visible + "/" + next.visible, next.id);
                 }
+                if (prev.visible_unseen != next.visible_unseen) {
+                    same = false;
+                    log("visible_unseen changed " + prev.visible_unseen + "/" + next.visible_unseen, 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 68be5b7e4b..2feaea357b 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -60,6 +60,11 @@ public interface DaoMessage {
             "   CASE WHEN NOT message.hash IS NULL THEN message.hash" +
             "   WHEN NOT message.msgid IS NULL THEN message.msgid" +
             "   ELSE message.id END) AS visible" +
+            ", COUNT(DISTINCT" +
+            "   CASE WHEN message.ui_seen THEN NULL" +
+            "   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.total) AS totalSize" +
             ", message.priority AS ui_priority" +
             ", message.importance AS ui_importance" +
@@ -132,6 +137,11 @@ public interface DaoMessage {
             "   CASE WHEN NOT message.hash IS NULL THEN message.hash" +
             "   WHEN NOT message.msgid IS NULL THEN message.msgid" +
             "   ELSE message.id END) AS visible" +
+            ", COUNT(DISTINCT" +
+            "   CASE WHEN message.ui_seen THEN NULL" +
+            "   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.total) AS totalSize" +
             ", message.priority AS ui_priority" +
             ", message.importance AS ui_importance" +
@@ -193,6 +203,7 @@ public interface DaoMessage {
             ", (message.ui_encrypt IN (2, 4)) AS signed" +
             ", (message.ui_encrypt IN (1, 3)) AS encrypted" +
             ", 1 AS visible" +
+            ", NOT message.ui_seen AS visible_unseen" +
             ", message.total AS totalSize" +
             ", message.priority AS ui_priority" +
             ", message.importance AS ui_importance" +
@@ -382,6 +393,7 @@ public interface DaoMessage {
             ", (message.ui_encrypt IN (2, 4)) AS signed" +
             ", (message.ui_encrypt IN (1, 3)) AS encrypted" +
             ", 1 AS visible" +
+            ", NOT message.ui_seen AS visible_unseen" +
             ", message.total AS totalSize" +
             ", message.priority AS ui_priority" +
             ", message.importance AS ui_importance" +
@@ -413,6 +425,7 @@ public interface DaoMessage {
             ", (message.ui_encrypt IN (2, 4)) AS signed" +
             ", (message.ui_encrypt IN (1, 3)) AS encrypted" +
             ", 1 AS visible" +
+            ", NOT message.ui_seen AS visible_unseen" +
             ", 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 b13ef04ea2..b9b9c3190e 100644
--- a/app/src/main/java/eu/faircode/email/TupleMessageEx.java
+++ b/app/src/main/java/eu/faircode/email/TupleMessageEx.java
@@ -55,6 +55,7 @@ public class TupleMessageEx extends EntityMessage {
     public int signed;
     public int encrypted;
     public int visible;
+    public int visible_unseen;
     public Long totalSize;
     public Integer ui_priority;
     public Integer ui_importance;
@@ -113,6 +114,7 @@ public class TupleMessageEx extends EntityMessage {
                     this.signed == other.signed &&
                     this.encrypted == other.encrypted &&
                     this.visible == other.visible &&
+                    this.visible_unseen == other.visible_unseen &&
                     Objects.equals(this.totalSize, other.totalSize) &&
                     Objects.equals(this.ui_priority, other.ui_priority) &&
                     Objects.equals(this.ui_importance, other.ui_importance) &&