mirror of
				https://github.com/house-of-abbey/GarminHomeAssistant.git
				synced 2025-11-04 08:58:13 +00:00 
			
		
		
		
	Fix for 2 bugs in issue 221
Template rendering and Webhook ID on initial start.
This commit is contained in:
		@@ -266,7 +266,6 @@ class HomeAssistantApp extends Application.AppBase {
 | 
			
		||||
    private function buildMenu(menu as Lang.Dictionary) {
 | 
			
		||||
        mHaMenu = new HomeAssistantView(menu, null);
 | 
			
		||||
        mQuitTimer.begin();
 | 
			
		||||
        startUpdates();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    function startUpdates() {
 | 
			
		||||
 
 | 
			
		||||
@@ -56,6 +56,12 @@ class HomeAssistantGroupMenuItem extends WatchUi.IconMenuItem {
 | 
			
		||||
            setSubLabel(null);
 | 
			
		||||
        } else if(data instanceof Lang.String) {
 | 
			
		||||
            setSubLabel(data);
 | 
			
		||||
        } else if(data instanceof Lang.Number) {
 | 
			
		||||
            var d = data as Lang.Number;
 | 
			
		||||
            setSubLabel(d.format("%d"));
 | 
			
		||||
        } else if(data instanceof Lang.Float) {
 | 
			
		||||
            var f = data as Lang.Float;
 | 
			
		||||
            setSubLabel(f.format("%f"));
 | 
			
		||||
        } else if(data instanceof Lang.Dictionary) {
 | 
			
		||||
            // System.println("HomeAsistantGroupMenuItem updateState() data = " + data);
 | 
			
		||||
            if (data.get("error") != null) {
 | 
			
		||||
@@ -64,7 +70,7 @@ class HomeAssistantGroupMenuItem extends WatchUi.IconMenuItem {
 | 
			
		||||
                setSubLabel($.Rez.Strings.PotentialError);
 | 
			
		||||
            }
 | 
			
		||||
        } else {
 | 
			
		||||
            // The template must return a Lang.String, a number can be either integer or float and hence cannot be formatted locally without error.
 | 
			
		||||
            // The template must return a Lang.String, Number or Float, or the item cannot be formatted locally without error.
 | 
			
		||||
            setSubLabel(WatchUi.loadResource($.Rez.Strings.TemplateError) as Lang.String);
 | 
			
		||||
        }
 | 
			
		||||
        WatchUi.requestUpdate();
 | 
			
		||||
 
 | 
			
		||||
@@ -72,6 +72,12 @@ class HomeAssistantTapMenuItem extends WatchUi.IconMenuItem {
 | 
			
		||||
            setSubLabel($.Rez.Strings.Empty);
 | 
			
		||||
        } else if(data instanceof Lang.String) {
 | 
			
		||||
            setSubLabel(data);
 | 
			
		||||
        } else if(data instanceof Lang.Number) {
 | 
			
		||||
            var d = data as Lang.Number;
 | 
			
		||||
            setSubLabel(d.format("%d"));
 | 
			
		||||
        } else if(data instanceof Lang.Float) {
 | 
			
		||||
            var f = data as Lang.Float;
 | 
			
		||||
            setSubLabel(f.format("%f"));
 | 
			
		||||
        } else if(data instanceof Lang.Dictionary) {
 | 
			
		||||
            // System.println("HomeAsistantTemplateMenuItem updateState() data = " + data);
 | 
			
		||||
            if (data.get("error") != null) {
 | 
			
		||||
@@ -80,7 +86,7 @@ class HomeAssistantTapMenuItem extends WatchUi.IconMenuItem {
 | 
			
		||||
                setSubLabel($.Rez.Strings.PotentialError);
 | 
			
		||||
            }
 | 
			
		||||
        } else {
 | 
			
		||||
            // The template must return a Lang.String, a number can be either integer or float and hence cannot be formatted locally without error.
 | 
			
		||||
            // The template must return a Lang.String, Number or Float, or the item cannot be formatted locally without error.
 | 
			
		||||
            setSubLabel(WatchUi.loadResource($.Rez.Strings.TemplateError) as Lang.String);
 | 
			
		||||
        }
 | 
			
		||||
        WatchUi.requestUpdate();
 | 
			
		||||
 
 | 
			
		||||
@@ -74,6 +74,12 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
 | 
			
		||||
            setSubLabel(null);
 | 
			
		||||
        } else if(data instanceof Lang.String) {
 | 
			
		||||
            setSubLabel(data);
 | 
			
		||||
        } else if(data instanceof Lang.Number) {
 | 
			
		||||
            var d = data as Lang.Number;
 | 
			
		||||
            setSubLabel(d.format("%d"));
 | 
			
		||||
        } else if(data instanceof Lang.Float) {
 | 
			
		||||
            var f = data as Lang.Float;
 | 
			
		||||
            setSubLabel(f.format("%f"));
 | 
			
		||||
        } else if(data instanceof Lang.Dictionary) {
 | 
			
		||||
            // System.println("HomeAsistantToggleMenuItem updateState() data = " + data);
 | 
			
		||||
            if (data.get("error") != null) {
 | 
			
		||||
@@ -82,7 +88,7 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
 | 
			
		||||
                setSubLabel($.Rez.Strings.PotentialError);
 | 
			
		||||
            }
 | 
			
		||||
        } else {
 | 
			
		||||
            // The template must return a Lang.String, a number can be either integer or float and hence cannot be formatted locally without error.
 | 
			
		||||
            // The template must return a Lang.String, Number or Float, or the item cannot be formatted locally without error.
 | 
			
		||||
            setSubLabel(WatchUi.loadResource($.Rez.Strings.TemplateError) as Lang.String);
 | 
			
		||||
        }
 | 
			
		||||
        WatchUi.requestUpdate();
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user