From 5665e928397dc09f95fb52f95cb3d1c2dd6aa43e Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 28 Mar 2023 14:01:57 +0200 Subject: [PATCH] deduplicate and add convenience method --- src/main/java/org/cryptomator/common/Constants.java | 5 +++++ .../ui/addvaultwizard/CreateNewVaultPasswordController.java | 2 +- .../cryptomator/ui/changepassword/NewPasswordController.java | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/cryptomator/common/Constants.java b/src/main/java/org/cryptomator/common/Constants.java index 5069002e7..105fba3d6 100644 --- a/src/main/java/org/cryptomator/common/Constants.java +++ b/src/main/java/org/cryptomator/common/Constants.java @@ -1,5 +1,9 @@ package org.cryptomator.common; +import org.cryptomator.ui.keyloading.masterkeyfile.MasterkeyFileLoadingStrategy; + +import java.net.URI; + public interface Constants { String MASTERKEY_FILENAME = "masterkey.cryptomator"; @@ -7,6 +11,7 @@ public interface Constants { String VAULTCONFIG_FILENAME = "vault.cryptomator"; String CRYPTOMATOR_FILENAME_EXT = ".cryptomator"; String CRYPTOMATOR_FILENAME_GLOB = "*.cryptomator"; + URI DEFAULT_KEY_ID = URI.create(MasterkeyFileLoadingStrategy.SCHEME + ":" + MASTERKEY_FILENAME); byte[] PEPPER = new byte[0]; } diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java index 0cd1814d4..81c6ce2da 100644 --- a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java +++ b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java @@ -48,13 +48,13 @@ import java.util.ResourceBundle; import java.util.concurrent.ExecutorService; import static java.nio.charset.StandardCharsets.US_ASCII; +import static org.cryptomator.common.Constants.DEFAULT_KEY_ID; import static org.cryptomator.common.Constants.MASTERKEY_FILENAME; @AddVaultWizardScoped public class CreateNewVaultPasswordController implements FxController { private static final Logger LOG = LoggerFactory.getLogger(CreateNewVaultPasswordController.class); - private static final URI DEFAULT_KEY_ID = URI.create(MasterkeyFileLoadingStrategy.SCHEME + ":" + MASTERKEY_FILENAME); // TODO better place? private final Stage window; private final Lazy chooseLocationScene; diff --git a/src/main/java/org/cryptomator/ui/changepassword/NewPasswordController.java b/src/main/java/org/cryptomator/ui/changepassword/NewPasswordController.java index 36b469f49..99e43f623 100644 --- a/src/main/java/org/cryptomator/ui/changepassword/NewPasswordController.java +++ b/src/main/java/org/cryptomator/ui/changepassword/NewPasswordController.java @@ -1,5 +1,6 @@ package org.cryptomator.ui.changepassword; +import org.cryptomator.common.Passphrase; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.controls.FontAwesome5IconView; import org.cryptomator.ui.controls.NiceSecurePasswordField; @@ -92,4 +93,8 @@ public class NewPasswordController implements FxController { return passwordStrength.get(); } + public Passphrase getNewPassword() { + return passwordField.getCharacters(); + } + }