From 7c1d6973ba90f79e802286e8eac03ab0851b0c27 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 6 Aug 2020 15:18:30 +0200 Subject: [PATCH] fixes #1289 by decoupling storage path from vault name --- .../java/org/cryptomator/common/settings/VaultSettings.java | 2 +- .../src/main/java/org/cryptomator/common/vaults/Vault.java | 5 ++--- 2 files changed, 3 insertions(+), 4 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 13a0c8eed..395b118dd 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 @@ -70,7 +70,7 @@ public class VaultSettings { if (!mountNameSet && dirnameExists) { mountName.set(normalizeMountName(newPath.getFileName().toString())); } else if (!mountNameSet && !dirnameExists) { - mountName.set(DEFAULT_MOUNT_NAME + id); + mountName.set(DEFAULT_MOUNT_NAME + " " + id); } else if (mountNameSet && dirnameExists) { if (mountName.get().equals(DEFAULT_MOUNT_NAME + id)) { //this is okay, since this function is only executed if the path changes (aka, the vault is created or added) diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java index bc461c1d9..5ee0ee931 100644 --- a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java +++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java @@ -78,7 +78,7 @@ public class Vault { this.state = state; this.lastKnownException = lastKnownException; this.stats = stats; - this.displayableName = Bindings.createStringBinding(this::getDisplayableName, vaultSettings.path()); + this.displayableName = Bindings.createStringBinding(this::getDisplayableName, vaultSettings.mountName()); this.displayablePath = Bindings.createStringBinding(this::getDisplayablePath, vaultSettings.path()); this.locked = Bindings.createBooleanBinding(this::isLocked, state); this.processing = Bindings.createBooleanBinding(this::isProcessing, state); @@ -230,8 +230,7 @@ public class Vault { } public String getDisplayableName() { - Path p = vaultSettings.path().get(); - return p.getFileName().toString(); + return vaultSettings.mountName().get(); } public StringBinding accessPointProperty() {