From 12ec6fbec85cf4a20a93a6ddb54fdd3c33dbf08c Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Wed, 19 Feb 2025 14:25:34 +0100 Subject: [PATCH 01/13] Change /access-token deviceId header name to Hub-Device-ID --- .../org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java b/src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java index 71e7592f6..f94d882fa 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java +++ b/src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java @@ -165,7 +165,7 @@ public class ReceiveKeyController implements FxController { var vaultKeyUri = hubConfig.URIs.API.resolve("vaults/" + vaultId + "/access-token"); var request = HttpRequest.newBuilder(vaultKeyUri) // .header("Authorization", "Bearer " + bearerToken) // - .header("deviceId", deviceId) // + .header("Hub-Device-ID", deviceId) // .GET() // .timeout(REQ_TIMEOUT) // .build(); From 3333dc7f22721a19eb325e053eb62a8b71231873 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 25 Feb 2025 11:52:00 +0100 Subject: [PATCH 02/13] Fix not appearing removeCert dialog --- src/main/java/org/cryptomator/ui/dialogs/Dialogs.java | 4 ++-- src/main/resources/i18n/strings.properties | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/dialogs/Dialogs.java b/src/main/java/org/cryptomator/ui/dialogs/Dialogs.java index 5107fe740..837bea012 100644 --- a/src/main/java/org/cryptomator/ui/dialogs/Dialogs.java +++ b/src/main/java/org/cryptomator/ui/dialogs/Dialogs.java @@ -38,7 +38,7 @@ public class Dialogs { .setMessageKey("removeVault.message") // .setDescriptionKey("removeVault.description") // .setIcon(FontAwesome5Icon.QUESTION) // - .setOkButtonKey("removeVault.confirmBtn") // + .setOkButtonKey("generic.button.remove") // .setCancelButtonKey("generic.button.cancel") // .setOkAction(stage -> { LOG.debug("Removing vault {}.", vault.getDisplayName()); @@ -54,7 +54,7 @@ public class Dialogs { .setMessageKey("removeCert.message") // .setDescriptionKey("removeCert.description") // .setIcon(FontAwesome5Icon.QUESTION) // - .setOkButtonKey("removeCert.confirmBtn") // + .setOkButtonKey("generic.button.remove") // .setCancelButtonKey("generic.button.cancel") // .setOkAction(stage -> { settings.licenseKey.set(null); diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties index b03c202bf..a4829138a 100644 --- a/src/main/resources/i18n/strings.properties +++ b/src/main/resources/i18n/strings.properties @@ -107,7 +107,6 @@ addvaultwizard.success.unlockNow=Unlock Now removeVault.title=Remove "%s" removeVault.message=Remove vault? removeVault.description=This will only make Cryptomator forget about this vault. You can add it again. No encrypted files will be deleted from your hard drive. -removeVault.confirmBtn=Remove Vault # Change Password changepassword.title=Change Password From e3073a36134ae69bc122085bf1867c7bccbdfef2 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 25 Feb 2025 15:38:32 +0100 Subject: [PATCH 03/13] adjust wording for autoLock feature [skip ci] --- src/main/resources/i18n/strings.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties index a4829138a..ca3546586 100644 --- a/src/main/resources/i18n/strings.properties +++ b/src/main/resources/i18n/strings.properties @@ -283,7 +283,7 @@ preferences.title=Preferences ## General preferences.general=General preferences.general.startHidden=Hide window when starting Cryptomator -preferences.general.autoCloseVaults=Lock open vaults automatically when quitting application +preferences.general.autoCloseVaults=Lock vaults without asking when quitting application preferences.general.debugLogging=Enable debug logging preferences.general.debugDirectory=Reveal log files preferences.general.autoStart=Launch Cryptomator on system start From 478c69f82c990fe5b05917418d03fedfb1ff8946 Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Tue, 25 Feb 2025 18:23:17 +0100 Subject: [PATCH 04/13] simple dialog without cancel button --- .../org/cryptomator/ui/dialogs/SimpleDialog.java | 7 +++---- .../ui/dialogs/SimpleDialogController.java | 12 ++++++++++++ src/main/resources/fxml/simple_dialog.fxml | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/dialogs/SimpleDialog.java b/src/main/java/org/cryptomator/ui/dialogs/SimpleDialog.java index 84d9e4f75..08f77849e 100644 --- a/src/main/java/org/cryptomator/ui/dialogs/SimpleDialog.java +++ b/src/main/java/org/cryptomator/ui/dialogs/SimpleDialog.java @@ -31,8 +31,9 @@ public class SimpleDialog { FxmlLoaderFactory loaderFactory = FxmlLoaderFactory.forController( // new SimpleDialogController(resolveText(builder.messageKey, null), // resolveText(builder.descriptionKey, null), // - builder.icon, resolveText(builder.okButtonKey, null), // - resolveText(builder.cancelButtonKey, null), // + builder.icon, // + resolveText(builder.okButtonKey, null), // + builder.cancelButtonKey != null ? resolveText(builder.cancelButtonKey, null) : null, // () -> builder.okAction.accept(dialogStage), // () -> builder.cancelAction.accept(dialogStage)), // Scene::new, builder.resourceBundle); @@ -67,7 +68,6 @@ public class SimpleDialog { private String descriptionKey; private String okButtonKey; private String cancelButtonKey; - private FontAwesome5Icon icon; private Consumer okAction = Stage::close; private Consumer cancelAction = Stage::close; @@ -128,7 +128,6 @@ public class SimpleDialog { Objects.requireNonNull(messageKey, "SimpleDialog messageKey must be set."); Objects.requireNonNull(descriptionKey, "SimpleDialog descriptionKey must be set."); Objects.requireNonNull(okButtonKey, "SimpleDialog okButtonKey must be set."); - Objects.requireNonNull(cancelButtonKey, "SimpleDialog cancelButtonKey must be set."); try { return new SimpleDialog(this); diff --git a/src/main/java/org/cryptomator/ui/dialogs/SimpleDialogController.java b/src/main/java/org/cryptomator/ui/dialogs/SimpleDialogController.java index 0eee1b308..9465bf642 100644 --- a/src/main/java/org/cryptomator/ui/dialogs/SimpleDialogController.java +++ b/src/main/java/org/cryptomator/ui/dialogs/SimpleDialogController.java @@ -3,6 +3,8 @@ package org.cryptomator.ui.dialogs; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.controls.FontAwesome5Icon; +import javafx.beans.property.BooleanProperty; +import javafx.beans.property.SimpleBooleanProperty; import javafx.fxml.FXML; public class SimpleDialogController implements FxController { @@ -14,6 +16,7 @@ public class SimpleDialogController implements FxController { private final String cancelButtonText; private final Runnable okAction; private final Runnable cancelAction; + private final BooleanProperty dismissed = new SimpleBooleanProperty(); public SimpleDialogController(String message, String description, FontAwesome5Icon icon, String okButtonText, String cancelButtonText, Runnable okAction, Runnable cancelAction) { this.message = message; @@ -24,6 +27,10 @@ public class SimpleDialogController implements FxController { this.okAction = okAction; this.cancelAction = cancelAction; } + + public void initialize() { + dismissed.set(cancelButtonText == null || cancelButtonText.isEmpty()); + } public String getMessage() { return message; @@ -45,6 +52,11 @@ public class SimpleDialogController implements FxController { return cancelButtonText; } + @FXML + public boolean getDismissed() { + return dismissed.get(); + } + @FXML private void handleOk() { if (okAction != null) { diff --git a/src/main/resources/fxml/simple_dialog.fxml b/src/main/resources/fxml/simple_dialog.fxml index 32ad63abf..f076ec267 100644 --- a/src/main/resources/fxml/simple_dialog.fxml +++ b/src/main/resources/fxml/simple_dialog.fxml @@ -41,7 +41,7 @@ -