set status description if software update pending (#20658)

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>

Author: andrewfg

bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/handler/HomematicThingHandler.java

@@ -55,6 +55,7 @@
 import org.openhab.core.thing.Thing;
 import org.openhab.core.thing.ThingStatus;
 import org.openhab.core.thing.ThingStatusDetail;
+import org.openhab.core.thing.ThingStatusInfo;
 import org.openhab.core.thing.binding.BaseThingHandler;
 import org.openhab.core.thing.binding.ThingHandler;
 import org.openhab.core.thing.binding.builder.ChannelBuilder;
@@ -520,6 +521,8 @@ private void updateStatus(HmDevice device) throws GatewayNotAvailableException,
         if (oldStatus == ThingStatus.UNINITIALIZED) {
             return;
         }
+        ThingStatusInfo oldStatusInfo = thing.getStatusInfo();
+        String newDescription = null;
         ThingStatus newStatus = ThingStatus.ONLINE;
         ThingStatusDetail newDetail = ThingStatusDetail.NONE;
 
@@ -532,12 +535,16 @@ private void updateStatus(HmDevice device) throws GatewayNotAvailableException,
         } else if (device.isUnreach()) {
             newStatus = ThingStatus.OFFLINE;
             newDetail = ThingStatusDetail.COMMUNICATION_ERROR;
-        } else if (device.isConfigPending() || device.isUpdatePending()) {
+        } else if (device.isConfigPending()) {
             newDetail = ThingStatusDetail.CONFIGURATION_PENDING;
+        } else if (device.isUpdatePending()) {
+            // don't set newStatus or newDetail; just add status description indicating update pending
+            newDescription = "@text/status.update-pending";
         }
 
-        if (thing.getStatus() != newStatus || thing.getStatusInfo().getStatusDetail() != newDetail) {
-            updateStatus(newStatus, newDetail);
+        if (oldStatus != newStatus || oldStatusInfo.getStatusDetail() != newDetail
+                || !Objects.equals(oldStatusInfo.getDescription(), newDescription)) {
+            updateStatus(newStatus, newDetail, newDescription);
         }
         if (oldStatus == ThingStatus.OFFLINE && newStatus == ThingStatus.ONLINE) {
             initialize();

bundles/org.openhab.binding.homematic/src/main/resources/OH-INF/i18n/homematic.properties

@@ -60,3 +60,12 @@ thing-type.config.homematic.bridge.xmlCallbackPort.description = Callback port o
 
 channel-type.homematic.DUTY_CYCLE_RATIO.label = Duty Cycle
 channel-type.homematic.DUTY_CYCLE_RATIO.description = Current duty cycle usage
+
+channel-type.config.homematic.config.delay.label = Delay
+channel-type.config.homematic.config.delay.description = Delays transmission of a command to the Homematic gateway, duplicate commands are filtered out (in seconds)
+channel-type.config.homematic.config.receiveDelay.label = Receive Delay
+channel-type.config.homematic.config.receiveDelay.description = Delays a received event from the Homematic gateway, duplicate events are filtered out (in seconds)
+
+# thing status descriptions
+
+status.update-pending = Software update pending