From 0167033bd41aa40a5fc8199e67d62144f84f04b6 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 15 Mar 2020 08:16:49 +0100
Subject: [PATCH] Simplification

---
 app/src/main/java/eu/faircode/email/AdapterNavFolder.java | 5 ++---
 app/src/main/java/eu/faircode/email/DaoFolder.java        | 1 -
 app/src/main/java/eu/faircode/email/TupleFolderNav.java   | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterNavFolder.java b/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
index d91357c7cd..1774c130fe 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavFolder.java
@@ -112,9 +112,8 @@ public class AdapterNavFolder extends RecyclerView.Adapter<AdapterNavFolder.View
             }
 
             int count;
-            if (EntityFolder.OUTBOX.equals(folder.type))
-                count = folder.snoozed + folder.operations;
-            else if (EntityFolder.DRAFTS.equals(folder.type))
+            if (EntityFolder.DRAFTS.equals(folder.type) ||
+                    EntityFolder.OUTBOX.equals(folder.type))
                 count = folder.messages;
             else
                 count = folder.unseen;
diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java
index c363587291..2a160790ac 100644
--- a/app/src/main/java/eu/faircode/email/DaoFolder.java
+++ b/app/src/main/java/eu/faircode/email/DaoFolder.java
@@ -115,7 +115,6 @@ public interface DaoFolder {
             ", account.`order` AS accountOrder, account.name AS accountName, COALESCE(folder.color, account.color) AS accountColor" +
             ", COUNT(message.id) AS messages" +
             ", SUM(CASE WHEN NOT message.ui_seen 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 f7595bb4f5..e555ff1399 100644
--- a/app/src/main/java/eu/faircode/email/TupleFolderNav.java
+++ b/app/src/main/java/eu/faircode/email/TupleFolderNav.java
@@ -33,7 +33,6 @@ public class TupleFolderNav extends EntityFolder implements Serializable {
     public Integer accountColor;
     public int messages;
     public int unseen;
-    public int snoozed;
     public int operations;
     public int executing;
 
@@ -89,7 +88,6 @@ public class TupleFolderNav extends EntityFolder implements Serializable {
                     Objects.equals(this.accountColor, other.accountColor) &&
                     this.messages == other.messages &&
                     this.unseen == other.unseen &&
-                    this.snoozed == other.snoozed &&
                     this.operations == other.operations &&
                     this.executing == other.executing);
         } else