Magic-Mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2024-11-23 12:09:45 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

only set the mount point when a mount point is explicitly required

Browse Source 
(didn't work for the webdav fallback provider, which doesn't _not_ MOUNT_TO_SYSTEM_CHOSEN_PATH, as it does not mount at all)
This commit is contained in:
Sebastian Stenzel 2022-11-07 15:55:26 +01:00
parent eff2530e70
commit 3e5a7fadd0
No known key found for this signature in database
GPG Key ID: 667B866EA8240A09
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,11 +161,14 @@ public class Vault {
}
}
if (mountServiceImpl.hasCapability(MountCapability.MOUNT_TO_SYSTEM_CHOSEN_PATH) && vaultSettings.getMountPoint() == null) {
return builder;
} else {
return builder.setMountpoint(vaultSettings.getMountPoint());
if (mountServiceImpl.hasCapability(MountCapability.MOUNT_TO_EXISTING_DIR) //
|| mountServiceImpl.hasCapability(MountCapability.MOUNT_WITHIN_EXISTING_PARENT) //
|| mountServiceImpl.hasCapability(MountCapability.MOUNT_AS_DRIVE_LETTER)) {
builder.setMountpoint(vaultSettings.getMountPoint());
}
return builder;
}
public synchronized void unlock(MasterkeyLoader keyLoader) throws CryptoException, IOException, MountFailedException {
@ -296,7 +299,7 @@ public class Vault {
public String getAccessPoint() {
var mountPoint = mount.get().mount.getMountpoint();
if( mountPoint instanceof Mountpoint.WithPath m) {
if (mountPoint instanceof Mountpoint.WithPath m) {
return m.path().toString();
} else {
return mountPoint.uri().toString();