Initial fixes

house-of-abbey · Mar 7, 2024 · 92d3fbe · 92d3fbe
1 parent 181335b
commit 92d3fbe
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/resources/settings/properties.xml b/resources/settings/properties.xml
@@ -36,6 +36,11 @@
   -->
   <property id="clear_cache" type="boolean">false</property>
 
+  <!--
+    Enable notification via vibrations, typically for confirmation of actions
+  -->
+  <property id="enable_vibration" type="boolean">true</property>
+
   <!--
     Application timeout in seconds, except 0 for no
     timeout (default). After this amount of elapsed

diff --git a/resources/settings/settings.xml b/resources/settings/settings.xml
@@ -51,6 +51,13 @@
     <settingConfig type="boolean" />
   </setting>
 
+  <setting
+    propertyKey="@Properties.enable_vibration"
+    title="@Strings.SettingsVibration"
+  >
+    <settingConfig type="boolean" />
+  </setting>
+
   <setting
     propertyKey="@Properties.app_timeout"
     title="@Strings.SettingsAppTimeout"

diff --git a/resources/strings/strings.xml b/resources/strings/strings.xml
@@ -46,6 +46,7 @@
   <string id="SettingsConfigUrl">URL for menu configuration (JSON).</string>
   <string id="SettingsCacheConfig">Should the application cache the menu configuration?</string>
   <string id="SettingsClearCache">Should the application clear the existing cache next time it is started?</string>
+  <string id="SettingsVibration">Should the application provide feedback via vibrations?</string>
   <string id="SettingsAppTimeout">Timeout in seconds. Exit the application after this period of inactivity to save the device battery.</string>
   <string id="SettingsConfirmTimeout">After this time (in seconds), a confirmation dialog for an action is automatically closed and the action is cancelled. Set to 0 to disable the timeout.</string>
   <string id="SettingsTextAlign">Left (off) or Right (on) Menu Alignment.</string>

diff --git a/source/HomeAssistantService.mc b/source/HomeAssistantService.mc
@@ -122,9 +122,12 @@ class HomeAssistantService {
             // System.println("HomeAssistantService call() URL=" + url);
             // System.println("HomeAssistantService call() service=" + service);
 
-            var entity_id = data.get("entity_id");
-            if (entity_id == null) {
-                entity_id = "";
+            var entity_id = "";
+            if (data != null) {
+                entity_id = data.get("entity_id");
+                if (entity_id == null) {
+                    entity_id = "";
+                }
             }
 
             Communications.makeWebRequest(
@@ -141,7 +144,7 @@ class HomeAssistantService {
                 },
                 method(:onReturnCall)
             );
-            if (mHasVibrate) {
+            if (mHasVibrate and Settings.getVibrate()) {
                 Attention.vibrate([
                     new Attention.VibeProfile(50, 100), // On  for 100ms
                     new Attention.VibeProfile( 0, 100), // Off for 100ms

diff --git a/source/Settings.mc b/source/Settings.mc
@@ -34,6 +34,7 @@ class Settings {
     private static var mConfigUrl             as Lang.String  = "";
     private static var mCacheConfig           as Lang.Boolean = false;
     private static var mClearCache            as Lang.Boolean = false;
+    private static var mVibrate               as Lang.Boolean = false;
     private static var mAppTimeout            as Lang.Number  = 0;  // seconds
     private static var mConfirmTimeout        as Lang.Number  = 3;  // seconds
     private static var mMenuAlignment         as Lang.Number  = WatchUi.MenuItem.MENU_ITEM_LABEL_ALIGN_LEFT;
@@ -54,6 +55,7 @@ class Settings {
         mConfigUrl             = Properties.getValue("config_url");
         mCacheConfig           = Properties.getValue("cache_config");
         mClearCache            = Properties.getValue("clear_cache");
+        mVibrate               = Properties.getValue("enable_vibration");
         mAppTimeout            = Properties.getValue("app_timeout");
         mConfirmTimeout        = Properties.getValue("confirm_timeout");
         mMenuAlignment         = Properties.getValue("menu_alignment");
@@ -130,6 +132,10 @@ class Settings {
         Properties.setValue("clear_cache", mClearCache);
     }
 
+    static function getVibrate() as Lang.Boolean {
+        return mVibrate;
+    }
+
     static function getAppTimeout() as Lang.Number {
         return mAppTimeout * 1000; // Convert to milliseconds
     }