From 1d1765c5cee9c7d1c5156155448df6b64e26ec41 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 22 Jul 2021 09:36:49 +0200 Subject: [PATCH] Fixed cancelling folder notifications --- app/src/main/java/eu/faircode/email/DaoMessage.java | 2 +- app/src/main/java/eu/faircode/email/ServiceUI.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java index 8b6588524a..ee93d64c6d 100644 --- a/app/src/main/java/eu/faircode/email/DaoMessage.java +++ b/app/src/main/java/eu/faircode/email/DaoMessage.java @@ -784,7 +784,7 @@ public interface DaoMessage { " OR (:account IS NULL AND NOT account.notify))" + " AND folder IN (" + " SELECT id FROM folder" + - " WHERE :folder IS NULL OR id = :folder)") + " WHERE (:folder IS NULL AND folder.unified) OR id = :folder)") int ignoreAll(Long account, Long folder); @Query("UPDATE message SET ui_found = 1 WHERE id = :id AND NOT (ui_found IS 1)") diff --git a/app/src/main/java/eu/faircode/email/ServiceUI.java b/app/src/main/java/eu/faircode/email/ServiceUI.java index efe4e13eeb..c3f7342784 100644 --- a/app/src/main/java/eu/faircode/email/ServiceUI.java +++ b/app/src/main/java/eu/faircode/email/ServiceUI.java @@ -180,6 +180,10 @@ public class ServiceUI extends IntentService { } private void onClear(long group) { + // Group + // < 0: folder + // = 0: unified + // > 0: account DB db = DB.getInstance(this); int cleared; if (group < 0)