From 96335e38b2c15dd22e8700c934117c4c18a05c86 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 7 Feb 2021 16:09:55 +0100
Subject: [PATCH] Check if system folders selectable

---
 .../eu/faircode/email/AdapterMessage.java     | 18 ++++++++-----
 .../eu/faircode/email/FragmentMessages.java   | 27 ++++++++++++++-----
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 32df98a824..32dab1e6ce 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1623,17 +1623,21 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                     boolean gmail = args.getBoolean("gmail");
 
+                    boolean hasInbox = false;
                     boolean hasArchive = false;
                     boolean hasTrash = false;
                     boolean hasJunk = false;
                     if (folders != null)
                         for (EntityFolder folder : folders)
-                            if (EntityFolder.ARCHIVE.equals(folder.type))
-                                hasArchive = true;
-                            else if (EntityFolder.TRASH.equals(folder.type))
-                                hasTrash = true;
-                            else if (EntityFolder.JUNK.equals(folder.type))
-                                hasJunk = true;
+                            if (folder.selectable)
+                                if (EntityFolder.INBOX.equals(folder.type))
+                                    hasInbox = true;
+                                else if (EntityFolder.ARCHIVE.equals(folder.type))
+                                    hasArchive = true;
+                                else if (EntityFolder.TRASH.equals(folder.type))
+                                    hasTrash = true;
+                                else if (EntityFolder.JUNK.equals(folder.type))
+                                    hasJunk = true;
 
                     boolean inArchive = EntityFolder.ARCHIVE.equals(message.folderType);
                     boolean inSent = EntityFolder.SENT.equals(message.folderType);
@@ -1648,7 +1652,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     boolean trash = (move || outbox || debug ||
                             message.accountProtocol == EntityAccount.TYPE_POP);
                     boolean junk = (move && hasJunk);
-                    boolean inbox = (move && (inArchive || inTrash || inJunk));
+                    boolean inbox = (move && hasInbox && (inArchive || inTrash || inJunk));
                     boolean keywords = (!message.folderReadOnly && message.uid != null &&
                             message.accountProtocol == EntityAccount.TYPE_IMAP);
                     boolean labels = (gmail && move && !inTrash && !inJunk && !outbox);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 92737eff0c..e5c4e10d41 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2752,13 +2752,24 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 }
 
                 for (EntityAccount account : accounts.values()) {
-                    boolean hasArchive = (account.protocol == EntityAccount.TYPE_IMAP &&
-                            db.folder().getFolderByType(account.id, EntityFolder.ARCHIVE) != null);
-                    boolean hasTrash = (account.protocol == EntityAccount.TYPE_IMAP &&
-                            db.folder().getFolderByType(account.id, EntityFolder.TRASH) != null);
-                    boolean hasJunk = (account.protocol == EntityAccount.TYPE_IMAP &&
-                            db.folder().getFolderByType(account.id, EntityFolder.JUNK) != null);
+                    boolean hasInbox = false;
+                    boolean hasArchive = false;
+                    boolean hasTrash = false;
+                    boolean hasJunk = false;
 
+                    if (account.protocol == EntityAccount.TYPE_IMAP) {
+                        EntityFolder inbox = db.folder().getFolderByType(account.id, EntityFolder.INBOX);
+                        EntityFolder archive = db.folder().getFolderByType(account.id, EntityFolder.ARCHIVE);
+                        EntityFolder trash = db.folder().getFolderByType(account.id, EntityFolder.TRASH);
+                        EntityFolder junk = db.folder().getFolderByType(account.id, EntityFolder.JUNK);
+
+                        hasInbox = (inbox != null && inbox.selectable);
+                        hasArchive = (archive != null && archive.selectable);
+                        hasTrash = (trash != null && trash.selectable);
+                        hasJunk = (junk != null && junk.selectable);
+                    }
+
+                    result.hasInbox = (result.hasInbox == null ? hasInbox : result.hasInbox && hasInbox);
                     result.hasArchive = (result.hasArchive == null ? hasArchive : result.hasArchive && hasArchive);
                     result.hasTrash = (result.hasTrash == null ? hasTrash : result.hasTrash && hasTrash);
                     result.hasJunk = (result.hasJunk == null ? hasJunk : result.hasJunk && hasJunk);
@@ -2773,6 +2784,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 if (result.isJunk == null) result.isJunk = false;
                 if (result.isDrafts == null) result.isDrafts = false;
 
+                if (result.hasInbox == null) result.hasInbox = false;
                 if (result.hasArchive == null) result.hasArchive = false;
                 if (result.hasTrash == null) result.hasTrash = false;
                 if (result.hasJunk == null) result.hasJunk = false;
@@ -2823,7 +2835,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 importance.add(Menu.NONE, R.string.title_importance_low, 3, R.string.title_importance_low)
                         .setEnabled(!EntityMessage.PRIORITIY_LOW.equals(result.importance));
 
-                if (!result.isInbox) // not is inbox
+                if (result.hasInbox && !result.isInbox) // not is inbox
                     popupMenu.getMenu().add(Menu.NONE, R.string.title_folder_inbox, order++, R.string.title_folder_inbox);
 
                 if (result.hasArchive && !result.isArchive) // has archive and not is archive
@@ -7631,6 +7643,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         boolean flagged;
         boolean unflagged;
         Integer importance;
+        Boolean hasInbox;
         Boolean hasArchive;
         Boolean hasTrash;
         Boolean hasJunk;