diff --git a/src/main/java/org/cryptomator/common/Constants.java b/src/main/java/org/cryptomator/common/Constants.java index 90bd3c8ec..5069002e7 100644 --- a/src/main/java/org/cryptomator/common/Constants.java +++ b/src/main/java/org/cryptomator/common/Constants.java @@ -6,6 +6,7 @@ public interface Constants { String MASTERKEY_BACKUP_SUFFIX = ".bkup"; String VAULTCONFIG_FILENAME = "vault.cryptomator"; String CRYPTOMATOR_FILENAME_EXT = ".cryptomator"; + String CRYPTOMATOR_FILENAME_GLOB = "*.cryptomator"; byte[] PEPPER = new byte[0]; } diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java index e9b5865d5..432007c99 100644 --- a/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java +++ b/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java @@ -25,6 +25,8 @@ import java.io.IOException; import java.nio.file.Path; import java.util.ResourceBundle; +import static org.cryptomator.common.Constants.CRYPTOMATOR_FILENAME_GLOB; + @AddVaultWizardScoped public class ChooseExistingVaultController implements FxController { @@ -73,7 +75,7 @@ public class ChooseExistingVaultController implements FxController { public void chooseFileAndNext() { FileChooser fileChooser = new FileChooser(); fileChooser.setTitle(resourceBundle.getString("addvaultwizard.existing.filePickerTitle")); - fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Cryptomator Vault", "*.cryptomator")); + fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(resourceBundle.getString("addvaultwizard.existing.filePickerMimeDesc"), CRYPTOMATOR_FILENAME_GLOB)); File masterkeyFile = fileChooser.showOpenDialog(window); if (masterkeyFile != null) { vaultPath.setValue(masterkeyFile.toPath().toAbsolutePath().getParent()); diff --git a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/ChooseMasterkeyFileController.java b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/ChooseMasterkeyFileController.java index 11cf7bd6b..d47f4e5b3 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/ChooseMasterkeyFileController.java +++ b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/ChooseMasterkeyFileController.java @@ -15,6 +15,8 @@ import java.nio.file.Path; import java.util.ResourceBundle; import java.util.concurrent.CompletableFuture; +import static org.cryptomator.common.Constants.CRYPTOMATOR_FILENAME_GLOB; + @ChooseMasterkeyFileScoped public class ChooseMasterkeyFileController implements FxController { @@ -46,7 +48,7 @@ public class ChooseMasterkeyFileController implements FxController { LOG.trace("proceed()"); FileChooser fileChooser = new FileChooser(); fileChooser.setTitle(resourceBundle.getString("unlock.chooseMasterkey.filePickerTitle")); - fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Cryptomator Masterkey", "*.cryptomator")); + fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(resourceBundle.getString("unlock.chooseMasterkey.filePickerMimeDesc"), CRYPTOMATOR_FILENAME_GLOB)); File masterkeyFile = fileChooser.showOpenDialog(window); if (masterkeyFile != null) { LOG.debug("Chose masterkey file: {}", masterkeyFile); diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java index 8d9f192b5..bc372341a 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java @@ -13,6 +13,8 @@ import javafx.stage.Stage; import java.io.File; import java.util.ResourceBundle; +import static org.cryptomator.common.Constants.CRYPTOMATOR_FILENAME_GLOB; + @MainWindowScoped public class VaultDetailMissingVaultController implements FxController { @@ -45,7 +47,7 @@ public class VaultDetailMissingVaultController implements FxController { // copied from ChooseExistingVaultController class FileChooser fileChooser = new FileChooser(); fileChooser.setTitle(resourceBundle.getString("addvaultwizard.existing.filePickerTitle")); - fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Cryptomator Masterkey", "*.cryptomator")); + fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(resourceBundle.getString("addvaultwizard.existing.filePickerMimeDesc"), CRYPTOMATOR_FILENAME_GLOB)); File masterkeyFile = fileChooser.showOpenDialog(window); if (masterkeyFile != null) { vault.get().getVaultSettings().path().setValue(masterkeyFile.toPath().toAbsolutePath().getParent()); diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties index 411d18752..8660c8532 100644 --- a/src/main/resources/i18n/strings.properties +++ b/src/main/resources/i18n/strings.properties @@ -79,6 +79,7 @@ addvault.new.readme.accessLocation.4=Feel free to remove this file. addvaultwizard.existing.instruction=Choose the "vault.cryptomator" file of your existing vault. If only a file named "masterkey.cryptomator" exists, select that instead. addvaultwizard.existing.chooseBtn=Choose… addvaultwizard.existing.filePickerTitle=Select Vault File +addvaultwizard.existing.filePickerMimeDesc=Cryptomator Vault ## Success addvaultwizard.success.nextStepsInstructions=Added vault "%s".\nYou need to unlock this vault to access or add contents. Alternatively you can unlock it at any later point in time. addvaultwizard.success.unlockNow=Unlock Now @@ -108,6 +109,7 @@ unlock.chooseMasterkey.title=Select Masterkey of "%s" unlock.chooseMasterkey.prompt=Could not find the masterkey file for this vault at its expected location. Please choose the key file manually. unlock.chooseMasterkey.chooseBtn=Choose… unlock.chooseMasterkey.filePickerTitle=Select Masterkey File +unlock.chooseMasterkey.filePickerMimeDesc=Cryptomator Masterkey ## Success unlock.success.message=Unlocked "%s" successfully! Your vault is now accessible via its virtual drive. unlock.success.rememberChoice=Remember choice, don't show this again