From 4749a64900b5f2d9a2f3f52c88f032249ec78b89 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 26 Sep 2021 08:37:10 +0200 Subject: [PATCH] Allow permanently deleting junk via bnv --- .../java/eu/faircode/email/FragmentMessages.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 8a78965b24..f883564b9b 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -3839,10 +3839,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. if (!folder.read_only && (!filter_archive || !EntityFolder.ARCHIVE.equals(folder.type)) && !EntityFolder.DRAFTS.equals(folder.type) && - !EntityFolder.OUTBOX.equals(folder.type) && - // sent - // trash - !EntityFolder.JUNK.equals(folder.type)) + !EntityFolder.OUTBOX.equals(folder.type) + /* sent, trash, junk */) result.add(threaded.id); } @@ -5505,6 +5503,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. boolean trashable = false; boolean snoozable = false; boolean archivable = false; + Boolean junkOnly = null; DB db = DB.getInstance(context); try { @@ -5525,6 +5524,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. if (filter_archive && EntityFolder.ARCHIVE.equals(folder.type)) continue; + junkOnly = (junkOnly == null || junkOnly) && + EntityFolder.JUNK.equals(folder.type); + if (!folder.read_only && !EntityFolder.DRAFTS.equals(folder.type) && !EntityFolder.OUTBOX.equals(folder.type) && @@ -5550,9 +5552,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. } ActionData data = new ActionData(); - data.delete = (trash == null || + data.delete = (trash == null || junkOnly || (account != null && account.protocol == EntityAccount.TYPE_POP)); - data.trashable = trashable; + data.trashable = trashable || junkOnly; data.snoozable = snoozable; data.archivable = (archivable && archive != null); return data;