mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-20 03:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable FUSE

Browse Source 
This reverts commit 0e924e7429.
This commit is contained in:
Sebastian Stenzel
2021-06-22 16:32:19 +02:00
parent 458a466c7f
commit 94e26da693
12 changed files with 79 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/module-info.java
View File

@@ -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;

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

6
src/main/java/org/cryptomator/common/vaults/VaultModule.java
View File

@@ -48,12 +48,12 @@ public class VaultModule {
}
@Provides
public Volume provideVolume(Settings settings, WebDavVolume webDavVolume, DokanyVolume dokanyVolume) {
public Volume provideVolume(Settings settings, WebDavVolume webDavVolume, FuseVolume fuseVolume, 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());

2
src/main/java/org/cryptomator/common/vaults/Volume.java
View File

@@ -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 -> false; // FuseVolume.isSupportedStatic();
case FUSE -> FuseVolume.isSupportedStatic();
}).toArray(VolumeImpl[]::new);
}