From e5ce3cb62d0b167aae00f3e5c2beec450a2b9a9e Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 19 Jun 2020 15:49:31 +0200 Subject: [PATCH] closes #1254 --- .../common/settings/VaultSettings.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 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 5db9b8d70..1a1dfe140 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 @@ -34,9 +34,10 @@ 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; - + private static final Random RNG = new Random(); private final String id; @@ -55,16 +56,20 @@ public class VaultSettings { public VaultSettings(String id) { this.id = Objects.requireNonNull(id); - EasyBind.subscribe(path, this::deriveMountNameFromPath); + EasyBind.subscribe(path, this::deriveMountNameFromPathOrUseDefault); } Observable[] observables() { return new Observable[]{path, mountName, winDriveLetter, unlockAfterStartup, revealAfterMount, useCustomMountPath, customMountPath, usesReadOnlyMode, mountFlags, filenameLengthLimit, actionAfterUnlock}; } - private void deriveMountNameFromPath(Path path) { - if (path != null && StringUtils.isBlank(mountName.get())) { - mountName.set(normalizeMountName(path.getFileName().toString())); + private void deriveMountNameFromPathOrUseDefault(Path path) { + if (StringUtils.isBlank(mountName.get())) { + if (path != null && path.getFileName() != null) { + mountName.set(normalizeMountName(path.getFileName().toString())); + } else { + mountName.set(DEFAULT_MOUNT_NAME); + } } }