remi/GarminHomeAssistant
1
0
Fork 0
mirror of https://github.com/house-of-abbey/GarminHomeAssistant.git synced 2025-06-18 12:28:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 31-reduce-startup-delay

Browse Source
This commit is contained in:
Philip Abbey
2024-01-08 00:14:05 +00:00
parent 0a2d257421 92e6917589
commit 9724430168
38 changed files with 92 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/HomeAssistantService.mc
View File

@ -82,7 +82,7 @@ class HomeAssistantService {
System.println("HomeAssistantService onReturnCall(): Service executed.");
}
var d = data as Lang.Array;
var toast = "Executed";
var toast = RezStrings.getExecuted();
for(var i = 0; i < d.size(); i++) {
if ((d[i].get("entity_id") as Lang.String).equals(identifier)) {
toast = (d[i].get("attributes") as Lang.Dictionary).get("friendly_name") as Lang.String;

6
source/RezStrings.mc
View File

@ -30,6 +30,7 @@ class RezStrings {
private static var strMenuItemTap as Lang.String or Null;
private static var strMenuItemMenu as Lang.String or Null;
private static var strConfirm as Lang.String or Null;
private static var strExecuted as Lang.String or Null;
(:glance)
private static var strNoPhone as Lang.String or Null;
private static var strNoInternet as Lang.String or Null;
@ -84,6 +85,7 @@ class RezStrings {
strMenuItemTap = WatchUi.loadResource($.Rez.Strings.MenuItemTap);
strMenuItemMenu = WatchUi.loadResource($.Rez.Strings.MenuItemMenu);
strConfirm = WatchUi.loadResource($.Rez.Strings.Confirm);
strExecuted = WatchUi.loadResource($.Rez.Strings.Executed);
strNoPhone = WatchUi.loadResource($.Rez.Strings.NoPhone);
strNoInternet = WatchUi.loadResource($.Rez.Strings.NoInternet);
strNoResponse = WatchUi.loadResource($.Rez.Strings.NoResponse);
@ -124,6 +126,10 @@ class RezStrings {
return strConfirm;
}
static function getExecuted() as Lang.String {
return strExecuted;
}
static function getNoPhone() as Lang.String {
return strNoPhone;
}

6
source/Settings.mc
View File

@ -75,12 +75,6 @@ class Settings {
Background.deleteTemporalEvent();
}
}
} else {
// Explicitly disable the background events for glances and ironically any use by the background service. However
// that has been avoided more recently by not using this object in BackgroundServiceDelegate.
if ((System has :ServiceDelegate) and (Background.getTemporalEventRegisteredTime() != null)) {
Background.deleteTemporalEvent();
}
}
if (Globals.scDebug) {
System.println("Settings update(): getTemporalEventRegisteredTime() = " + Background.getTemporalEventRegisteredTime());