Merge remote-tracking branch 'upstream/music_message_handling' into app-loader

Author: thyttan

apps/messages/ChangeLog

@@ -16,3 +16,4 @@
       default, if locked, always)
 0.69: Remove .music field (which is not used - require("messages").getMessages().find(m=>m.id=="music") works fine)
       Ensure .getMessages uses Bangle.MESSAGES to return the most up to date message info
+0.70: Fix message app not showing latest music messages

apps/messages/lib.js

@@ -152,6 +152,9 @@ exports.clearAll = function() {
  * that aren't yet written) apply them to the messages we read so we get
  * up to date info.
  *
+ * If were in the messages app and it's defined `MESSAGES` then we just use that
+ * as it contains all the messages that are already loaded.
+ *
  * Optionally pass in a message to apply to the list, this is for event handlers:
  * By passing the message from the event, you can make sure the list is up-to-date,
  * even if the message has not been saved (yet)
@@ -165,7 +168,11 @@ exports.clearAll = function() {
  * @returns {array} All messages
  */
 exports.getMessages = function(withMessage) {
-  let messages = require("Storage").readJSON("messages.json", true);
+  let messages;
+  if (global.MESSAGES!==undefined)
+    messages = global.MESSAGES.slice(); // we're in the messages app, just use the messages list that it's keeping (clone the array)
+  else
+    messages = require("Storage").readJSON("messages.json", true);
   messages = Array.isArray(messages) ? messages : []; // make sure we always return an array
   (Bangle.MESSAGES || []).forEach(m => require("messages").apply(m, messages)); // apply any usaved messages
   if (withMessage && withMessage.id) exports.apply(withMessage, messages);

apps/messages/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "messages",
   "name": "Messages",
-  "version": "0.69",
+  "version": "0.70",
   "description": "Library to handle, load and store message events received from Android/iOS",
   "icon": "app.png",
   "type": "module",