Self corrections

Signed-off-by: gael@lhopital.org <gael@lhopital.org>
openhab · Mar 25, 2024 · c01c73d · c01c73d
1 parent 3f693e1
commit c01c73d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/...g.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/CommonInterface.java b/...g.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/CommonInterface.java
@@ -226,6 +226,7 @@ default void commonInitialize() {
         } else if (!ThingStatus.ONLINE.equals(bridge.getStatus())) {
             setThingStatus(ThingStatus.OFFLINE, ThingStatusDetail.BRIDGE_OFFLINE, null);
             getCapabilities().remove(RefreshAutoCapability.class);
+            getCapabilities().remove(RefreshCapability.class);
             getCapabilities().remove(ParentUpdateCapability.class);
         } else {
             setThingStatus(ThingStatus.UNKNOWN, ThingStatusDetail.NONE, null);

diff --git a/...tmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/Capability.java b/...tmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/Capability.java
@@ -153,7 +153,8 @@ public void initialize() {
 
     public void expireData() {
         CommonInterface bridgeHandler = handler.getBridgeHandler();
-        if (bridgeHandler != null && !handler.getCapabilities().containsKey(RefreshAutoCapability.class)) {
+        if (bridgeHandler != null && !(handler.getCapabilities().containsKey(RefreshAutoCapability.class)
+                || handler.getCapabilities().containsKey(RefreshCapability.class))) {
             bridgeHandler.expireData();
         }
     }

diff --git a/...n/java/org/openhab/binding/netatmo/internal/handler/capability/RefreshAutoCapability.java b/...n/java/org/openhab/binding/netatmo/internal/handler/capability/RefreshAutoCapability.java
@@ -93,5 +93,4 @@ protected void afterNewData(@Nullable NAObject newData) {
         properties.put("probing", Boolean.valueOf(probing()).toString());
         super.afterNewData(newData);
     }
-
 }
diff --git a/.../main/java/org/openhab/binding/netatmo/internal/handler/capability/RefreshCapability.java b/.../main/java/org/openhab/binding/netatmo/internal/handler/capability/RefreshCapability.java
@@ -93,4 +93,4 @@ protected void afterNewData(@Nullable NAObject newData) {
         properties.put("dataValidity", dataValidity.toString());
         super.afterNewData(newData);
     }
-}
+}