mirror of
https://github.com/house-of-abbey/GarminHomeAssistant.git
synced 2025-08-04 19:08:36 +00:00
move popview up so it does not close wifi dialog
This commit is contained in:
@ -237,8 +237,8 @@ class HomeAssistantPinConfirmationDelegate extends WatchUi.BehaviorDelegate {
|
|||||||
if (mTimer != null) {
|
if (mTimer != null) {
|
||||||
mTimer.stop();
|
mTimer.stop();
|
||||||
}
|
}
|
||||||
mConfirmMethod.invoke(mState);
|
|
||||||
WatchUi.popView(WatchUi.SLIDE_RIGHT);
|
WatchUi.popView(WatchUi.SLIDE_RIGHT);
|
||||||
|
mConfirmMethod.invoke(mState);
|
||||||
} else {
|
} else {
|
||||||
error();
|
error();
|
||||||
}
|
}
|
||||||
|
@ -256,7 +256,7 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
|
|||||||
url = url + id.substring(0, id.find(".")) + "/turn_off";
|
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 dialogMsg = WatchUi.loadResource($.Rez.Strings.WifiLtePrompt) as Lang.String;
|
||||||
var dialog = new WatchUi.Confirmation(dialogMsg);
|
var dialog = new WatchUi.Confirmation(dialogMsg);
|
||||||
WatchUi.pushView(
|
WatchUi.pushView(
|
||||||
|
@ -77,6 +77,7 @@ class WifiLteExecutionConfirmDelegate extends WatchUi.ConfirmationDelegate {
|
|||||||
//! @param response The user's confirmation response as `WatchUi.Confirm`
|
//! @param response The user's confirmation response as `WatchUi.Confirm`
|
||||||
//! @return Always returns `true` to indicate the response was handled.
|
//! @return Always returns `true` to indicate the response was handled.
|
||||||
function onResponse(response) as Lang.Boolean {
|
function onResponse(response) as Lang.Boolean {
|
||||||
|
getApp().getQuitTimer().reset();
|
||||||
if (mTimer != null) {
|
if (mTimer != null) {
|
||||||
mTimer.stop();
|
mTimer.stop();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user