From efb2107fd1a14e0cd0887571fa07a62328b39fb5 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 25 Jul 2019 09:44:50 +0200
Subject: [PATCH] Show snoozed count for outbox

---
 app/src/main/java/eu/faircode/email/AdapterNavFolder.java | 3 ++-
 app/src/main/java/eu/faircode/email/DaoFolder.java        | 1 +
 app/src/main/java/eu/faircode/email/TupleFolderNav.java   | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterNavFolder.java b/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
index 4713f4b35b..2d50359a0c 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
@@ -107,7 +107,7 @@ public class AdapterNavFolder extends RecyclerView.Adapter<AdapterNavFolder.View
                     ivItem.setColorFilter(folder.accountColor);
             }
 
-            int count = (EntityFolder.OUTBOX.equals(folder.type) ? folder.operations : folder.unseen);
+            int count = (EntityFolder.OUTBOX.equals(folder.type) ? folder.snoozed + folder.operations : folder.unseen);
 
             if (count == 0)
                 tvItem.setText(folder.getDisplayName(context));
@@ -227,6 +227,7 @@ public class AdapterNavFolder extends RecyclerView.Adapter<AdapterNavFolder.View
                     Objects.equals(f1.sync_state, f2.sync_state) &&
                     Objects.equals(f1.last_sync, f2.last_sync) &&
                     f1.unseen == f2.unseen &&
+                    f1.snoozed == f2.snoozed &&
                     f1.operations == f2.operations &&
                     f1.executing == f2.executing);
         }
diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java
index 4815b9ae54..a43b3795ec 100644
--- a/app/src/main/java/eu/faircode/email/DaoFolder.java
+++ b/app/src/main/java/eu/faircode/email/DaoFolder.java
@@ -109,6 +109,7 @@ public interface DaoFolder {
     @Query("SELECT folder.*" +
             ", account.`order` AS accountOrder, account.name AS accountName, account.color AS accountColor" +
             ", SUM(CASE WHEN message.ui_seen = 0 THEN 1 ELSE 0 END) AS unseen" +
+            ", SUM(CASE WHEN message.ui_snoozed IS NULL THEN 0 ELSE 1 END) AS snoozed" +
             ", (SELECT COUNT(operation.id) FROM operation WHERE operation.folder = folder.id) AS operations" +
             ", (SELECT COUNT(operation.id) FROM operation WHERE operation.folder = folder.id AND operation.state = 'executing') AS executing" +
             " FROM folder" +
diff --git a/app/src/main/java/eu/faircode/email/TupleFolderNav.java b/app/src/main/java/eu/faircode/email/TupleFolderNav.java
index 4563435c63..03042c7c24 100644
--- a/app/src/main/java/eu/faircode/email/TupleFolderNav.java
+++ b/app/src/main/java/eu/faircode/email/TupleFolderNav.java
@@ -31,6 +31,7 @@ public class TupleFolderNav extends EntityFolder implements Serializable {
     public String accountName;
     public Integer accountColor;
     public int unseen;
+    public int snoozed;
     public int operations;
     public int executing;