mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-30 08:26:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #1289 by decoupling storage path from vault name

Browse Source
This commit is contained in:
Armin Schrenk
2020-08-06 15:18:30 +02:00
parent 3bd2a2f911
commit 7c1d6973ba
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
View File

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

5
main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
View File

@@ -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() {