Support command options

Fixes openhab#2655 Signed-off-by: mueller-ma <[email protected]>
mueller-ma · Jun 26, 2022 · 0b92d94 · 0b92d94
1 parent 048b595
commit 0b92d94
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 4 deletions.
diff --git a/mobile/src/main/java/org/openhab/habdroid/model/Item.kt b/mobile/src/main/java/org/openhab/habdroid/model/Item.kt
@@ -291,10 +291,18 @@ fun JSONObject.toItem(): Item {
     val stateDescription = optJSONObject("stateDescription")
     val readOnly = stateDescription != null && stateDescription.optBoolean("readOnly", false)
 
-    val options = if (stateDescription?.has("options") == true) {
-        stateDescription.getJSONArray("options").map { obj -> obj.toLabeledValue("value", "label") }
-    } else {
-        null
+    val options = when {
+        has("commandDescription") -> {
+            getJSONObject("commandDescription")
+                .optJSONArray("commandOptions")
+                ?.map { obj -> obj.toLabeledValue("command", "label") }
+        }
+        stateDescription?.has("options") == true -> {
+            stateDescription.getJSONArray("options").map { obj -> obj.toLabeledValue("value", "label") }
+        }
+        else -> {
+            null
+        }
     }
 
     val members = if (has("members")) {

diff --git a/mobile/src/test/java/org/openhab/habdroid/model/ItemTest.kt b/mobile/src/test/java/org/openhab/habdroid/model/ItemTest.kt
@@ -104,6 +104,13 @@ class ItemTest {
         assertEquals("Location 2", sut.members[1].label)
     }
 
+    @Test
+    fun getCommandOptions() {
+        val sut = itemWithCommandOptions.toItem()
+        assertEquals(LabeledValue("1", "One"), sut.options!!.component1())
+        assertEquals(LabeledValue("2", "Two"), sut.options!!.component2())
+    }
+
     @Test
     fun getTags() {
         val sut = itemAsJsonObject.toItem()
@@ -192,5 +199,25 @@ class ItemTest {
                 'name': 'LocationGroup' }
             """.trimIndent()
         )
+        private val itemWithCommandOptions = JSONObject(
+            """
+              { 'state': 'NULL',
+                'type': 'Number',
+                'name': 'Foo',
+                'commandDescription': {
+                  'commandOptions': [
+                    {
+                      'command': '1',
+                      'label': 'One'
+                    },
+                    {
+                      'command': '2',
+                      'label': 'Two'
+                    },
+                  ]
+                }
+              }
+            """.trimIndent()
+        )
     }
 }