From c44c436f5e5cbb4abdf0e2bfa2a4a847df4352cc Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 16 Aug 2019 19:58:58 +0200 Subject: [PATCH] Show unseen message count in widget/badge --- app/src/main/java/eu/faircode/email/Core.java | 2 +- app/src/main/java/eu/faircode/email/DaoMessage.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 7a3094c3b7..3e5d7072be 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -1943,7 +1943,7 @@ class Core { int unseen = 0; Map> groupMessages = new HashMap<>(); for (TupleMessageEx message : messages) { - if (!(message.ui_seen || message.ui_ignored || message.ui_hide != 0)) + if (!message.ui_seen && message.ui_hide == 0) unseen++; // Check if notification channel enabled diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java index 865c1b2581..5a0f12bb25 100644 --- a/app/src/main/java/eu/faircode/email/DaoMessage.java +++ b/app/src/main/java/eu/faircode/email/DaoMessage.java @@ -265,7 +265,7 @@ public interface DaoMessage { " WHERE account.`synchronize`" + " AND folder.notify" + " AND (account.created IS NULL OR message.received > account.created)" + - " AND (notifying <> 0 OR NOT (message.ui_seen OR message.ui_ignored OR message.ui_hide <> 0))" + + " AND (notifying <> 0 OR NOT (message.ui_seen OR message.ui_hide <> 0))" + " ORDER BY message.received") LiveData> liveUnseenNotify();