From f4740b149b5649bf0328210de1414ce56c4fb839 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Fri, 14 Jul 2023 13:16:40 +0100
Subject: [PATCH] messageslist: Fix invalid use of Bangle.setUI

---
 apps/messagelist/ChangeLog     | 1 +
 apps/messagelist/app.js        | 4 +++-
 apps/messagelist/metadata.json | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/messagelist/ChangeLog b/apps/messagelist/ChangeLog
index 8db873bb9..37854d8ae 100644
--- a/apps/messagelist/ChangeLog
+++ b/apps/messagelist/ChangeLog
@@ -1,2 +1,3 @@
 0.01: New app!
 0.02: Fix music updates while app is already open
+0.03: Fix invalid use of Bangle.setUI
\ No newline at end of file
diff --git a/apps/messagelist/app.js b/apps/messagelist/app.js
index 3e71f9544..dfa7e43d4 100644
--- a/apps/messagelist/app.js
+++ b/apps/messagelist/app.js
@@ -86,7 +86,8 @@
 
   const setUI = function(options, cb) {
     delete Bangle.uiRemove; // don't clear out things when switching UI within the app
-    options = Object.assign({remove: () => uiRemove()}, options);
+    options = Object.assign({mode:"custom", remove: () => uiRemove()}, options);
+    // If options={} assume we still want `remove` to be called when leaving via fast load (so we must have 'mode:custom')
     Bangle.setUI(options, cb);
   };
 
@@ -1164,6 +1165,7 @@
 
   // Internal setUI suppresses Bangle.uiRemove between internal screens, so we
   // need to call setUI to run uiRemove from previous app when fast-loaded.
+  // GW: This shouldn't be needed! When fast loading setUI() gets called automatically
   Bangle.setUI();
   Bangle.loadWidgets();
   require("messages").toggleWidget(false);
diff --git a/apps/messagelist/metadata.json b/apps/messagelist/metadata.json
index 72404263f..37fed5795 100644
--- a/apps/messagelist/metadata.json
+++ b/apps/messagelist/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "messagelist",
   "name": "Message List",
-  "version": "0.02",
+  "version": "0.03",
   "description": "Display notifications from iOS and Gadgetbridge/Android as a list",
   "icon": "app.png",
   "type": "app",