From 3eb44b06aff5c31cbade57a988accb258607310b Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 3 Nov 2020 12:50:52 +0100 Subject: [PATCH] Fixes #1061: * temp mount point is first tried without any addition * then with id Suffix in brackets * then with underscores, id suffix and count --- .../mountpoint/TemporaryMountPointChooser.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java index 4c96c0599..518ba520b 100644 --- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java +++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java @@ -47,8 +47,19 @@ public class TemporaryMountPointChooser implements MountPointChooser { private Path choose(Path parent) { String basename = this.vaultSettings.displayName().get(); - for (int i = 0; i < MAX_TMPMOUNTPOINT_CREATION_RETRIES; i++) { - Path mountPoint = parent.resolve(basename + "_" + i); + //regular + Path mountPoint = parent.resolve(basename); + if (Files.notExists(mountPoint)) { + return mountPoint; + } + //with id + mountPoint = parent.resolve(basename + " (" +vaultSettings.getId() + ")"); + if (Files.notExists(mountPoint)) { + return mountPoint; + } + //with id and count + for (int i = 1; i < MAX_TMPMOUNTPOINT_CREATION_RETRIES; i++) { + mountPoint = parent.resolve(basename + "_(" +vaultSettings.getId() + ")_"+i); if (Files.notExists(mountPoint)) { return mountPoint; }