From 8fac541024268fa49d903da7b41d7551ccc0f4b9 Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Tue, 2 Sep 2025 07:40:02 +0200 Subject: [PATCH] use defaults.vault.vaultName as fallback displayName --- .../org/cryptomator/common/recovery/VaultPreparator.java | 9 ++++++--- .../cryptomator/ui/mainwindow/VaultListController.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/cryptomator/common/recovery/VaultPreparator.java b/src/main/java/org/cryptomator/common/recovery/VaultPreparator.java index 62494717e..d99ba50a0 100644 --- a/src/main/java/org/cryptomator/common/recovery/VaultPreparator.java +++ b/src/main/java/org/cryptomator/common/recovery/VaultPreparator.java @@ -10,10 +10,10 @@ import org.cryptomator.integrations.mount.MountService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; import java.io.IOException; import java.nio.file.Path; import java.util.List; +import java.util.ResourceBundle; import static org.cryptomator.common.vaults.VaultState.Value.LOCKED; @@ -23,13 +23,16 @@ public final class VaultPreparator { private VaultPreparator() {} - public static Vault prepareVault(Path selectedDirectory, VaultComponent.Factory vaultComponentFactory, List mountServices) { + public static Vault prepareVault(Path selectedDirectory, // + VaultComponent.Factory vaultComponentFactory, // + List mountServices, // + ResourceBundle resourceBundle) { VaultSettings vaultSettings = VaultSettings.withRandomId(); vaultSettings.path.set(selectedDirectory); if (selectedDirectory.getFileName() != null) { vaultSettings.displayName.set(selectedDirectory.getFileName().toString()); } else { - vaultSettings.displayName.set("defaultVaultName"); + vaultSettings.displayName.set(resourceBundle.getString("defaults.vault.vaultName")); } var wrapper = new VaultConfigCache(vaultSettings); diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java index 5a9b423a3..3333db498 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java @@ -272,7 +272,7 @@ public class VaultListController implements FxController { return; } - Vault preparedVault = VaultPreparator.prepareVault(path, vaultComponentFactory, mountServices); + Vault preparedVault = VaultPreparator.prepareVault(path, vaultComponentFactory, mountServices, resourceBundle); VaultListManager.redetermineVaultState(preparedVault); switch (preparedVault.getState()) {