From c3931d9d29a62b9b4a18e895e9f38c95537e8f77 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 4 Nov 2025 21:42:14 +0100 Subject: [PATCH] apply review suggestions --- .../ui/preferences/UpdatesPreferencesController.java | 1 + .../org/cryptomator/updater/FallbackUpdateMechanism.java | 6 +++++- .../org/cryptomator/updater/MacOsDmgUpdateMechanism.java | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java index 9fe004d37..58bce5d1d 100644 --- a/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java +++ b/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java @@ -119,6 +119,7 @@ public class UpdatesPreferencesController implements FxController { private void updateFailed(WorkerStateEvent workerStateEvent) { assert workerStateEvent.getSource() == updateService; LOG.error("Update failed.", updateService.getException()); + updateService.reset(); } /* Observable Properties */ diff --git a/src/main/java/org/cryptomator/updater/FallbackUpdateMechanism.java b/src/main/java/org/cryptomator/updater/FallbackUpdateMechanism.java index d4f86dcea..b250137ac 100644 --- a/src/main/java/org/cryptomator/updater/FallbackUpdateMechanism.java +++ b/src/main/java/org/cryptomator/updater/FallbackUpdateMechanism.java @@ -66,7 +66,11 @@ public class FallbackUpdateMechanism implements UpdateMechanism { } else { return null; } - } catch (IOException | InterruptedException e) { + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + LOG.warn("Update check interrupted", e); + return null; + } catch (IOException e) { LOG.warn("Update check failed", e); return null; } diff --git a/src/main/java/org/cryptomator/updater/MacOsDmgUpdateMechanism.java b/src/main/java/org/cryptomator/updater/MacOsDmgUpdateMechanism.java index 6b6f187cd..79b55b706 100644 --- a/src/main/java/org/cryptomator/updater/MacOsDmgUpdateMechanism.java +++ b/src/main/java/org/cryptomator/updater/MacOsDmgUpdateMechanism.java @@ -96,6 +96,7 @@ public class MacOsDmgUpdateMechanism extends DownloadUpdateMechanism { } LOG.debug("Update ready: {}", workDir.resolve("Cryptomator.app")); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); throw new InterruptedIOException("Failed to extract DMG, interrupted"); } return UpdateStep.of("Restarting...", this::restart);