]> git.basschouten.com Git - openhab-addons.git/commitdiff
Fix NullPointerExceptions (#17180)
authorJacob Laursen <jacob-github@vindvejr.dk>
Mon, 29 Jul 2024 18:23:12 +0000 (20:23 +0200)
committerGitHub <noreply@github.com>
Mon, 29 Jul 2024 18:23:12 +0000 (20:23 +0200)
Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/api/ShellyDeviceProfile.java

index 0e211e4a92d3e7feef42314ef384e1fa71527845..fb0ac38c19d4cba0b8708855bb00b19fae0ddb99 100644 (file)
@@ -331,7 +331,7 @@ public class ShellyDeviceProfile {
         } else if (isDimmer) {
             if (settings.dimmers != null) {
                 ShellySettingsDimmer dimmer = settings.dimmers.get(0);
-                btnType = dimmer.btnType;
+                btnType = getString(dimmer.btnType);
             }
         } else if (settings.relays != null) {
             if (numRelays == 1) {
@@ -349,7 +349,7 @@ public class ShellyDeviceProfile {
             }
         } else if (isRGBW2 && (settings.lights != null) && (idx < settings.lights.size())) {
             ShellySettingsRgbwLight light = settings.lights.get(idx);
-            btnType = light.btnType;
+            btnType = getString(light.btnType);
         }
 
         return btnType.equalsIgnoreCase(SHELLY_BTNT_MOMENTARY) || btnType.equalsIgnoreCase(SHELLY_BTNT_MOM_ON_RELEASE)