From c3141e3601c7d8991ae625698f72ad3e3183c05b Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 28 Aug 2020 11:58:46 +0200 Subject: [PATCH] minor adjustments --- .../org/cryptomator/common/settings/VaultSettings.java | 1 - .../common/settings/VaultSettingsJsonAdapter.java | 7 +++---- .../org/cryptomator/common/vaults/VaultListManager.java | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java index 6e2bd3cd8..b5b2ffac6 100644 --- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java +++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java @@ -35,7 +35,6 @@ public class VaultSettings { public static final boolean DEFAULT_USES_INDIVIDUAL_MOUNTPATH = false; public static final boolean DEFAULT_USES_READONLY_MODE = false; public static final String DEFAULT_MOUNT_FLAGS = ""; - public static final String DEFAULT_MOUNT_NAME = "Vault"; public static final int DEFAULT_FILENAME_LENGTH_LIMIT = -1; public static final WhenUnlocked DEFAULT_ACTION_AFTER_UNLOCK = WhenUnlocked.ASK; diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java index 5f8f2a95f..04a352a49 100644 --- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java +++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java @@ -5,7 +5,6 @@ *******************************************************************************/ package org.cryptomator.common.settings; -import com.google.common.base.Strings; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import org.slf4j.Logger; @@ -76,10 +75,10 @@ class VaultSettingsJsonAdapter { in.endObject(); VaultSettings vaultSettings = (id == null) ? VaultSettings.withRandomId() : new VaultSettings(id); - if(Strings.isNullOrEmpty(displayName)){ //see https://github.com/cryptomator/cryptomator/pull/1318 - vaultSettings.displayName().set(mountName); - } else { + if (displayName != null) { //see https://github.com/cryptomator/cryptomator/pull/1318 vaultSettings.displayName().set(displayName); + } else { + vaultSettings.displayName().set(mountName); } vaultSettings.path().set(Paths.get(path)); vaultSettings.winDriveLetter().set(winDriveLetter); diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java index 85309c0dc..a670acab5 100644 --- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java +++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java @@ -35,13 +35,13 @@ public class VaultListManager { private static final Logger LOG = LoggerFactory.getLogger(VaultListManager.class); private final VaultComponent.Builder vaultComponentBuilder; - private final ResourceBundle resourceBundle; private final ObservableList vaultList; + private final String defaultVaultName; @Inject public VaultListManager(VaultComponent.Builder vaultComponentBuilder, ResourceBundle resourceBundle, Settings settings) { this.vaultComponentBuilder = vaultComponentBuilder; - this.resourceBundle = resourceBundle; + this.defaultVaultName = resourceBundle.getString("defaults.vault.vaultName"); this.vaultList = FXCollections.observableArrayList(Vault::observables); addAll(settings.getDirectories()); @@ -73,7 +73,7 @@ public class VaultListManager { if (path.getFileName() != null) { vaultSettings.displayName().set(path.getFileName().toString()); } else { - vaultSettings.displayName().set(resourceBundle.getString("defaults.vault.vaultName")); + vaultSettings.displayName().set(defaultVaultName); } return vaultSettings; }