mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-18 23:05:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactored the refactoring to a macfuse/fuse-t workaround again

Browse Source
This commit is contained in:
Tobias Hagemann
2023-03-29 16:50:02 +02:00
parent 771468c8c6
commit b5bbd21f25
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/cryptomator/common/mount/MountModule.java
View File

@@ -15,7 +15,7 @@ import java.util.concurrent.atomic.AtomicReference;
public class MountModule {
private static final AtomicReference<MountService> formerSelectedMountService = new AtomicReference<>(null);
private static final AtomicReference<MountService> firstUsedFuseMountService = new AtomicReference<>(null);
private static final AtomicReference<MountService> firstUsedProblematicFuseMountService = new AtomicReference<>(null);
@Provides
@Singleton
@@ -32,24 +32,24 @@ public class MountModule {
desiredServiceImpl -> { //
var serviceFromSettings = serviceImpls.stream().filter(serviceImpl -> serviceImpl.getClass().getName().equals(desiredServiceImpl)).findAny(); //
var targetedService = serviceFromSettings.orElse(fallbackProvider);
return applyWorkaroundForFuse(targetedService, serviceFromSettings.isPresent());
return applyWorkaroundForProblematicFuse(targetedService, serviceFromSettings.isPresent());
}, //
() -> { //
return applyWorkaroundForFuse(fallbackProvider, true);
return applyWorkaroundForProblematicFuse(fallbackProvider, true);
});
return observableMountService;
}
//see https://github.com/cryptomator/cryptomator/issues/2786
private synchronized static ActualMountService applyWorkaroundForFuse(MountService targetedService, boolean isDesired) {
//set the first used fuse service if applicable
var targetIsFuse = isFuseService(targetedService);
if (targetIsFuse && firstUsedFuseMountService.get() == null) {
firstUsedFuseMountService.set(targetedService);
private synchronized static ActualMountService applyWorkaroundForProblematicFuse(MountService targetedService, boolean isDesired) {
//set the first used problematic fuse service if applicable
var targetIsProblematicFuse = isProblematicFuseService(targetedService);
if (targetIsProblematicFuse && firstUsedProblematicFuseMountService.get() == null) {
firstUsedProblematicFuseMountService.set(targetedService);
}
//make sure that the first used fuse service is always used
if (targetIsFuse && !firstUsedFuseMountService.get().equals(targetedService)) {
//make sure that the first used problematic fuse service is always used
if (targetIsProblematicFuse && !firstUsedProblematicFuseMountService.get().equals(targetedService)) {
return new ActualMountService(formerSelectedMountService.get(), false);
} else {
formerSelectedMountService.set(targetedService);
@@ -57,7 +57,7 @@ public class MountModule {
}
}
private static boolean isFuseService(MountService service) {
return service.getClass().getName().startsWith("org.cryptomator.frontend.fuse.mount.");
private static boolean isProblematicFuseService(MountService service) {
return List.of("org.cryptomator.frontend.fuse.mount.MacFuseMountProvider", "org.cryptomator.frontend.fuse.mount.FuseTMountProvider").contains(service.getClass().getName());
}
}

6
src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
View File

@@ -55,11 +55,11 @@ public class VolumePreferencesController implements FxController {
this.mountFlagsSupported = selectedMountService.map(s -> s.hasCapability(MountCapability.MOUNT_FLAGS));
this.readonlySupported = selectedMountService.map(s -> s.hasCapability(MountCapability.READ_ONLY));
var mountServiceAtStart = selectedMountService.getValue();
this.fuseRestartRequired = selectedMountService.map(s -> isFuse(mountServiceAtStart) && isFuse(s) && !mountServiceAtStart.equals(s));
this.fuseRestartRequired = selectedMountService.map(s -> isProblematicFuse(mountServiceAtStart) && isProblematicFuse(s) && !mountServiceAtStart.equals(s));
}
private boolean isFuse(MountService service) {
return service.getClass().getName().startsWith("org.cryptomator.frontend.fuse.mount.");
private boolean isProblematicFuse(MountService service) {
return List.of("org.cryptomator.frontend.fuse.mount.MacFuseMountProvider", "org.cryptomator.frontend.fuse.mount.FuseTMountProvider").contains(service.getClass().getName());
}
public void initialize() {