Fix #12381 (#12843)

Signed-off-by: markus7017 <markus7017@gmail.com>
Signed-off-by: Markus Michels <markus7017@gmail.com>

diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/coap/ShellyCoapJSonDTO.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/coap/ShellyCoapJSonDTO.java
index d951285d0597301fc5db5fc7a833a45cf30edf2f..af9834c1c06c3c06f0945f88d4b6d5377f74683a 100644 (file)
--- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/coap/ShellyCoapJSonDTO.java
+++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/coap/ShellyCoapJSonDTO.java
@@ -223,6 +223,9 @@ public class ShellyCoapJSonDTO {
                 }
 
                 in.endArray();
+                if (in.hasNext()) {
+                    name = in.nextName();
+                }
             }
 
             if (name.equalsIgnoreCase(COIOT_TAG_ACT)) {

diff --git a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly.properties b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly.properties
index 8022cef1528f1839f4aec0f24ca6bb06b6e73702..0978d4f3781b60f1a75f327788dd399c4a0e53d2 100644 (file)
--- a/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly.properties
+++ b/bundles/org.openhab.binding.shelly/src/main/resources/OH-INF/i18n/shelly.properties
@@ -87,7 +87,6 @@ thing-type.shelly.shellytrv.description = Shelly TRV (Radiator value, battery po
 thing-type.shelly.shellyix3.description = Shelly ix3 (Activation Device with 3 inputs)
 
 # thing config - shellydevice
-thing-type.config.shelly-relay.deviceIp.label = IP Address
 thing-type.config.shelly.deviceIp.label = IP Address
 thing-type.config.shelly.deviceIp.description = IP Address of the Shelly device
 thing-type.config.shelly.userId.label = User ID