From b6acec06720096e938a8af3f39d86ab9170f10ba Mon Sep 17 00:00:00 2001 From: Matthias Oesterheld Date: Mon, 18 Nov 2024 17:38:30 +0100 Subject: [PATCH] move pin validation error screen to initial view resolution --- source/HomeAssistantApp.mc | 3 +++ source/Settings.mc | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/HomeAssistantApp.mc b/source/HomeAssistantApp.mc index f7858cb..60d799e 100644 --- a/source/HomeAssistantApp.mc +++ b/source/HomeAssistantApp.mc @@ -109,6 +109,9 @@ class HomeAssistantApp extends Application.AppBase { } else if (Settings.getConfigUrl().length() == 0) { // System.println("HomeAssistantApp getInitialView(): No configuration URL in the application settings."); return ErrorView.create(WatchUi.loadResource($.Rez.Strings.NoConfigUrl) as Lang.String + "."); + } else if (Settings.getPin() == null) { + // System.println("HomeAssistantApp getInitialView(): Invalid PIN in application settings."); + return ErrorView.create(WatchUi.loadResource($.Rez.Strings.SettingsPinError) as Lang.String); } else if (! System.getDeviceSettings().phoneConnected) { // System.println("HomeAssistantApp getInitialView(): No Phone connection, skipping API call."); return ErrorView.create(WatchUi.loadResource($.Rez.Strings.NoPhone) as Lang.String + "."); diff --git a/source/Settings.mc b/source/Settings.mc index f258a0f..06191a6 100644 --- a/source/Settings.mc +++ b/source/Settings.mc @@ -167,9 +167,6 @@ class Settings { } static function getPin() as Lang.String or Null { - if (mPin == null) { - ErrorView.show(WatchUi.loadResource($.Rez.Strings.SettingsPinError) as Lang.String); - } return mPin; }