Merge branch 'messages-auto-display-settings' into app-loader

Author: thyttan

apps/messagegui/lib.js

@@ -35,9 +35,9 @@ exports.listener = function(type, msg) {
   }
 
   const appSettings = require("Storage").readJSON("messages.settings.json", 1) || {};
-  const autoOpen = appSettings.autoOpen;
+  const autoOpen = appSettings.autoOpen ?? 1;
   let loadMessages = (
-    (autoOpen === 1 && Bangle.CLOCK) || (autoOpen === 2 && Bangle.isLocked()) || autoOpen === 3 ||
+    (autoOpen === 1 && Bangle.CLOCK) || (autoOpen === 2 && (Bangle.isLocked() || Bangle.CLOCK)) || autoOpen === 3 ||
       msg.important
   ); // should we load the messages app?
   if (type==="music") {
@@ -64,7 +64,7 @@ exports.listener = function(type, msg) {
   const quiet = (require("Storage").readJSON("setting.json", 1) || {}).quiet;
   const unlockWatch = appSettings.unlockWatch;
   // don't auto-open messages in quiet mode if quietNoAutOpn is true
-  if ((quiet && appSettings.quietNoAutOpn))
+  if (quiet && appSettings.quietNoAutOpn)
     loadMessages = false;
   // after a delay load the app, to ensure we have all the messages
   if (exports.messageTimeout) clearTimeout(exports.messageTimeout);

apps/messages/README.md

@@ -64,7 +64,7 @@ There are several options to choose from:
 * **Auto-open new msg** : Should we open the messages app for new messages?
   * **Never** : Never open for new messages
   * **On clock** : Open if a clock face is showing (default)
-  * **If locked** : Open if the screen is locked
+  * **If locked** : Open if the screen is locked or clock face is showing
   * **Always** : Always open new messages
 * **Widget messages** : How many message icons should the widget show?
 * **Show Widgets** : Should widgets be shown when a message is being displayed (default of disabled leaves more room for the message text)

apps/messages/settings.js

@@ -83,11 +83,7 @@
     /*LANG*/'Auto-open new msg': {
       value: settings.autoOpen,
       min:0,max:3,step:1,
-      format: v =>
-        v===0 ? "Never" :
-          v===1 ? "On clock" :
-            v===2 ? "If locked" :
-              "Always",
+      format: v=>["Never","On clock","If locked","Always"][v],
       onchange: v => updateSetting("autoOpen", v)
     },
     /*LANG*/'Widget messages': {