[tuya] Fix device reconnect (#565)

Signed-off-by: Jan N. Klug <[email protected]> (cherry picked from commit a4c5f6c) Signed-off-by: Jan N. Klug <[email protected]>
smarthomej · Jan 30, 2024 · a1e9b0a · a1e9b0a
1 parent 761dddc
commit a1e9b0a
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/...ng.tuya/src/main/java/org/smarthomej/binding/tuya/internal/handler/TuyaDeviceHandler.java b/...ng.tuya/src/main/java/org/smarthomej/binding/tuya/internal/handler/TuyaDeviceHandler.java
@@ -248,7 +248,7 @@ public void connectionStatus(boolean status) {
             // only re-connect if a device is present, we are not disposing the thing and either the reconnectFuture is
             // empty or already done
             if (tuyaDevice != null && !disposing && (reconnectFuture == null || reconnectFuture.isDone())) {
-                this.reconnectFuture = scheduler.schedule(tuyaDevice::connect, 5000, TimeUnit.MILLISECONDS);
+                this.reconnectFuture = scheduler.schedule(this::connectDevice, 5000, TimeUnit.MILLISECONDS);
             }
             irStopLearning();
         }
@@ -564,6 +564,17 @@ private void configureChannel(Channel channel) {
         }
     }
 
+    private void connectDevice() {
+        TuyaDevice tuyaDevice = this.tuyaDevice;
+        if (tuyaDevice == null) {
+            logger.warn("Cannot connect {} because the device is not set.", thing.getUID());
+            return;
+        }
+        // clear the future here because timing issues can prevent the next attempt if we fail again
+        reconnectFuture = null;
+        tuyaDevice.connect();
+    }
+
     private List<CommandOption> toCommandOptionList(List<String> options) {
         return options.stream().map(c -> new CommandOption(c, c)).collect(Collectors.toList());
     }