From ee3b2abed2754a15980ad7daae9a52153c37eba5 Mon Sep 17 00:00:00 2001
From: Jan Schneider <oss@janschneider.net>
Date: Sun, 10 Dec 2023 12:16:01 +0100
Subject: [PATCH 1/2] Auto close confirmation dialog after timeout

---
 source/HomeAssistantConfirmation.mc | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/source/HomeAssistantConfirmation.mc b/source/HomeAssistantConfirmation.mc
index 7d05604..a73d3e1 100644
--- a/source/HomeAssistantConfirmation.mc
+++ b/source/HomeAssistantConfirmation.mc
@@ -22,9 +22,9 @@ using Toybox.Lang;
 // Required for callback method definition
 typedef Method as Toybox.Lang.Method;
 using Toybox.WatchUi;
+using Toybox.Timer;
 
 class HomeAssistantConfirmation extends WatchUi.Confirmation {
-
     function initialize() {
         WatchUi.Confirmation.initialize(WatchUi.loadResource($.Rez.Strings.Confirm));
     }
@@ -33,17 +33,26 @@ class HomeAssistantConfirmation extends WatchUi.Confirmation {
 
 class HomeAssistantConfirmationDelegate extends WatchUi.ConfirmationDelegate {
     private var confirmMethod;
+    private var timeout;
 
     function initialize(callback as Method() as Void) {
         WatchUi.ConfirmationDelegate.initialize();
         confirmMethod = callback;
+        timeout = new Timer.Timer();
+        timeout.start(method(:onTimeout), 3000, true);
     }
 
     function onResponse(response) as Lang.Boolean {
         getApp().getQuitTimer().reset();
+        timeout.stop();
         if (response == WatchUi.CONFIRM_YES) {
             confirmMethod.invoke();
         }
         return true;
     }
+
+    function onTimeout() as Void {
+        timeout.stop();
+        WatchUi.popView(WatchUi.SLIDE_RIGHT);
+    }
 }

From 143bcf08a7e162fcd3f6e000005d315948c6b813 Mon Sep 17 00:00:00 2001
From: Jan Schneider <oss@janschneider.net>
Date: Sun, 10 Dec 2023 22:52:09 +0100
Subject: [PATCH 2/2] Add application property "confirm_timeout"

After this time (in seconds), a confirmation dialog for an action is automatically closed and the action is cancelled.
Set to 0 to disable the timeout. The default value is 3 seconds.
---
 resources/settings/properties.xml   |  6 ++++++
 resources/settings/settings.xml     | 10 ++++++++++
 source/HomeAssistantConfirmation.mc | 12 +++++++++---
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/resources/settings/properties.xml b/resources/settings/properties.xml
index b640dfa..102efc1 100644
--- a/resources/settings/properties.xml
+++ b/resources/settings/properties.xml
@@ -30,6 +30,12 @@
   -->
   <property id="app_timeout" type="number">0</property>
 
+  <!--
+    After this time (in seconds), a confirmation dialog for an action is automatically closed and the action is cancelled.
+    Set to 0 to disable the timeout. The default value is 3 seconds.
+  -->
+  <property id="confirm_timeout" type="number">3</property>
+
   <property id="types_representation" type="boolean"></property>
 
   <property id="menu_alignment" type="boolean"></property>
diff --git a/resources/settings/settings.xml b/resources/settings/settings.xml
index 6f10416..638194d 100644
--- a/resources/settings/settings.xml
+++ b/resources/settings/settings.xml
@@ -53,6 +53,16 @@
     />
   </setting>
 
+  <setting
+    propertyKey="@Properties.confirm_timeout"
+    title="After this time (in seconds), a confirmation dialog for an action is automatically closed and the action is cancelled. Set to 0 to disable the timeout."
+  >
+    <settingConfig
+      type="numeric"
+      min="0"
+    />
+  </setting>
+
   <setting
     propertyKey="@Properties.types_representation"
     title="Representing types with icons (off) or with labels (on)"
diff --git a/source/HomeAssistantConfirmation.mc b/source/HomeAssistantConfirmation.mc
index a73d3e1..24381a3 100644
--- a/source/HomeAssistantConfirmation.mc
+++ b/source/HomeAssistantConfirmation.mc
@@ -23,6 +23,7 @@ using Toybox.Lang;
 typedef Method as Toybox.Lang.Method;
 using Toybox.WatchUi;
 using Toybox.Timer;
+using Toybox.Application.Properties;
 
 class HomeAssistantConfirmation extends WatchUi.Confirmation {
     function initialize() {
@@ -38,13 +39,18 @@ class HomeAssistantConfirmationDelegate extends WatchUi.ConfirmationDelegate {
     function initialize(callback as Method() as Void) {
         WatchUi.ConfirmationDelegate.initialize();
         confirmMethod = callback;
-        timeout = new Timer.Timer();
-        timeout.start(method(:onTimeout), 3000, true);
+        var timeoutSeconds = Properties.getValue("confirm_timeout") as Lang.Number; 
+        if (timeoutSeconds > 0) {
+            timeout = new Timer.Timer();
+            timeout.start(method(:onTimeout), timeoutSeconds * 1000, true);
+        }
     }
 
     function onResponse(response) as Lang.Boolean {
         getApp().getQuitTimer().reset();
-        timeout.stop();
+        if (timeout) {
+            timeout.stop();
+        }
         if (response == WatchUi.CONFIRM_YES) {
             confirmMethod.invoke();
         }