From 9ef30a653eb5d4bdf20c3bbb0848729fb2fd9429 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 4 Nov 2019 09:00:14 +0100
Subject: [PATCH] Skip marking seen on snooze/hide

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java   | 1 +
 app/src/main/java/eu/faircode/email/EntityRule.java       | 3 +--
 app/src/main/java/eu/faircode/email/FragmentMessages.java | 5 +++--
 app/src/main/java/eu/faircode/email/ServiceUI.java        | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 94174b2e5f..0917c151ab 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3206,6 +3206,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             return null;
 
                         db.message().setMessageSnoozed(message.id, hide ? Long.MAX_VALUE : null);
+                        db.message().setMessageUiIgnored(message.id, true);
                         EntityMessage.snooze(context, message.id, hide ? Long.MAX_VALUE : null);
 
                         db.setTransactionSuccessful();
diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index 970651e996..ef3f770419 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -471,12 +471,11 @@ public class EntityRule {
 
         DB db = DB.getInstance(context);
         db.message().setMessageSnoozed(message.id, wakeup);
+        db.message().setMessageUiIgnored(message.id, true);
         EntityMessage.snooze(context, message.id, wakeup);
 
         message.ui_snoozed = wakeup;
 
-        onActionSeen(context, message, true);
-
         return true;
     }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 20054afd02..a425232bab 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2035,6 +2035,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                                 message.account, message.thread, threading ? null : id, message.folder);
                         for (EntityMessage threaded : messages) {
                             db.message().setMessageSnoozed(threaded.id, hide ? Long.MAX_VALUE : null);
+                            db.message().setMessageUiIgnored(message.id, true);
                             EntityMessage.snooze(context, threaded.id, hide ? Long.MAX_VALUE : null);
                         }
                     }
@@ -4332,7 +4333,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                             account, thread, threading ? null : id, null);
                     for (EntityMessage threaded : messages) {
                         db.message().setMessageSnoozed(threaded.id, wakeup);
-                        EntityOperation.queue(context, threaded, EntityOperation.SEEN, true);
+                        db.message().setMessageUiIgnored(message.id, true);
                         EntityMessage.snooze(context, threaded.id, wakeup);
                     }
 
@@ -4391,8 +4392,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                                 message.account, message.thread, threading ? null : id, message.folder);
                         for (EntityMessage threaded : messages) {
                             db.message().setMessageSnoozed(threaded.id, wakeup);
+                            db.message().setMessageUiIgnored(message.id, true);
                             EntityMessage.snooze(context, threaded.id, wakeup);
-                            EntityOperation.queue(context, threaded, EntityOperation.SEEN, true);
                         }
                     }
 
diff --git a/app/src/main/java/eu/faircode/email/ServiceUI.java b/app/src/main/java/eu/faircode/email/ServiceUI.java
index f77aca49d6..db73aa1b5f 100644
--- a/app/src/main/java/eu/faircode/email/ServiceUI.java
+++ b/app/src/main/java/eu/faircode/email/ServiceUI.java
@@ -332,7 +332,7 @@ public class ServiceUI extends IntentService {
                 return;
 
             db.message().setMessageSnoozed(id, wakeup);
-            EntityOperation.queue(this, message, EntityOperation.SEEN, true);
+            db.message().setMessageUiIgnored(message.id, true);
             EntityMessage.snooze(this, id, wakeup);
 
             db.setTransactionSuccessful();