Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-06 04:45:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deletable folders

Browse Source
This commit is contained in:
M66B
2021-12-10 11:41:20 +01:00
parent 000ac38524
commit 189255f8fe
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/AdapterFolder.java
View File

@@ -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

4
app/src/main/java/eu/faircode/email/FragmentFolder.java
View File

@@ -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();
}