From 189255f8fedcb35b6158dc0f5b941fd450563b81 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 10 Dec 2021 11:41:20 +0100
Subject: [PATCH] Deletable folders

---
 app/src/main/java/eu/faircode/email/AdapterFolder.java  | 5 ++---
 app/src/main/java/eu/faircode/email/FragmentFolder.java | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 857b5432dd..29594d68f4 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -623,9 +623,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             if (Shortcuts.can(context))
                 popupMenu.getMenu().add(Menu.NONE, R.string.title_pin, order++, R.string.title_pin);
 
-            if (!folder.selectable && debug)
-                popupMenu.getMenu().add(Menu.NONE, R.string.title_delete, order++, R.string.title_delete)
-                        .setEnabled(folder.inferiors);
+            if (!folder.read_only && EntityFolder.USER.equals(folder.type))
+                popupMenu.getMenu().add(Menu.NONE, R.string.title_delete, order++, R.string.title_delete);
 
             popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                 @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index c3ef8c7b87..569a607113 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -353,7 +353,9 @@ public class FragmentFolder extends FragmentBase {
                 btnSave.setEnabled(true);
                 tvInboxRootHint.setVisibility(folder == null && parent == null ? View.VISIBLE : View.GONE);
 
-                deletable = (folder != null && EntityFolder.USER.equals(folder.type));
+                deletable = (folder != null &&
+                        !folder.read_only &&
+                        EntityFolder.USER.equals(folder.type));
                 invalidateOptionsMenu();
             }