Magic-Mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2024-10-07 01:03:31 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

revert 1ab73be1f4 and 2d968eac8c

Browse Source
This commit is contained in:
Armin Schrenk 2024-02-27 12:32:37 +01:00
parent 3228f2cf5f
commit 11ba1f3ddc
No known key found for this signature in database
GPG Key ID: 8F2992163CBBA7FC
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/cryptomator/common/mount/Mounter.java
View File

@ -119,9 +119,8 @@ public class Mounter {
Files.createDirectories(defaultMountPointBase);
builder.setMountpoint(defaultMountPointBase);
} else if (canMountToDir) {
var mountPoint = defaultMountPointBase.resolve(vaultSettings.id);
var mountPoint = defaultMountPointBase.resolve(vaultSettings.mountName.get());
Files.createDirectories(mountPoint);
cleanup = () -> removeCreatedDirectory(mountPoint);
builder.setMountpoint(mountPoint);
}
} else {
@ -157,14 +156,6 @@ public class Mounter {
}
private void removeCreatedDirectory(Path toDelete) {
try {
Files.delete(toDelete);
} catch (IOException e) {
LOG.warn("Unable to remove {} after unmount: {}.", toDelete, e.getMessage());
}
}
public MountHandle mount(VaultSettings vaultSettings, Path cryptoFsRoot) throws IOException, MountFailedException {
var mountService = mountProviders.stream().filter(s -> s.getClass().getName().equals(vaultSettings.mountService.getValue())).findFirst().orElse(defaultMountService.getValue());