From 800aca5207f793c5f04e695504e6999311f1fc0b Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 4 Apr 2025 16:26:36 +0200 Subject: [PATCH 1/5] fix password enter dialog --- .../masterkeyfile/PassphraseEntryController.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java index 6d52362b3..37b2f2e1f 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java +++ b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java @@ -36,6 +36,7 @@ import javafx.stage.Stage; import javafx.stage.WindowEvent; import javafx.util.Duration; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutorService; @PassphraseEntryScoped public class PassphraseEntryController implements FxController { @@ -49,6 +50,7 @@ public class PassphraseEntryController implements FxController { private final ForgetPasswordComponent.Builder forgetPassword; private final KeychainManager keychain; private final StringBinding vaultName; + private final ExecutorService backgroundExecutorService; private final BooleanProperty unlockInProgress = new SimpleBooleanProperty(); private final ObjectBinding unlockButtonContentDisplay = Bindings.when(unlockInProgress).then(ContentDisplay.LEFT).otherwise(ContentDisplay.TEXT_ONLY); private final BooleanProperty unlockButtonDisabled = new SimpleBooleanProperty(); @@ -64,7 +66,7 @@ public class PassphraseEntryController implements FxController { public Animation unlockAnimation; @Inject - public PassphraseEntryController(@KeyLoading Stage window, @KeyLoading Vault vault, CompletableFuture result, @Nullable @Named("savedPassword") Passphrase savedPassword, ForgetPasswordComponent.Builder forgetPassword, KeychainManager keychain) { + public PassphraseEntryController(@KeyLoading Stage window, @KeyLoading Vault vault, CompletableFuture result, @Nullable @Named("savedPassword") Passphrase savedPassword, ForgetPasswordComponent.Builder forgetPassword, KeychainManager keychain, ExecutorService backgroundExecutorService) { this.window = window; this.vault = vault; this.result = result; @@ -72,8 +74,8 @@ public class PassphraseEntryController implements FxController { this.forgetPassword = forgetPassword; this.keychain = keychain; this.vaultName = WeakBindings.bindString(vault.displayNameProperty()); + this.backgroundExecutorService = backgroundExecutorService; window.setOnHiding(this::windowClosed); - result.whenCompleteAsync((r, t) -> unlockInProgress.set(false), Platform::runLater); } @FXML @@ -119,8 +121,6 @@ public class PassphraseEntryController implements FxController { new KeyFrame(Duration.millis(800), legsExtendedY, legsExtendedX, faceHidden), // new KeyFrame(Duration.millis(1000), faceVisible) // ); - - result.whenCompleteAsync((r, t) -> stopUnlockAnimation()); } @FXML @@ -133,6 +133,9 @@ public class PassphraseEntryController implements FxController { result.cancel(true); LOG.debug("Unlock canceled by user."); } + if( passwordField != null) { + passwordField.getCharacters().destroy(); + } } @@ -142,7 +145,7 @@ public class PassphraseEntryController implements FxController { unlockInProgress.set(true); CharSequence pwFieldContents = passwordField.getCharacters(); Passphrase pw = Passphrase.copyOf(pwFieldContents); - result.complete(new PassphraseEntryResult(pw, savePasswordCheckbox.isSelected())); + result.completeAsync(() -> new PassphraseEntryResult(pw, savePasswordCheckbox.isSelected()), backgroundExecutorService); startUnlockAnimation(); } From 40d632a489a412306a2dc6a845c8c3d7a8d24678 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 4 Apr 2025 16:28:08 +0200 Subject: [PATCH 2/5] Closes #3807 --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index c4ca3eed8..3f429c0d7 100644 --- a/pom.xml +++ b/pom.xml @@ -92,6 +92,12 @@ fuse-nio-adapter ${cryptomator.fuse.version} + + + org.cryptomator + jfuse + 0.7.2 + org.cryptomator webdav-nio-adapter From b7ccf7986de1c9460a3526ce449fde9b8b341fc7 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 4 Apr 2025 16:52:16 +0200 Subject: [PATCH 3/5] set version infos --- dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml | 3 +++ pom.xml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml index 450f6adb2..c3a1c64f4 100644 --- a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml +++ b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml @@ -77,6 +77,9 @@ + + https://github.com/cryptomator/cryptomator/releases/1.15.2 + https://github.com/cryptomator/cryptomator/releases/1.15.1 diff --git a/pom.xml b/pom.xml index 3f429c0d7..fd19f6a46 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator cryptomator - 1.15.1 + 1.15.2 Cryptomator Desktop App @@ -39,7 +39,7 @@ 1.2.4 1.5.2 5.0.2 - 2.0.7 + 2.0.8 3.17.0 From 4cbe45919b65122779e4e7c517645fc1ce94ebfa Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Fri, 4 Apr 2025 17:43:44 +0200 Subject: [PATCH 4/5] Moved jfuse dependency bump into dependencyManagement --- pom.xml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index fd19f6a46..f4d4c800e 100644 --- a/pom.xml +++ b/pom.xml @@ -75,6 +75,17 @@ + + + + + org.cryptomator + jfuse + 0.7.2 + + + + @@ -92,12 +103,6 @@ fuse-nio-adapter ${cryptomator.fuse.version} - - - org.cryptomator - jfuse - 0.7.2 - org.cryptomator webdav-nio-adapter From 38dbefff0b5e45065e3fa42bec32b32d1e9f500e Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Fri, 4 Apr 2025 18:12:03 +0200 Subject: [PATCH 5/5] Updated webdav-nio-adapter dependency, fixes #3806, fixes #3807 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f4d4c800e..518b802e5 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 1.2.4 1.5.2 5.0.2 - 2.0.8 + 2.0.10 3.17.0