From 6491532c2d84ed3d7106d9c637bacf3de8f55944 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 14 Nov 2023 11:22:12 +0100 Subject: [PATCH] Prevent race condition --- app/src/main/java/eu/faircode/email/Core.java | 8 ++++++-- 1 file changed, 6 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 52e2c20a2a..7a6cb263aa 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -5619,8 +5619,12 @@ class Core { if (message.notifying == 0) { // Handle clear notifying on boot/update - data.groupNotifying.get(group).remove(message.id); - data.groupNotifying.get(group).remove(-message.id); + EntityMessage msg = db.message().getMessage(message.id); + if (msg != null && msg.notifying == 0) { + EntityLog.log(context, "Notify boot=" + msg.id); + data.groupNotifying.get(group).remove(msg.id); + data.groupNotifying.get(group).remove(-msg.id); + } } else { long id = message.id * message.notifying; if (!data.groupNotifying.get(group).contains(id) &&