minor adjustments

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;
 

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);

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<Vault> 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;
 	}