|
|
@ -3575,6 +3575,8 @@ class Core {
|
|
|
|
message.warning = Log.formatThrowable(ex, false);
|
|
|
|
message.warning = Log.formatThrowable(ex, false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
boolean check_blocklist = prefs.getBoolean("check_blocklist", false);
|
|
|
|
|
|
|
|
if (check_blocklist) {
|
|
|
|
boolean notJunk = false;
|
|
|
|
boolean notJunk = false;
|
|
|
|
if (message.from != null)
|
|
|
|
if (message.from != null)
|
|
|
|
for (Address from : message.from) {
|
|
|
|
for (Address from : message.from) {
|
|
|
@ -3590,9 +3592,7 @@ class Core {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
boolean check_blocklist = prefs.getBoolean("check_blocklist", false);
|
|
|
|
if (!have &&
|
|
|
|
if (check_blocklist &&
|
|
|
|
|
|
|
|
!have &&
|
|
|
|
|
|
|
|
!EntityFolder.isOutgoing(folder.type) &&
|
|
|
|
!EntityFolder.isOutgoing(folder.type) &&
|
|
|
|
!EntityFolder.ARCHIVE.equals(folder.type) &&
|
|
|
|
!EntityFolder.ARCHIVE.equals(folder.type) &&
|
|
|
|
!EntityFolder.TRASH.equals(folder.type) &&
|
|
|
|
!EntityFolder.TRASH.equals(folder.type) &&
|
|
|
@ -3614,6 +3614,7 @@ class Core {
|
|
|
|
} catch (Throwable ex) {
|
|
|
|
} catch (Throwable ex) {
|
|
|
|
Log.w(folder.name, ex);
|
|
|
|
Log.w(folder.name, ex);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
db.beginTransaction();
|
|
|
|
db.beginTransaction();
|
|
|
|