Disable ignore on unsnooze

6 years ago · ce39566d60
parent 09744379f6
commit ce39566d60
2 changed files with 4 additions and 5 deletions
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@ -98,9 +98,10 @@ public class EntityOperation {
        long folder = message.folder;
        try {
            if (SEEN.equals(name)) {
+                boolean ignore = jargs.optBoolean(1, true);
                for (EntityMessage similar : db.message().getMessageByMsgId(message.account, message.msgid)) {
                    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)) {
--- a/app/src/main/java/eu/faircode/email/ServiceUI.java
+++ b/app/src/main/java/eu/faircode/email/ServiceUI.java
@ -234,10 +234,8 @@ public class ServiceUI extends IntentService {
                    Log.i("Delayed send id=" + message.id);
                    EntityOperation.queue(this, message, EntityOperation.SEND);
                } else {
-                    if (folder.notify) {
-                        db.message().setMessageUiIgnored(message.id, false);
-                        EntityOperation.queue(this, message, EntityOperation.SEEN, false);
-                    }
+                    if (folder.notify)
+                        EntityOperation.queue(this, message, EntityOperation.SEEN, false, false);
                }
            }