From 63dea164e5f59cec0b99eb914b770d4a0c3136f9 Mon Sep 17 00:00:00 2001
From: jsetton <jeremy.setton@gmail.com>
Date: Thu, 21 Dec 2023 01:12:47 -0500
Subject: [PATCH] [tuya] Improve decode color format error handling

Signed-off-by: jsetton <jeremy.setton@gmail.com>
---
 .../internal/handler/TuyaDeviceHandler.java   | 57 ++++++++++---------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/bundles/org.smarthomej.binding.tuya/src/main/java/org/smarthomej/binding/tuya/internal/handler/TuyaDeviceHandler.java b/bundles/org.smarthomej.binding.tuya/src/main/java/org/smarthomej/binding/tuya/internal/handler/TuyaDeviceHandler.java
index 5d4f39bfc4..06989eba87 100644
--- a/bundles/org.smarthomej.binding.tuya/src/main/java/org/smarthomej/binding/tuya/internal/handler/TuyaDeviceHandler.java
+++ b/bundles/org.smarthomej.binding.tuya/src/main/java/org/smarthomej/binding/tuya/internal/handler/TuyaDeviceHandler.java
@@ -56,6 +56,7 @@
 import org.openhab.core.types.Command;
 import org.openhab.core.types.CommandOption;
 import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.smarthomej.binding.tuya.internal.config.ChannelConfiguration;
@@ -163,36 +164,40 @@ private void processChannelStatus(Integer dp, Object value) {
                 return;
             }
 
-            if (value instanceof String && CHANNEL_TYPE_UID_COLOR.equals(channelTypeUID)) {
-                oldColorMode = ((String) value).length() == 14;
-                updateState(channelId, ConversionUtil.hexColorDecode((String) value));
-                return;
-            } else if (value instanceof String && CHANNEL_TYPE_UID_STRING.equals(channelTypeUID)) {
-                updateState(channelId, new StringType((String) value));
-                return;
-            } else if (Double.class.isAssignableFrom(value.getClass())
-                    && CHANNEL_TYPE_UID_DIMMER.equals(channelTypeUID)) {
-                updateState(channelId, ConversionUtil.brightnessDecode((double) value, 0, configuration.max));
-                return;
-            } else if (Double.class.isAssignableFrom(value.getClass())
-                    && CHANNEL_TYPE_UID_NUMBER.equals(channelTypeUID)) {
-                updateState(channelId, new DecimalType((double) value));
-                return;
-            } else if (Boolean.class.isAssignableFrom(value.getClass())
-                    && CHANNEL_TYPE_UID_SWITCH.equals(channelTypeUID)) {
-                updateState(channelId, OnOffType.from((boolean) value));
-                return;
-            } else if (value instanceof String && CHANNEL_TYPE_UID_IR_CODE.equals(channelTypeUID)) {
-                if (configuration.dp == 2) {
-                    String decoded = convertBase64Code(configuration, (String) value);
-                    logger.info("thing {} received ir code: {}", thing.getUID(), decoded);
-                    updateState(channelId, new StringType(decoded));
-                    irStartLearning(configuration.activeListen);
+            try {
+                if (value instanceof String && CHANNEL_TYPE_UID_COLOR.equals(channelTypeUID)) {
+                    oldColorMode = ((String) value).length() == 14;
+                    updateState(channelId, ConversionUtil.hexColorDecode((String) value));
+                    return;
+                } else if (value instanceof String && CHANNEL_TYPE_UID_STRING.equals(channelTypeUID)) {
+                    updateState(channelId, new StringType((String) value));
+                    return;
+                } else if (Double.class.isAssignableFrom(value.getClass())
+                        && CHANNEL_TYPE_UID_DIMMER.equals(channelTypeUID)) {
+                    updateState(channelId, ConversionUtil.brightnessDecode((double) value, 0, configuration.max));
+                    return;
+                } else if (Double.class.isAssignableFrom(value.getClass())
+                        && CHANNEL_TYPE_UID_NUMBER.equals(channelTypeUID)) {
+                    updateState(channelId, new DecimalType((double) value));
+                    return;
+                } else if (Boolean.class.isAssignableFrom(value.getClass())
+                        && CHANNEL_TYPE_UID_SWITCH.equals(channelTypeUID)) {
+                    updateState(channelId, OnOffType.from((boolean) value));
+                    return;
+                } else if (value instanceof String && CHANNEL_TYPE_UID_IR_CODE.equals(channelTypeUID)) {
+                    if (configuration.dp == 2) {
+                        String decoded = convertBase64Code(configuration, (String) value);
+                        logger.info("thing {} received ir code: {}", thing.getUID(), decoded);
+                        updateState(channelId, new StringType(decoded));
+                        irStartLearning(configuration.activeListen);
+                    }
+                    return;
                 }
-                return;
+            } catch (IllegalArgumentException ignored) {
             }
             logger.warn("Could not update channel '{}' of thing '{}' with value '{}'. Datatype incompatible.",
                     channelId, getThing().getUID(), value);
+            updateState(channelId, UnDefType.UNDEF);
         } else {
             // try additional channelDps, only OnOffType
             List<String> channelIds = dp2ToChannelId.get(dp);