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

Disable ignore on unsnooze

This commit is contained in:
M66B 2019-06-23 10:18:43 +02:00
parent 09744379f6
commit ce39566d60
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/EntityOperation.java
View File

@ -98,9 +98,10 @@ public class EntityOperation {
long folder = message.folder; long folder = message.folder;
try { try {
if (SEEN.equals(name)) { if (SEEN.equals(name)) {
boolean ignore = jargs.optBoolean(1, true);
for (EntityMessage similar : db.message().getMessageByMsgId(message.account, message.msgid)) { for (EntityMessage similar : db.message().getMessageByMsgId(message.account, message.msgid)) {
db.message().setMessageUiSeen(similar.id, jargs.getBoolean(0)); db.message().setMessageUiSeen(similar.id, jargs.getBoolean(0));
db.message().setMessageUiIgnored(similar.id, true); db.message().setMessageUiIgnored(similar.id, ignore);
} }
} else if (FLAG.equals(name)) { } else if (FLAG.equals(name)) {

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

@ -234,10 +234,8 @@ public class ServiceUI extends IntentService {
Log.i("Delayed send id=" + message.id); Log.i("Delayed send id=" + message.id);
EntityOperation.queue(this, message, EntityOperation.SEND); EntityOperation.queue(this, message, EntityOperation.SEND);
} else { } else {
if (folder.notify) { if (folder.notify)
db.message().setMessageUiIgnored(message.id, false); EntityOperation.queue(this, message, EntityOperation.SEEN, false, false);
EntityOperation.queue(this, message, EntityOperation.SEEN, false);
}
} }
} }