浏览代码

Fixes #2126

Remove deprecated env variable
Armin Schrenk 3 年之前
父节点
当前提交
ef6f87bb19

文件差异内容过多而无法显示
+ 1 - 1
.idea/runConfigurations/Cryptomator_Windows_Dev.xml


+ 0 - 5
src/main/java/org/cryptomator/common/Environment.java

@@ -89,11 +89,6 @@ public class Environment {
 		return Boolean.getBoolean("cryptomator.showTrayIcon");
 	}
 
-	@Deprecated // TODO: remove as soon as custom mount path works properly on Win+Fuse
-	public boolean useExperimentalFuse() {
-		return Boolean.getBoolean("fuse.experimental");
-	}
-
 	private int getInt(String propertyName, int defaultValue) {
 		String value = System.getProperty(propertyName);
 		try {

+ 3 - 4
src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java

@@ -19,6 +19,7 @@ import java.nio.file.NoSuchFileException;
 import java.nio.file.NotDirectoryException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Optional;
 
 class CustomMountPointChooser implements MountPointChooser {
@@ -29,17 +30,15 @@ class CustomMountPointChooser implements MountPointChooser {
 	private static final Logger LOG = LoggerFactory.getLogger(CustomMountPointChooser.class);
 
 	private final VaultSettings vaultSettings;
-	private final Environment environment;
 
 	@Inject
-	public CustomMountPointChooser(VaultSettings vaultSettings, Environment environment) {
+	public CustomMountPointChooser(VaultSettings vaultSettings) {
 		this.vaultSettings = vaultSettings;
-		this.environment = environment;
 	}
 
 	@Override
 	public boolean isApplicable(Volume caller) {
-		return caller.getImplementationType() != VolumeImpl.FUSE || !SystemUtils.IS_OS_WINDOWS || environment.useExperimentalFuse();
+		return caller.getImplementationType() != VolumeImpl.WEBDAV;
 	}
 
 	@Override

+ 1 - 1
src/test/java/org/cryptomator/common/mountpoint/CustomMountPointChooserTest.java

@@ -33,7 +33,7 @@ public class CustomMountPointChooserTest {
 		this.volume = Mockito.mock(Volume.class);
 		this.vaultSettings = Mockito.mock(VaultSettings.class);
 		this.environment = Mockito.mock(Environment.class);
-		this.customMpc = new CustomMountPointChooser(vaultSettings, environment);
+		this.customMpc = new CustomMountPointChooser(vaultSettings);
 	}
 
 	@Nested