Fix text items with newline character

Closes openhab#3814 Signed-off-by: mueller-ma <[email protected]>
mueller-ma · Dec 2, 2024 · 3735bcb · 3735bcb
1 parent ec93eec
commit 3735bcb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/mobile/src/main/java/org/openhab/habdroid/model/Widget.kt b/mobile/src/main/java/org/openhab/habdroid/model/Widget.kt
@@ -71,9 +71,15 @@ data class Widget(
     val visibility: Boolean,
     val rawInputHint: InputTypeHint?
 ) : Parcelable {
-    val label get() = rawLabel.split("[", "]")[0].trim()
+    val label get() = rawLabel.substringBefore("[").trim()
     val stateFromLabel: String? get() {
-        val value = Widget.stateLabelRegex.find(rawLabel)?.groupValues?.getOrNull(1)
+        val value: String? = rawLabel.removePrefix(label).trim().let {
+            if (it.startsWith("[") && it.endsWith("]")) {
+                it.removePrefix("[").removeSuffix("]")
+            } else {
+                null
+            }
+        }
         val optionLabel = mappingsOrItemOptions.find { it.value == value }?.label
         return optionLabel ?: value
     }
@@ -243,8 +249,6 @@ data class Widget(
                 state.toParsedState(item.state?.asNumber?.format)
             else -> state.toParsedState()
         }
-
-        internal val stateLabelRegex = Regex("\\[(.*)\\]$")
     }
 }
 

diff --git a/mobile/src/test/java/org/openhab/habdroid/model/WidgetTest.kt b/mobile/src/test/java/org/openhab/habdroid/model/WidgetTest.kt
@@ -170,7 +170,7 @@ class WidgetTest {
         assertNull(sut1[0].stateFromLabel)
         assertNull(sut2[0].stateFromLabel)
         assertEquals("81 %", sut3[1].stateFromLabel)
-        assertEquals("Value [42]", sut3[4].stateFromLabel)
+        assertEquals("Value [42]\n", sut3[4].stateFromLabel)
     }
 
     @Test
@@ -449,12 +449,12 @@ class WidgetTest {
                   }, {
                     'widgetId': '0202_0_0_1',
                     'type': 'Switch',
-                    'label': 'Test [Value [42]]',
+                    'label': 'Test [Value [42]\n]',
                     'icon': 'input',
                     'mappings': [],
                     'item': {
                       'link': 'http://openhab.local:8080/rest/items/DemoString',
-                      'state': 'Value [42]',
+                      'state': 'Value [42]\n',
                       'stateDescription': {
                           'pattern': '%s',
                           'readOnly': false,