diff --git a/pom.xml b/pom.xml index 15df379fd..899d1b393 100644 --- a/pom.xml +++ b/pom.xml @@ -57,11 +57,11 @@ cryptofs ${cryptomator.cryptofs.version} - - org.cryptomator - fuse-nio-adapter - ${cryptomator.fuse.version} - + + + + + org.cryptomator dokany-nio-adapter diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 519c6199e..5825e5b15 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -6,7 +6,7 @@ import org.cryptomator.integrations.uiappearance.UiAppearanceProvider; module org.cryptomator.desktop { requires org.cryptomator.cryptofs; requires org.cryptomator.frontend.dokany; - requires org.cryptomator.frontend.fuse; + // requires org.cryptomator.frontend.fuse; requires org.cryptomator.frontend.webdav; requires org.cryptomator.integrations.api; requires java.rmi; diff --git a/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/src/main/java/org/cryptomator/common/vaults/FuseVolume.java.txt similarity index 100% rename from src/main/java/org/cryptomator/common/vaults/FuseVolume.java rename to src/main/java/org/cryptomator/common/vaults/FuseVolume.java.txt diff --git a/src/main/java/org/cryptomator/common/vaults/VaultModule.java b/src/main/java/org/cryptomator/common/vaults/VaultModule.java index 901ee7f42..756fa5aa8 100644 --- a/src/main/java/org/cryptomator/common/vaults/VaultModule.java +++ b/src/main/java/org/cryptomator/common/vaults/VaultModule.java @@ -48,12 +48,12 @@ public class VaultModule { } @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(); if (VolumeImpl.DOKANY == preferredImpl && dokanyVolume.isSupported()) { return dokanyVolume; - } else if (VolumeImpl.FUSE == preferredImpl && fuseVolume.isSupported()) { - return fuseVolume; +// } else if (VolumeImpl.FUSE == preferredImpl && fuseVolume.isSupported()) { +// return fuseVolume; } else { if (VolumeImpl.WEBDAV != preferredImpl) { LOG.warn("Using WebDAV, because {} is not supported.", preferredImpl.getDisplayName()); diff --git a/src/main/java/org/cryptomator/common/vaults/Volume.java b/src/main/java/org/cryptomator/common/vaults/Volume.java index f608122bf..f57f913e4 100644 --- a/src/main/java/org/cryptomator/common/vaults/Volume.java +++ b/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) { case WEBDAV -> WebDavVolume.isSupportedStatic(); case DOKANY -> DokanyVolume.isSupportedStatic(); - case FUSE -> FuseVolume.isSupportedStatic(); + case FUSE -> false; // FuseVolume.isSupportedStatic(); }).toArray(VolumeImpl[]::new); }