From 5aac79a205a07597fb6390356bdae043bc26f510 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 5 Apr 2023 11:59:42 +0200
Subject: [PATCH] New messages: check changes early

---
 app/src/main/java/eu/faircode/email/Core.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index a2912ab675..3019f2d9db 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -5263,6 +5263,13 @@ class Core {
                         " ignored=" + message.ui_ignored +
                         " hide=" + message.ui_hide);
             else {
+                // Prevent reappearing notifications
+                EntityMessage msg = db.message().getMessage(message.id);
+                if (msg == null || msg.ui_ignored) {
+                    Log.i("Notify skip id=" + message.id + " msg=" + (msg != null));
+                    continue;
+                }
+
                 Integer current = newMessages.get(group);
                 newMessages.put(group, current == null ? 1 : current + 1);
 
@@ -5296,11 +5303,6 @@ class Core {
                     remove.remove(id);
                     Log.i("Notify existing=" + id);
                 } else {
-                    EntityMessage msg = db.message().getMessage(message.id);
-                    if (msg == null || msg.ui_ignored) {
-                        Log.i("Notify skip id=" + message.id + " msg=" + (msg != null));
-                        continue;
-                    }
                     boolean existing = remove.contains(-id);
                     if (existing) {
                         if (message.content && notify_preview) {