[gardena] Fixed connection tracker (#13238)

* Removed provider header, no longer necessary
* Fixed connection tracker not starting after some websocket restarts

Signed-off-by: Gerhard Riegler <gerhard.riegler@gmail.com>

diff --git a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartImpl.java b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartImpl.java
index d0340f5e06e8d2fb90a81d7e5dc86562ebc92705..2d9ba66f37d4dae2fbf9b1bd2bbd5b76c973d95d 100644 (file)
--- a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartImpl.java
+++ b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartImpl.java
@@ -215,7 +215,6 @@ public class GardenaSmartImpl implements GardenaSmart, GardenaSmartWebSocketList
                 final PostOAuth2Response token = this.token;
                 if (token != null) {
                     request.header("Authorization", token.tokenType + " " + token.accessToken);
-                    request.header("Authorization-provider", token.provider);
                 }
                 request.header("X-Api-Key", config.getApiKey());
             }

diff --git a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartWebSocket.java b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartWebSocket.java
index f9ec261af6f0b242ff5105cfc0566d30a13e5570..f83fb06353d6d909c24df7c6e784119f6afd5f84 100644 (file)
--- a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartWebSocket.java
+++ b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartWebSocket.java
@@ -121,11 +121,11 @@ public class GardenaSmartWebSocket {
 
         ScheduledFuture<?> connectionTracker = this.connectionTracker;
         if (connectionTracker != null && !connectionTracker.isCancelled()) {
-            connectionTracker.cancel(false);
+            connectionTracker.cancel(true);
         }
 
         // start sending PING every two minutes
-        this.connectionTracker = scheduler.scheduleWithFixedDelay(this::sendKeepAlivePing, 2, 2, TimeUnit.MINUTES);
+        this.connectionTracker = scheduler.scheduleWithFixedDelay(this::sendKeepAlivePing, 1, 2, TimeUnit.MINUTES);
     }
 
     @OnWebSocketFrame