#704 Fix issue with thermostat control

Author: galadril

app/src/main/java/nl/hnogames/domoticz/adapters/DashboardAdapter.java

@@ -250,6 +250,7 @@ private void setSwitchRowData(DevicesInfo mDeviceInfo,
                 setButtons(holder, Buttons.ADS);
                 setAdsLayout(holder);
             } else if ((mDeviceInfo.getType() != null && DomoticzValues.Device.Utility.Type.THERMOSTAT.equalsIgnoreCase(mDeviceInfo.getType())) ||
+                    (mDeviceInfo.getSubType() != null && DomoticzValues.Device.Utility.SubType.SETPOINT.equalsIgnoreCase(mDeviceInfo.getSubType())) ||
                     (mDeviceInfo.getSubType() != null && DomoticzValues.Device.Utility.SubType.SMARTWARES.equalsIgnoreCase(mDeviceInfo.getSubType()))) {
                 setButtons(holder, Buttons.BUTTON_ON);
                 setThermostatRowData(mDeviceInfo, holder);

app/src/main/java/nl/hnogames/domoticz/adapters/UtilityAdapter.java

@@ -162,6 +162,7 @@ public void onBindViewHolder(final DataObjectHolder holder, final int position)
                 setAdsLayout(holder);
             } else {
                 if ((mUtilitiesInfo.getType() != null && DomoticzValues.Device.Utility.Type.THERMOSTAT.equalsIgnoreCase(mUtilitiesInfo.getType())) ||
+                        (mUtilitiesInfo.getSubType() != null && DomoticzValues.Device.Utility.SubType.SETPOINT.equalsIgnoreCase(mUtilitiesInfo.getSubType())) ||
                         (mUtilitiesInfo.getSubType() != null && DomoticzValues.Device.Utility.SubType.SMARTWARES.equalsIgnoreCase(mUtilitiesInfo.getSubType()))) {
                     setButtons(holder, Buttons.THERMOSTAT);
                     CreateThermostatRow(holder, mUtilitiesInfo, setPoint);

app/src/main/java/nl/hnogames/domoticz/utils/DeviceUtils.java

@@ -40,12 +40,12 @@ public static boolean isAutomatedToggableDevice(DevicesInfo mDeviceInfo) {
             return false;
         if (mDeviceInfo.getSwitchTypeVal() == 0 &&
                 (mDeviceInfo.getSwitchType() == null)) {
-            if (mDeviceInfo.getSubType() != null && mDeviceInfo.getSubType().equals(DomoticzValues.Device.Utility.SubType.SMARTWARES)) {
+            if ((mDeviceInfo.getSubType() != null && DomoticzValues.Device.Utility.SubType.SETPOINT.equalsIgnoreCase(mDeviceInfo.getSubType())) ||
+                (mDeviceInfo.getSubType() != null && mDeviceInfo.getSubType().equals(DomoticzValues.Device.Utility.SubType.SMARTWARES))) {
                 return true;
             } else {
                 switch (mDeviceInfo.getType()) {
                     case DomoticzValues.Scene.Type.GROUP:
-                        return true;
                     case DomoticzValues.Scene.Type.SCENE:
                         return true;
                     case DomoticzValues.Device.Utility.Type.THERMOSTAT:
@@ -96,7 +96,8 @@ public static boolean isSupportedForExternalControl(DevicesInfo mDeviceInfo) {
             return false;
         if (mDeviceInfo.getSwitchTypeVal() == 0 &&
                 (mDeviceInfo.getSwitchType() == null)) {
-            if (mDeviceInfo.getSubType() != null && mDeviceInfo.getSubType().equals(DomoticzValues.Device.Utility.SubType.SMARTWARES)) {
+            if ((mDeviceInfo.getSubType() != null && DomoticzValues.Device.Utility.SubType.SETPOINT.equalsIgnoreCase(mDeviceInfo.getSubType())) ||
+                    (mDeviceInfo.getSubType() != null && mDeviceInfo.getSubType().equals(DomoticzValues.Device.Utility.SubType.SMARTWARES))) {
                 return true;
             } else {
                 switch (mDeviceInfo.getType()) {

app/version.properties

@@ -1,4 +1,4 @@
-#Thu Oct 26 22:03:43 CEST 2023
-VERSION_BUILD=9409
-VERSION_CODE=683
-VERSION_PATCH=366
+#Mon Jan 08 21:33:02 CET 2024
+VERSION_BUILD=9414
+VERSION_CODE=684
+VERSION_PATCH=367

domoticzapi/version.properties

@@ -1,4 +1,4 @@
-#Thu Oct 26 22:03:44 CEST 2023
+#Mon Jan 08 21:33:02 CET 2024
 VERSION_BUILD=3675
 VERSION_CODE=254
 VERSION_PATCH=254