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

Allow moving messages on blocklists

This commit is contained in:
M66B 2021-06-26 12:19:23 +02:00
parent 4282330646
commit 1ddc2ce36e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3159,6 +3159,7 @@ class Core {
// Find message by Message-ID (slow, headers required)
// - messages in inbox have same id as message sent to self
// - messages in archive have same id as original
boolean have = false;
Integer color = null;
String notes = null;
Integer notes_color = null;
@ -3172,6 +3173,9 @@ class Core {
" folder=" + dfolder.type + ":" + dup.folder + "/" + folder.type + ":" + folder.id +
" msgid=" + dup.msgid + " thread=" + dup.thread);
if (!EntityFolder.JUNK.equals(dfolder.type))
have = true;
if (dup.folder.equals(folder.id)) {
String thread = helper.getThreadId(context, account.id, uid);
Log.i(folder.name + " found as id=" + dup.id +
@ -3395,7 +3399,7 @@ class Core {
runRules(context, imessage, account, folder, message, rules);
if (message.blocklist != null && message.blocklist) {
if (!have && message.blocklist != null && message.blocklist) {
boolean use_blocklist = prefs.getBoolean("use_blocklist", false);
if (use_blocklist) {
EntityLog.log(context, "Block list" +