From b7f00b1ee99acc819ebe0ed7b08ddcca53fc0661 Mon Sep 17 00:00:00 2001 From: Gordon Williams Date: Wed, 27 Apr 2022 16:28:11 +0100 Subject: [PATCH] 0.36: Ensure a new message plus an almost immediate deletion of that message doesn't load the messages app (fix #1362) --- apps/messages/ChangeLog | 1 + apps/messages/lib.js | 3 +++ apps/messages/metadata.json | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/messages/ChangeLog b/apps/messages/ChangeLog index 47697277c..7baded76d 100644 --- a/apps/messages/ChangeLog +++ b/apps/messages/ChangeLog @@ -48,3 +48,4 @@ 0.33: Timeout from the message list screen if the message being displayed is removed and there is a timer going 0.34: Don't buzz for 'map' update messages 0.35: Reset graphics colors before rendering a message (possibly fix #1752) +0.36: Ensure a new message plus an almost immediate deletion of that message doesn't load the messages app (fix #1362) diff --git a/apps/messages/lib.js b/apps/messages/lib.js index f584c9e93..c39c8886c 100644 --- a/apps/messages/lib.js +++ b/apps/messages/lib.js @@ -43,6 +43,9 @@ exports.pushMessage = function(event) { // if we've removed the last new message, hide the widget if (event.t=="remove" && !messages.some(m=>m.new)) { if (global.WIDGETS && WIDGETS.messages) WIDGETS.messages.hide(); + // if no new messages now, make sure we don't load the messages app + if (exports.messageTimeout && !messages.some(m=>m.new)) + clearTimeout(exports.messageTimeout); } // ok, saved now if (event.id=="music" && Bangle.CLOCK && messages[mIdx].new && openMusic()) { diff --git a/apps/messages/metadata.json b/apps/messages/metadata.json index 9a2b0a880..1f9e4147b 100644 --- a/apps/messages/metadata.json +++ b/apps/messages/metadata.json @@ -1,7 +1,7 @@ { "id": "messages", "name": "Messages", - "version": "0.35", + "version": "0.36", "description": "App to display notifications from iOS and Gadgetbridge/Android", "icon": "app.png", "type": "app",