From 677cd16f8b081c8954bd8242d1a9328e5b3d5778 Mon Sep 17 00:00:00 2001
From: David Peer <david.peer@outlook.com>
Date: Fri, 7 Jan 2022 17:26:34 +0100
Subject: [PATCH] Fixed bug that clock is unresponsive

---
 apps.json               |  2 +-
 apps/lcars/ChangeLog    |  3 ++-
 apps/lcars/lcars.app.js | 26 ++++++++++----------------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/apps.json b/apps.json
index 0f200d53a..20ac0afce 100644
--- a/apps.json
+++ b/apps.json
@@ -4488,7 +4488,7 @@
     "name": "LCARS Clock",
     "shortName":"LCARS",
     "icon": "lcars.png",
-    "version":"0.09",
+    "version":"0.10",
     "readme": "README.md",
     "supports": ["BANGLEJS2"],
     "description": "Library Computer Access Retrieval System (LCARS) clock.",
diff --git a/apps/lcars/ChangeLog b/apps/lcars/ChangeLog
index f5d8346da..26aa605e6 100644
--- a/apps/lcars/ChangeLog
+++ b/apps/lcars/ChangeLog
@@ -6,4 +6,5 @@
 0.06: Fix - Alarm disabled, if clock was closed.
 0.07: Added settings to adjust data that is shown for each row.
 0.08: Support for multiple screens. 24h graph for steps + HRM. Fullscreen Mode.
-0.09: Tab anywhere to open the launcher.
\ No newline at end of file
+0.09: Tab anywhere to open the launcher.
+0.10: Fix - Clock is unresponsive, if gadgetbridge connects.
\ No newline at end of file
diff --git a/apps/lcars/lcars.app.js b/apps/lcars/lcars.app.js
index 8f06abc29..3535f57d5 100644
--- a/apps/lcars/lcars.app.js
+++ b/apps/lcars/lcars.app.js
@@ -32,8 +32,8 @@ let cGrey = "#9E9E9E";
 let lcarsViewPos = 0;
 let drag;
 let hrmValue = 0;
-var connected = NRF.getSecurityStatus().connected;
 var plotWeek = false;
+var disableInfoUpdate = true; // When gadgetbridge connects, step infos cannot be loaded
 
 /*
  * Requirements and globals
@@ -170,7 +170,7 @@ function drawHorizontalBgLine(color, x1, x2, y, h){
 }
 
 
-function drawLock(){
+function drawInfo(){
   if(lcarsViewPos != 0){
     return;
   }
@@ -179,7 +179,8 @@ function drawLock(){
   g.setColor(cOrange);
   g.clearRect(120, 10, g.getWidth(), 75);
   g.drawString("LCARS", 128, 13);
-  if(connected){
+
+  if(NRF.getSecurityStatus().connected){
     g.drawString("CONN", 128, 33);
   } else {
     g.drawString("NOCON", 128, 33);
@@ -243,8 +244,8 @@ function drawPosition0(){
   drawHorizontalBgLine(cOrange, 35, batX2, 171, 5);
   drawHorizontalBgLine(cGrey, batX2+10, 172, 171, 5);
 
-  // Draw logo
-  drawLock();
+  // Draw Infos
+  drawInfo();
 
   // Write time
   g.setFontAlign(-1, -1, 0);
@@ -467,24 +468,17 @@ function handleAlarm(){
 Bangle.on('lcdPower',on=>{
   if (on) {
     // Whenever we connect to Gadgetbridge, reading data from
-    // health failed. Therefore, we update and read data from
-    // health iff the connection state did not change.
-    if(connected == NRF.getSecurityStatus().connected) {
-      draw();
-    } else {
-      connected = NRF.getSecurityStatus().connected
-      drawLock();
-    }
+    // health failed. Therefore, we update only partially...
+    drawInfo();
+    drawState();
   } else { // stop draw timer
     if (drawTimeout) clearTimeout(drawTimeout);
     drawTimeout = undefined;
   }
-
-  connected = NRF.getSecurityStatus().connected
 });
 
 Bangle.on('lock', function(isLocked) {
-  drawLock();
+  drawInfo();
 });
 
 Bangle.on('charging',function(charging) {