mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow permanently deleting junk via bnv

This commit is contained in:
M66B 2021-09-26 08:37:10 +02:00
parent 1f89ae19ab
commit 4749a64900
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

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