Minor fixes, GW v 1.1.10pre

buessow · Dec 5, 2023 · 2b4ad01 · 2b4ad01
1 parent f504189
commit 2b4ad01
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/GlucoseWatchFace/manifest.xml b/GlucoseWatchFace/manifest.xml
@@ -8,7 +8,7 @@
         launcherIcon="@Drawables.LauncherIcon" 
         name="@Strings.AppName" 
         type="watchface" 
-        version="1.1.9.pre">
+        version="1.1.10.pre">
         <iq:products>
             <iq:product id="legacyherocaptainmarvel"/>
             <iq:product id="fr55"/>

diff --git a/GlucoseWatchFace/source/GlucoseWatchFaceView.mc b/GlucoseWatchFace/source/GlucoseWatchFaceView.mc
@@ -38,8 +38,9 @@ class GlucoseWatchFaceView extends Ui.WatchFace {
     Ui.requestUpdate();
   }
 
-  private function setVisible(id as String, visible as Boolean) as Void {
+  private function setVisible(id as String, visible as Boolean?) as Void {
     var drawable = View.findDrawableById(id);
+    if (visible == null) { return; }
     if (drawable != null) {
       drawable.setVisible(visible);
     }

diff --git a/Shared/source/BaseServer.mc b/Shared/source/BaseServer.mc
@@ -20,9 +20,10 @@ class BaseServer {
     data.setRemainingInsulin(msg["remainingInsulin"] as Float?);
     data.setTemporaryBasalRate(msg["temporaryBasalRate"] as Float?);
     data.setProfile(msg["profile"] as String?);
-    switch (msg["glucoseUnit"]) {
-      case "mmoll": data.setGlucoseUnit(Data.mmoll); break;
-      default: data.setGlucoseUnit(Data.mgdl); break;
+    if (msg["glucoseUnit"] != null && "mmoll".equals(msg["glucoseUnit"])) {
+      data.setGlucoseUnit(Data.mmoll); 
+    } else {
+      data.setGlucoseUnit(Data.mgdl);
     }
 
     if (msg["connected"] instanceof Boolean) {