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

Skip checking block list for archive folder

This commit is contained in:
M66B 2021-07-06 14:42:03 +02:00
parent 83bf736cb3
commit 6b4de49945
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/Core.java
View File

@ -3384,7 +3384,13 @@ class Core {
}
boolean check_blocklist = prefs.getBoolean("check_blocklist", false);
if (check_blocklist && !EntityFolder.isOutgoing(folder.type))
if (check_blocklist &&
!have &&
!EntityFolder.isOutgoing(folder.type) &&
!EntityFolder.ARCHIVE.equals(folder.type) &&
!EntityFolder.TRASH.equals(folder.type) &&
!EntityFolder.JUNK.equals(folder.type) &&
!Arrays.asList(message.keywords).contains(MessageHelper.FLAG_NOT_JUNK))
try {
message.blocklist = DnsBlockList.isJunk(
context, imessage.getHeader("Received"));
@ -3410,11 +3416,7 @@ class Core {
runRules(context, imessage, account, folder, message, rules);
if (!have &&
!EntityFolder.TRASH.equals(folder.type) &&
!EntityFolder.JUNK.equals(folder.type) &&
message.blocklist != null && message.blocklist &&
!Arrays.asList(message.keywords).contains(MessageHelper.FLAG_NOT_JUNK)) {
if (message.blocklist != null && message.blocklist) {
boolean use_blocklist = prefs.getBoolean("use_blocklist", false);
if (use_blocklist) {
EntityLog.log(context, "Block list" +