From 5c75eeab273f56c37c801583262cee525e6ed707 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 12 Mar 2026 10:18:19 +0100 Subject: [PATCH] reuse existing constant --- .../masterkeyfile/MasterkeyFileLoadingStrategy.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java index a6600712d..16c7d6256 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java +++ b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java @@ -1,6 +1,7 @@ package org.cryptomator.ui.keyloading.masterkeyfile; import com.google.common.base.Preconditions; +import org.cryptomator.common.Constants; import org.cryptomator.common.Passphrase; import org.cryptomator.common.keychain.KeychainManager; import org.cryptomator.common.vaults.Vault; @@ -33,7 +34,6 @@ import java.util.concurrent.ExecutionException; public class MasterkeyFileLoadingStrategy implements KeyLoadingStrategy { public static final String SCHEME = "masterkeyfile"; - public static final String DEFAULT_MASTERKEY_PATH = "masterkey.cryptomator"; // relative to vault.cryptomator private final Vault vault; private final MasterkeyFileAccess masterkeyFileAccess; @@ -64,12 +64,12 @@ public class MasterkeyFileLoadingStrategy implements KeyLoadingStrategy { public Masterkey loadKey(URI keyId) throws MasterkeyLoadingFailedException { window.setTitle(resourceBundle.getString("unlock.title").formatted(vault.getDisplayName())); Preconditions.checkArgument(SCHEME.equalsIgnoreCase(keyId.getScheme()), "Only supports keys with scheme " + SCHEME); - if (!DEFAULT_MASTERKEY_PATH.equals(keyId.getSchemeSpecificPart())) { + if (!Constants.MASTERKEY_FILENAME.equals(keyId.getSchemeSpecificPart())) { LOG.warn("unsupported masterkey path found in vault.cryptomator: {}", keyId.getSchemeSpecificPart()); } try { // determine masterkey file path: - Path filePath = vault.getPath().resolve(DEFAULT_MASTERKEY_PATH); + Path filePath = vault.getPath().resolve(Constants.MASTERKEY_FILENAME); if (!Files.exists(filePath)) { filePath = askUserForMasterkeyFilePath(); }