Browse Source

disable fuse for now

Sebastian Stenzel 4 years ago
parent
commit
0e924e7429

+ 5 - 5
pom.xml

@@ -57,11 +57,11 @@
 			<artifactId>cryptofs</artifactId>
 			<artifactId>cryptofs</artifactId>
 			<version>${cryptomator.cryptofs.version}</version>
 			<version>${cryptomator.cryptofs.version}</version>
 		</dependency>
 		</dependency>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>fuse-nio-adapter</artifactId>
-			<version>${cryptomator.fuse.version}</version>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.cryptomator</groupId>-->
+<!--			<artifactId>fuse-nio-adapter</artifactId>-->
+<!--			<version>${cryptomator.fuse.version}</version>-->
+<!--		</dependency>-->
 		<dependency>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
 			<groupId>org.cryptomator</groupId>
 			<artifactId>dokany-nio-adapter</artifactId>
 			<artifactId>dokany-nio-adapter</artifactId>

+ 1 - 1
src/main/java/module-info.java

@@ -6,7 +6,7 @@ import org.cryptomator.integrations.uiappearance.UiAppearanceProvider;
 module org.cryptomator.desktop {
 module org.cryptomator.desktop {
 	requires org.cryptomator.cryptofs;
 	requires org.cryptomator.cryptofs;
 	requires org.cryptomator.frontend.dokany;
 	requires org.cryptomator.frontend.dokany;
-	requires org.cryptomator.frontend.fuse;
+	// requires org.cryptomator.frontend.fuse;
 	requires org.cryptomator.frontend.webdav;
 	requires org.cryptomator.frontend.webdav;
 	requires org.cryptomator.integrations.api;
 	requires org.cryptomator.integrations.api;
 	requires java.rmi;
 	requires java.rmi;

src/main/java/org/cryptomator/common/vaults/FuseVolume.java → src/main/java/org/cryptomator/common/vaults/FuseVolume.java.txt


+ 3 - 3
src/main/java/org/cryptomator/common/vaults/VaultModule.java

@@ -48,12 +48,12 @@ public class VaultModule {
 	}
 	}
 
 
 	@Provides
 	@Provides
-	public Volume provideVolume(Settings settings, WebDavVolume webDavVolume, FuseVolume fuseVolume, DokanyVolume dokanyVolume) {
+	public Volume provideVolume(Settings settings, WebDavVolume webDavVolume, DokanyVolume dokanyVolume) {
 		VolumeImpl preferredImpl = settings.preferredVolumeImpl().get();
 		VolumeImpl preferredImpl = settings.preferredVolumeImpl().get();
 		if (VolumeImpl.DOKANY == preferredImpl && dokanyVolume.isSupported()) {
 		if (VolumeImpl.DOKANY == preferredImpl && dokanyVolume.isSupported()) {
 			return dokanyVolume;
 			return dokanyVolume;
-		} else if (VolumeImpl.FUSE == preferredImpl && fuseVolume.isSupported()) {
-			return fuseVolume;
+//		} else if (VolumeImpl.FUSE == preferredImpl && fuseVolume.isSupported()) {
+//			return fuseVolume;
 		} else {
 		} else {
 			if (VolumeImpl.WEBDAV != preferredImpl) {
 			if (VolumeImpl.WEBDAV != preferredImpl) {
 				LOG.warn("Using WebDAV, because {} is not supported.", preferredImpl.getDisplayName());
 				LOG.warn("Using WebDAV, because {} is not supported.", preferredImpl.getDisplayName());

+ 1 - 1
src/main/java/org/cryptomator/common/vaults/Volume.java

@@ -66,7 +66,7 @@ public interface Volume {
 		return Stream.of(VolumeImpl.values()).filter(impl -> switch (impl) {
 		return Stream.of(VolumeImpl.values()).filter(impl -> switch (impl) {
 			case WEBDAV -> WebDavVolume.isSupportedStatic();
 			case WEBDAV -> WebDavVolume.isSupportedStatic();
 			case DOKANY -> DokanyVolume.isSupportedStatic();
 			case DOKANY -> DokanyVolume.isSupportedStatic();
-			case FUSE -> FuseVolume.isSupportedStatic();
+			case FUSE -> false; // FuseVolume.isSupportedStatic();
 		}).toArray(VolumeImpl[]::new);
 		}).toArray(VolumeImpl[]::new);
 	}
 	}