remi/GarminHomeAssistant
1
0
Fork 0
mirror of https://github.com/house-of-abbey/GarminHomeAssistant.git synced 2025-07-31 08:58:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

move popview up so it does not close wifi dialog

Browse Source
This commit is contained in:
Vincent Elger Zwanenburg
2025-07-11 19:40:44 +01:00
parent 62f0e711c9
commit b45f02ef7b
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/HomeAssistantPinConfirmation.mc
View File

@ -237,8 +237,8 @@ class HomeAssistantPinConfirmationDelegate extends WatchUi.BehaviorDelegate {
if (mTimer != null) {
mTimer.stop();
}
mConfirmMethod.invoke(mState);
WatchUi.popView(WatchUi.SLIDE_RIGHT);
mConfirmMethod.invoke(mState);
} else {
error();
}

4
source/HomeAssistantToggleMenuItem.mc
View File

@ -256,7 +256,7 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
url = url + id.substring(0, id.find(".")) + "/turn_off";
}
if (! phoneConnected && ! internetAvailable && Settings.getWifiLteExecutionEnabled()) {
if ((! phoneConnected || ! internetAvailable) && Settings.getWifiLteExecutionEnabled()) {
var dialogMsg = WatchUi.loadResource($.Rez.Strings.WifiLtePrompt) as Lang.String;
var dialog = new WatchUi.Confirmation(dialogMsg);
WatchUi.pushView(
@ -334,5 +334,5 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
function onConfirm(b as Lang.Boolean) as Void {
setState(b);
}
}

3
source/WifiLteExecutionConfirmDelegate.mc
View File

@ -47,7 +47,7 @@ class WifiLteExecutionConfirmDelegate extends WatchUi.ConfirmationDelegate {
:state as Lang.Boolean
} or Null) {
ConfirmationDelegate.initialize();
if (WatchUi has :showToast) {
mHasToast = true;
}
@ -77,6 +77,7 @@ class WifiLteExecutionConfirmDelegate extends WatchUi.ConfirmationDelegate {
//! @param response The user's confirmation response as `WatchUi.Confirm`
//! @return Always returns `true` to indicate the response was handled.
function onResponse(response) as Lang.Boolean {
getApp().getQuitTimer().reset();
if (mTimer != null) {
mTimer.stop();
}