Added notifying ignore state

app/src/main/java/eu/faircode/email/Core.java

@@ -2964,6 +2964,7 @@ class Core {
             try {
                 db.beginTransaction();
 
+                message.notifying = EntityMessage.NOTIFYING_IGNORE;
                 message.id = db.message().insertMessage(message);
                 Log.i(folder.name + " added id=" + message.id + " uid=" + message.uid);
 
@@ -2979,7 +2980,7 @@ class Core {
                 runRules(context, imessage, account, folder, message, rules);
                 if (download && !message.ui_hide &&
                         MessageClassifier.isEnabled(context) && folder.auto_classify_source)
-                    db.message().setMessageUiHide(message.id, true);
+                    db.message().setMessageUiHide(message.id, true); // keep local value
 
                 db.setTransactionSuccessful();
             } catch (SQLiteConstraintException ex) {
@@ -2996,6 +2997,7 @@ class Core {
                 db.endTransaction();
             }
 
+            try {
                 if (message.received > account.created)
                     updateContactInfo(context, folder, message);
 
@@ -3039,6 +3041,9 @@ class Core {
                                 db.message().setMessageUiHide(message.id, false);
                         }
                 }
+            } finally {
+                db.message().setMessageNotifying(message.id, 0);
+            }
 
             reportNewMessage(context, account, folder, message);
         } else {
@@ -3559,6 +3564,11 @@ class Core {
 
         // Current
         for (TupleMessageEx message : messages) {
+            if (message.notifying == EntityMessage.NOTIFYING_IGNORE) {
+                Log.e("Notify ignore");
+                continue;
+            }
+
             // Check if notification channel enabled
             if (message.notifying == 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && pro) {
                 String channelId = message.getNotificationChannelId();

app/src/main/java/eu/faircode/email/DaoMessage.java

@@ -475,7 +475,8 @@ public interface DaoMessage {
             " WHERE account.`synchronize`" +
             " AND folder.notify" +
             " AND (account.created IS NULL OR message.received > account.created OR message.sent > account.created)" +
-            " AND (notifying <> 0 OR NOT (message.ui_seen OR message.ui_hide))" +
+            " AND message.notifying <> " + EntityMessage.NOTIFYING_IGNORE +
+            " AND (message.notifying <> 0 OR NOT (message.ui_seen OR message.ui_hide))" +
             " ORDER BY message.received DESC")
     LiveData<List<TupleMessageEx>> liveUnseenNotify();
 
@@ -487,6 +488,7 @@ public interface DaoMessage {
             " WHERE (:account IS NULL OR account.id = :account)" +
             " AND account.`synchronize`" +
             " AND folder.notify" +
+            " AND message.notifying <> " + EntityMessage.NOTIFYING_IGNORE +
             " AND NOT (message.ui_seen OR message.ui_hide)" +
             " GROUP BY account.id" +
             " ORDER BY account.id")
@@ -499,6 +501,7 @@ public interface DaoMessage {
             " WHERE (:account IS NULL OR account.id = :account)" +
             " AND account.`synchronize`" +
             " AND folder.notify" +
+            " AND message.notifying <> " + EntityMessage.NOTIFYING_IGNORE +
             " AND NOT (message.ui_seen OR message.ui_hide)")
     TupleMessageStats getWidgetUnseen(Long account);
 

app/src/main/java/eu/faircode/email/EntityMessage.java

@@ -89,6 +89,8 @@ import static androidx.room.ForeignKey.SET_NULL;
 public class EntityMessage implements Serializable {
     static final String TABLE_NAME = "message";
 
+    static final int NOTIFYING_IGNORE = -2;
+
     static final Integer ENCRYPT_NONE = 0;
     static final Integer PGP_SIGNENCRYPT = 1;
     static final Integer PGP_SIGNONLY = 2;