From 28d3a6eb1d8e5c19c489380eeae3f3310d9b11c6 Mon Sep 17 00:00:00 2001
From: Markus <emailaddress@markus-deibel.de>
Date: Fri, 17 Apr 2020 12:29:40 +0200
Subject: [PATCH] Fix failing dismissal of Gadgetbridge messages

---
 apps/batchart/widget.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/apps/batchart/widget.js b/apps/batchart/widget.js
index 1b8ce79ba..aa81c2c5b 100644
--- a/apps/batchart/widget.js
+++ b/apps/batchart/widget.js
@@ -71,8 +71,9 @@
       enabledConsumers = enabledConsumers | switchableConsumers.gps;
     if (hrmEventReceived)
       enabledConsumers = enabledConsumers | switchableConsumers.hrm;
-    //if (Bangle.isBluetoothOn())
-    //   enabledConsumers = enabledConsumers | switchableConsumers.bluetooth;
+    // First, coarse indication if the bluetooth device is enabled
+    if (NodeFilter.getSecuritystatus().connected)
+       enabledConsumers = enabledConsumers | switchableConsumers.bluetooth;
 
     // Reset the event registration vars
     compassEventReceived = false;
@@ -110,19 +111,14 @@
   }
 
   function reload() {
-    WIDGETS.batchart.width = 24;
+    WIDGETS["batchart"].width = 24;
 
     recordingInterval = setInterval(logBatteryData, recordingInterval10Min);
-
-    logBatteryData();
   }
 
   // add the widget
-  WIDGETS.batchart = {
-    area: "tl", width: 24, draw: draw, reload: function () {
-      reload();
-      Bangle.drawWidgets();
-    }
+  WIDGETS["batchart"] = {
+    area: "tl", width: 24, draw: draw, reload: reload
   };
 
   reload();