diff --git a/pom.xml b/pom.xml index 7b6e26433..e1e15fd54 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 2.1.0-rc1 2.4.5 - 1.2.0-beta1 + 1.2.0-beta2 1.1.2 1.1.2 1.1.0 diff --git a/src/main/java/org/cryptomator/common/vaults/Vault.java b/src/main/java/org/cryptomator/common/vaults/Vault.java index 4e41e7b72..ea54ed9d5 100644 --- a/src/main/java/org/cryptomator/common/vaults/Vault.java +++ b/src/main/java/org/cryptomator/common/vaults/Vault.java @@ -96,7 +96,7 @@ public class Vault { this.state = state; this.lastKnownException = lastKnownException; this.mountService = mountService; - this.defaultMountFlags = Bindings.createStringBinding(() -> mountService.getValue().getDefaultMountFlags(vaultSettings.mountName().get()), vaultSettings.mountName(), mountService).orElse(""); //TODO: logic correct? + this.defaultMountFlags = mountService.map(MountService::getDefaultMountFlags); this.stats = stats; this.displayablePath = Bindings.createStringBinding(this::getDisplayablePath, vaultSettings.path()); this.locked = Bindings.createBooleanBinding(this::isLocked, state); @@ -161,11 +161,13 @@ public class Vault { for (var capability : mountProvider.capabilities()) { switch (capability) { + case FILE_SYSTEM_NAME -> builder.setFileSystemName("crypto"); case LOOPBACK_PORT -> builder.setLoopbackPort(settings.port().get()); //TODO: move port from settings to vaultsettings? case LOOPBACK_HOST_NAME -> builder.setLoopbackHostName("cryptomator-vault"); //TODO: Read from system property case READ_ONLY -> builder.setReadOnly(vaultSettings.usesReadOnlyMode().get()); - case MOUNT_FLAGS -> builder.setMountFlags(mountProvider.getDefaultMountFlags(vaultSettings.mountName().get())); //TODO: currently not adjustable + case MOUNT_FLAGS -> builder.setMountFlags(defaultMountFlags.getValue()); // TODO use custom mount flags (pre-populated with default mount flags) case VOLUME_ID -> builder.setVolumeId(vaultSettings.getId()); + case VOLUME_NAME -> builder.setVolumeName(vaultSettings.mountName().get()); } }