From d32135af6362419d814e1c35d70f9cd8432cb5e7 Mon Sep 17 00:00:00 2001
From: Vincent Elger Zwanenburg <vincent@zwanenburg.ie>
Date: Mon, 21 Jul 2025 19:45:14 +0100
Subject: [PATCH] fix setting toggleItem, periodic pulling

---
 source/HomeAssistantApp.mc            | 46 ++++++++++++++++++---------
 source/HomeAssistantToggleMenuItem.mc |  2 ++
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/source/HomeAssistantApp.mc b/source/HomeAssistantApp.mc
index ba2471c..dcedea8 100644
--- a/source/HomeAssistantApp.mc
+++ b/source/HomeAssistantApp.mc
@@ -40,6 +40,7 @@ class HomeAssistantApp extends Application.AppBase {
     private var mIsApp          as Lang.Boolean    = false; // Or Widget
     private var mUpdating       as Lang.Boolean    = false; // Don't start a second chain of updates
     private var mTemplates      as Lang.Dictionary = {};
+    private var mNotifiedNoBle  as Lang.Boolean = false;
 
     //! Class Constructor
     //
@@ -321,11 +322,11 @@ class HomeAssistantApp extends Application.AppBase {
 
     //! Start the periodic menu updates for as long as the application is running.
     //
-    function startUpdates() {
+    function startUpdates() as Void {
         if (mHaMenu != null and !mUpdating) {
             // Start the continuous update process that continues for as long as the application is running.
-            updateMenuItems();
             mUpdating = true;
+            updateMenuItems();
         }
     }
 
@@ -435,22 +436,35 @@ class HomeAssistantApp extends Application.AppBase {
 
         // In Wifi/LTE execution mode, we should not show an error page but use a toast instead.
         if (Settings.getWifiLteExecutionEnabled() && (! phoneConnected || ! connectionAvailable)) {
-            var toast = WatchUi.loadResource($.Rez.Strings.NoPhone);
-            if (!connectionAvailable) {
-                toast = WatchUi.loadResource($.Rez.Strings.NoInternet);
+            // Notify only once per disconnection cycle
+            if (!mNotifiedNoBle) {
+                var toast = WatchUi.loadResource($.Rez.Strings.NoPhone);
+                if (!connectionAvailable) {
+                    toast = WatchUi.loadResource($.Rez.Strings.NoInternet);
+                }
+
+                if (mHasToast) {
+                    WatchUi.showToast(toast, null);
+                } else {
+                    new Alert({
+                        :timeout => Globals.scAlertTimeout,
+                        :font    => Graphics.FONT_MEDIUM,
+                        :text    => toast,
+                        :fgcolor => Graphics.COLOR_WHITE,
+                        :bgcolor => Graphics.COLOR_BLACK
+                    }).pushView(WatchUi.SLIDE_IMMEDIATE);
+                }
             }
 
-            if (mHasToast) {
-                WatchUi.showToast(toast, null);
-            } else {
-                new Alert({
-                    :timeout => Globals.scAlertTimeout,
-                    :font    => Graphics.FONT_MEDIUM,
-                    :text    => toast,
-                    :fgcolor => Graphics.COLOR_WHITE,
-                    :bgcolor => Graphics.COLOR_BLACK
-                }).pushView(WatchUi.SLIDE_IMMEDIATE);
+            mNotifiedNoBle = true;
+            setApiStatus(WatchUi.loadResource($.Rez.Strings.Unavailable) as Lang.String);
+
+            var delay = Settings.getPollDelay();
+            if (delay > 0) {
+                mUpdateTimer.start(method(:startUpdates), delay, false);
             }
+
+            mUpdating = false;
             return;
         }
 
@@ -463,6 +477,8 @@ class HomeAssistantApp extends Application.AppBase {
             ErrorView.show(WatchUi.loadResource($.Rez.Strings.NoInternet) as Lang.String);
             setApiStatus(WatchUi.loadResource($.Rez.Strings.Unavailable) as Lang.String);
         } else {
+            mNotifiedNoBle = false;
+
             if (mItemsToUpdate == null or mTemplates == null) {
                 mItemsToUpdate = mHaMenu.getItemsToUpdate();
                 mTemplates = {};
diff --git a/source/HomeAssistantToggleMenuItem.mc b/source/HomeAssistantToggleMenuItem.mc
index 3c22ed0..2c47de2 100644
--- a/source/HomeAssistantToggleMenuItem.mc
+++ b/source/HomeAssistantToggleMenuItem.mc
@@ -255,6 +255,8 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
             var url = getUrl(id, s);
 
             if ((! phoneConnected || ! internetAvailable) && Settings.getWifiLteExecutionEnabled()) {
+                // Undo the toggle
+                setEnabled(!isEnabled());
                 wifiPrompt(s);
                 return;
             }