From 975fdfe283ee173cf7cad8e087a3adac98692377 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 4 May 2022 10:00:26 +0200
Subject: [PATCH] Show single inbox / nav menu

---
 .../main/java/eu/faircode/email/AdapterNavUnified.java    | 8 +++++++-
 app/src/main/java/eu/faircode/email/DaoFolder.java        | 1 +
 .../main/java/eu/faircode/email/TupleFolderUnified.java   | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterNavUnified.java b/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
index 9806cb3063..d8e1b24079 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavUnified.java
@@ -93,7 +93,9 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
 
         private void bindTo(TupleFolderUnified folder) {
             if (EntityFolder.INBOX.equals(folder.type))
-                ivItem.setImageResource(R.drawable.twotone_all_inbox_24);
+                ivItem.setImageResource(folder.folders > 1
+                        ? R.drawable.twotone_all_inbox_24
+                        : R.drawable.twotone_move_to_inbox_24);
             else if (EntityFolder.OUTBOX.equals(folder.type)) {
                 if ("syncing".equals(folder.sync_state))
                     ivItem.setImageResource(R.drawable.twotone_compare_arrows_24);
@@ -149,6 +151,10 @@ public class AdapterNavUnified extends RecyclerView.Adapter<AdapterNavUnified.Vi
             LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
             if (EntityFolder.OUTBOX.equals(folder.type))
                 lbm.sendBroadcast(new Intent(ActivityView.ACTION_VIEW_OUTBOX));
+            else if (folder.folders > 1)
+                lbm.sendBroadcast(
+                        new Intent(ActivityView.ACTION_VIEW_MESSAGES)
+                                .putExtra("type", folder.type));
             else {
                 Bundle args = new Bundle();
                 args.putString("type", folder.type);
diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java
index c47c27c7ee..dd8dcf961b 100644
--- a/app/src/main/java/eu/faircode/email/DaoFolder.java
+++ b/app/src/main/java/eu/faircode/email/DaoFolder.java
@@ -178,6 +178,7 @@ public interface DaoFolder {
     List<EntityFolder> getChildFolders(long parent);
 
     @Query("SELECT folder.type" +
+            ", COUNT(DISTINCT folder.id) AS folders" +
             ", COUNT(message.id) AS messages" +
             ", SUM(CASE WHEN NOT message.ui_seen THEN 1 ELSE 0 END) AS unseen" +
             ", CASE WHEN folder.account IS NULL THEN folder.sync_state ELSE NULL END AS sync_state" +
diff --git a/app/src/main/java/eu/faircode/email/TupleFolderUnified.java b/app/src/main/java/eu/faircode/email/TupleFolderUnified.java
index 0c4ed788b6..e1a40c90f3 100644
--- a/app/src/main/java/eu/faircode/email/TupleFolderUnified.java
+++ b/app/src/main/java/eu/faircode/email/TupleFolderUnified.java
@@ -23,6 +23,7 @@ import java.util.Objects;
 
 public class TupleFolderUnified {
     public String type;
+    public int folders;
     public int messages;
     public int unseen;
     public String sync_state;
@@ -34,6 +35,7 @@ public class TupleFolderUnified {
         if (obj instanceof TupleFolderUnified) {
             TupleFolderUnified other = (TupleFolderUnified) obj;
             return (Objects.equals(this.type, other.type) &&
+                    this.folders == other.folders &&
                     this.messages == other.messages &&
                     this.unseen == other.unseen &&
                     Objects.equals(this.sync_state, other.sync_state) &&