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

Label $NotJunk

This commit is contained in:
M66B 2021-06-30 21:35:00 +02:00
parent 7facb24e36
commit 39f1867d88
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/Core.java
View File

@ -1268,6 +1268,13 @@ class Core {
// Remove star
if (unflag && imessage.isSet(Flags.Flag.FLAGGED) && flags.contains(Flags.Flag.FLAGGED))
imessage.setFlag(Flags.Flag.FLAGGED, false);
// Mark not spam
if (EntityFolder.JUNK.equals(folder.type)
&& ifolder.getPermanentFlags().contains(Flags.Flag.USER)) {
Flags notJunk = new Flags("$NotJunk");
imessage.setFlags(notJunk, true);
}
}
// https://tools.ietf.org/html/rfc6851
@ -3406,7 +3413,8 @@ class Core {
if (!have &&
!EntityFolder.TRASH.equals(folder.type) &&
!EntityFolder.JUNK.equals(folder.type) &&
message.blocklist != null && message.blocklist) {
message.blocklist != null && message.blocklist &&
!Arrays.asList(message.keywords).contains("$NotJunk")) {
boolean use_blocklist = prefs.getBoolean("use_blocklist", false);
if (use_blocklist) {
EntityLog.log(context, "Block list" +