From 50a8b9eee2cadac86546dc152d09de471328b36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joris=20Pelgr=C3=B6m?= <jpelgrom@users.noreply.github.com>
Date: Wed, 13 Sep 2023 03:51:13 +0200
Subject: [PATCH] Don't force on/yes/y/off/no/n to booleans for service button
 (#3858)

- Relax string conversion to boolean as this breaks other use cases.
---
 .../common/WidgetDynamicFieldAdapter.kt       | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/io/homeassistant/companion/android/widgets/common/WidgetDynamicFieldAdapter.kt b/app/src/main/java/io/homeassistant/companion/android/widgets/common/WidgetDynamicFieldAdapter.kt
index d6e74b40e..f65f09645 100644
--- a/app/src/main/java/io/homeassistant/companion/android/widgets/common/WidgetDynamicFieldAdapter.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/widgets/common/WidgetDynamicFieldAdapter.kt
@@ -205,21 +205,9 @@ class WidgetDynamicFieldAdapter(
         }
     }
 
-    private fun String.toBooleanOrNull(): Boolean? {
-        // Parse all valid YAML boolean values
-        return when (this.trim().lowercase(Locale.getDefault())) {
-            "true" -> true
-            "on" -> true
-            "yes" -> true
-            "y" -> true
-
-            "false" -> false
-            "off" -> false
-            "no" -> false
-            "n" -> false
-
-            // If it's not a valid YAML boolean, return null
-            else -> null
-        }
+    private fun String.toBooleanOrNull(): Boolean? = when (lowercase()) {
+        "true" -> true
+        "false" -> false
+        else -> null
     }
 }