diff --git a/resources/strings/strings.xml b/resources/strings/strings.xml index 33fe020..804ae4e 100644 --- a/resources/strings/strings.xml +++ b/resources/strings/strings.xml @@ -30,12 +30,13 @@ No API key in the application settings. No API URL in the application settings. No configuration URL in the application settings. + No response, use secure HTTPS connection. No Internet connection. No JSON returned from HTTP request. Menu definition error, check the instructions. No Phone connection. No phone connection, no cached menu. - No Response, check Internet connection + No Response, check secure HTTPS connection Request timed out PIN input locked for Potential Error diff --git a/source/HomeAssistantApp.mc b/source/HomeAssistantApp.mc index 1cf7806..47303ae 100644 --- a/source/HomeAssistantApp.mc +++ b/source/HomeAssistantApp.mc @@ -195,6 +195,13 @@ class HomeAssistantApp extends Application.AppBase { } break; + case Communications.SECURE_CONNECTION_REQUIRED: + // System.println("HomeAssistantApp onReturnFetchMenuConfig() Response Code: SECURE_CONNECTION_REQUIRED, check API URL setting."); + if (mIsApp) { + ErrorView.show(WatchUi.loadResource($.Rez.Strings.NoHTTPS) as Lang.String); + } + break; + case 404: // System.println("HomeAssistantApp onReturnFetchMenuConfig() Response Code: 404, page not found. Check Configuration URL setting."); if (mIsApp) { @@ -508,6 +515,13 @@ class HomeAssistantApp extends Application.AppBase { myTimer.start(method(:updateMenuItems), Globals.scApiBackoffMs, false); break; + case Communications.SECURE_CONNECTION_REQUIRED: + // System.println("HomeAssistantApp onReturnFetchMenuConfig() Response Code: SECURE_CONNECTION_REQUIRED, check API URL setting."); + if (mIsApp) { + ErrorView.show(WatchUi.loadResource($.Rez.Strings.NoHTTPS) as Lang.String); + } + break; + case 404: // System.println("HomeAssistantApp onReturnCheckMenuConfig() Response Code: 404, page not found. Check API URL setting."); ErrorView.show(WatchUi.loadResource($.Rez.Strings.ApiUrlNotFound) as Lang.String); @@ -798,6 +812,13 @@ class HomeAssistantApp extends Application.AppBase { } break; + case Communications.SECURE_CONNECTION_REQUIRED: + // System.println("HomeAssistantApp onReturnFetchMenuConfig() Response Code: SECURE_CONNECTION_REQUIRED, check API URL setting."); + if (mIsApp) { + ErrorView.show(WatchUi.loadResource($.Rez.Strings.NoHTTPS) as Lang.String); + } + break; + case 404: // System.println("HomeAssistantApp onReturnFetchApiStatus() Response Code: 404, page not found. Check Configuration URL setting."); if (mIsApp) { diff --git a/source/WebhookManager.mc b/source/WebhookManager.mc index 0dc6ccd..7b1f722 100644 --- a/source/WebhookManager.mc +++ b/source/WebhookManager.mc @@ -59,6 +59,7 @@ class WebhookManager { // System.println("WebhookManager onReturnRequestWebhookId() Response Code: NETWORK_RESPONSE_OUT_OF_MEMORY, are we going too fast?"); // Ignore and see if we can carry on break; + case Communications.INVALID_HTTP_BODY_IN_NETWORK_RESPONSE: // System.println("WebhookManager onReturnRequestWebhookId() Response Code: INVALID_HTTP_BODY_IN_NETWORK_RESPONSE, check JSON is returned."); Settings.unsetIsSensorsEnabled();