From d82454f942f3790996a3aede3c62a01dbc7d2b71 Mon Sep 17 00:00:00 2001
From: Marco Heiming <myx00r@googlemail.com>
Date: Wed, 6 Jul 2022 07:49:16 +0200
Subject: [PATCH] Fix messages ignoring "Vibrate: Off" setting (from PR #2023)

---
 apps/messages/ChangeLog | 1 +
 apps/messages/widget.js | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/messages/ChangeLog b/apps/messages/ChangeLog
index 6e0f540bb..59a647b58 100644
--- a/apps/messages/ChangeLog
+++ b/apps/messages/ChangeLog
@@ -55,3 +55,4 @@
 0.40: Use default Bangle formatter for booleans
 0.41: Add notification icons in the widget
 0.42: Separate buzz pattern for incoming calls
+      Fix messages ignoring "Vibrate: Off" setting
diff --git a/apps/messages/widget.js b/apps/messages/widget.js
index ffca9dab6..c8ae8d570 100644
--- a/apps/messages/widget.js
+++ b/apps/messages/widget.js
@@ -62,12 +62,15 @@ draw:function(recall) {
   Bangle.drawWidgets();
 },buzz:function(msgSrc) { 
   if ((require('Storage').readJSON('setting.json',1)||{}).quiet) return; // never buzz during Quiet Mode
+  var pattern;
   if (msgSrc != undefined && msgSrc.toLowerCase() == "phone") {
     // special vibration pattern for incoming calls
-    require("buzz").pattern((require('Storage').readJSON("messages.settings.json", true) || {}).vibrateCalls || ":");
+    pattern = (require('Storage').readJSON("messages.settings.json", true) || {}).vibrateCalls;
   } else {
-    require("buzz").pattern((require('Storage').readJSON("messages.settings.json", true) || {}).vibrate || ":");
+    pattern = (require('Storage').readJSON("messages.settings.json", true) || {}).vibrate;
   }
+  if (pattern === undefined) { pattern = ":"; } // pattern may be "", so we can't use || ":" here
+  require("buzz").pattern(pattern);
 },touch:function(b,c) {
   var w=WIDGETS["messages"];
   if (!w||!w.width||c.x<w.x||c.x>w.x+w.width||c.y<w.y||c.y>w.y+w.iconwidth) return;