From 15dcf10ad71589fecbe82291094ca3c344e2f877 Mon Sep 17 00:00:00 2001 From: infeo Date: Thu, 4 Jul 2019 15:20:14 +0200 Subject: [PATCH] fixing error where wrong mount flags are displayed (app started with webDAV and then switched to Fuse/Dokany) --- .../org/cryptomator/ui/model/VaultModule.java | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java b/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java index c5de5a224..5e4050d8f 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java @@ -45,19 +45,21 @@ public class VaultModule { @PerVault @DefaultMountFlags public Supplier provideDefaultMountFlags(Settings settings, VaultSettings vaultSettings) { - VolumeImpl preferredImpl = settings.preferredVolumeImpl().get(); - switch (preferredImpl) { - case FUSE: - if (SystemUtils.IS_OS_MAC_OSX) { - return () -> getMacFuseDefaultMountFlags(settings, vaultSettings); - } else if (SystemUtils.IS_OS_LINUX) { - return () -> getLinuxFuseDefaultMountFlags(settings, vaultSettings); - } - case DOKANY: - return () -> getDokanyDefaultMountFlags(settings, vaultSettings); - default: - return () -> "--flags-supported-on-FUSE-or-DOKANY-only"; - } + return () -> { + VolumeImpl preferredImpl = settings.preferredVolumeImpl().get(); + switch (preferredImpl) { + case FUSE: + if (SystemUtils.IS_OS_MAC_OSX) { + return getMacFuseDefaultMountFlags(settings, vaultSettings); + } else if (SystemUtils.IS_OS_LINUX) { + return getLinuxFuseDefaultMountFlags(settings, vaultSettings); + } + case DOKANY: + return getDokanyDefaultMountFlags(settings, vaultSettings); + default: + return "--flags-supported-on-FUSE-or-DOKANY-only"; + } + }; } // see: https://github.com/osxfuse/osxfuse/wiki/Mount-options