[amazonechocontrol] Fix humidity sensor response (#572)

Reported on the forum Signed-off-by: Jan N. Klug <[email protected]>
smarthomej · Mar 24, 2024 · a231f9a · a231f9a
1 parent c3f27fd
commit a231f9a
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/...va/org/smarthomej/binding/amazonechocontrol/internal/smarthome/HandlerHumiditySensor.java b/...va/org/smarthomej/binding/amazonechocontrol/internal/smarthome/HandlerHumiditySensor.java
@@ -27,11 +27,14 @@
 import org.openhab.core.library.unit.Units;
 import org.openhab.core.types.Command;
 import org.openhab.core.types.UnDefType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.smarthomej.binding.amazonechocontrol.internal.connection.Connection;
 import org.smarthomej.binding.amazonechocontrol.internal.dto.smarthome.JsonSmartHomeCapability;
 import org.smarthomej.binding.amazonechocontrol.internal.dto.smarthome.JsonSmartHomeDevice;
 import org.smarthomej.binding.amazonechocontrol.internal.handler.SmartHomeDeviceHandler;
 
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
 /**
@@ -41,6 +44,7 @@
  */
 @NonNullByDefault
 public class HandlerHumiditySensor extends AbstractInterfaceHandler {
+    private final Logger logger = LoggerFactory.getLogger(HandlerHumiditySensor.class);
     public static final String INTERFACE = "Alexa.HumiditySensor";
 
     private static final ChannelInfo HUMIDITY = new ChannelInfo("relativeHumidity", "humidity",
@@ -62,13 +66,18 @@ protected Set<ChannelInfo> findChannelInfos(JsonSmartHomeCapability capability,
     public void updateChannels(String interfaceName, List<JsonObject> stateList, UpdateChannelResult result) {
         QuantityType<Dimensionless> humidityValue = null;
         for (JsonObject state : stateList) {
-            if (HUMIDITY.propertyName.equals(state.get("name").getAsString())) {
-                JsonObject value = state.get("value").getAsJsonObject();
-                // For groups take the first
-                if (humidityValue == null) {
-                    BigDecimal humidity = value.get("value").getAsBigDecimal();
-                    humidityValue = new QuantityType<>(humidity, Units.PERCENT);
+            if (HUMIDITY.propertyName.equals(state.get("name").getAsString()) && humidityValue == null) {
+                JsonElement value = state.get("value");
+                BigDecimal humidity;
+                if (value.isJsonObject()) {
+                    humidity = value.getAsJsonObject().getAsBigDecimal();
+                } else if (value.isJsonPrimitive() && value.getAsJsonPrimitive().isNumber()) {
+                    humidity = value.getAsJsonPrimitive().getAsBigDecimal();
+                } else {
+                    logger.warn("Could not properly convert {}", state);
+                    continue;
                 }
+                humidityValue = new QuantityType<>(humidity, Units.PERCENT);
             }
         }
         smartHomeDeviceHandler.updateState(HUMIDITY.channelId, humidityValue == null ? UnDefType.UNDEF : humidityValue);