From 29a45ef1ab8a565eef4da2235a518d1280b54349 Mon Sep 17 00:00:00 2001 From: Markus Michels Date: Sun, 5 Jun 2022 12:03:14 +0200 Subject: [PATCH] Fix #12381 (#12843) Signed-off-by: markus7017 Signed-off-by: Markus Michels --- .../binding/shelly/internal/coap/ShellyCoapJSonDTO.java | 3 +++ .../src/main/resources/OH-INF/i18n/shelly.properties | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) 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 d951285d0..af9834c1c 100644 --- 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 8022cef15..0978d4f37 100644 --- 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