|
|
@@ -2,50 +2,71 @@ package org.cryptomator.common.mount;
|
|
|
|
|
|
import dagger.Module;
|
|
|
import dagger.Provides;
|
|
|
+import org.cryptomator.common.ObservableUtil;
|
|
|
import org.cryptomator.common.settings.Settings;
|
|
|
+import org.cryptomator.integrations.mount.Mount;
|
|
|
import org.cryptomator.integrations.mount.MountService;
|
|
|
|
|
|
+import javax.inject.Named;
|
|
|
import javax.inject.Singleton;
|
|
|
-import javafx.beans.property.SimpleObjectProperty;
|
|
|
import javafx.beans.value.ObservableValue;
|
|
|
import java.util.List;
|
|
|
+import java.util.concurrent.atomic.AtomicReference;
|
|
|
|
|
|
@Module
|
|
|
public class MountModule {
|
|
|
|
|
|
+ private static final AtomicReference<MountService> formerSelectedMountService = new AtomicReference<>(null);
|
|
|
+ private static final List<String> problematicFuseMountServices = List.of("org.cryptomator.frontend.fuse.mount.MacFuseMountProvider", "org.cryptomator.frontend.fuse.mount.FuseTMountProvider");
|
|
|
+
|
|
|
@Provides
|
|
|
@Singleton
|
|
|
static List<MountService> provideSupportedMountServices() {
|
|
|
return MountService.get().toList();
|
|
|
}
|
|
|
|
|
|
- //currently not used, because macFUSE and FUSE-T cannot be used in the same JVM
|
|
|
- /*
|
|
|
@Provides
|
|
|
@Singleton
|
|
|
- static ObservableValue<ActualMountService> provideMountService(Settings settings, List<MountService> serviceImpls) {
|
|
|
- var fallbackProvider = serviceImpls.stream().findFirst().orElse(null);
|
|
|
- return ObservableUtil.mapWithDefault(settings.mountService(), //
|
|
|
- desiredServiceImpl -> { //
|
|
|
- var desiredService = serviceImpls.stream().filter(serviceImpl -> serviceImpl.getClass().getName().equals(desiredServiceImpl)).findAny(); //
|
|
|
- return new ActualMountService(desiredService.orElse(fallbackProvider), desiredService.isPresent()); //
|
|
|
- }, //
|
|
|
- new ActualMountService(fallbackProvider, true));
|
|
|
+ @Named("FUPFMS")
|
|
|
+ static AtomicReference<MountService> provideFirstUsedProblematicFuseMountService() {
|
|
|
+ return new AtomicReference<>(null);
|
|
|
}
|
|
|
- */
|
|
|
|
|
|
@Provides
|
|
|
@Singleton
|
|
|
- static ActualMountService provideActualMountService(Settings settings, List<MountService> serviceImpls) {
|
|
|
+ static ObservableValue<ActualMountService> provideMountService(Settings settings, List<MountService> serviceImpls, @Named("FUPFMS") AtomicReference<MountService> fupfms) {
|
|
|
var fallbackProvider = serviceImpls.stream().findFirst().orElse(null);
|
|
|
- var desiredService = serviceImpls.stream().filter(serviceImpl -> serviceImpl.getClass().getName().equals(settings.mountService().getValue())).findFirst(); //
|
|
|
- return new ActualMountService(desiredService.orElse(fallbackProvider), desiredService.isPresent()); //
|
|
|
+
|
|
|
+ var observableMountService = ObservableUtil.mapWithDefault(settings.mountService(), //
|
|
|
+ desiredServiceImpl -> { //
|
|
|
+ var serviceFromSettings = serviceImpls.stream().filter(serviceImpl -> serviceImpl.getClass().getName().equals(desiredServiceImpl)).findAny(); //
|
|
|
+ var targetedService = serviceFromSettings.orElse(fallbackProvider);
|
|
|
+ return applyWorkaroundForProblematicFuse(targetedService, serviceFromSettings.isPresent(), fupfms);
|
|
|
+ }, //
|
|
|
+ () -> { //
|
|
|
+ return applyWorkaroundForProblematicFuse(fallbackProvider, true, fupfms);
|
|
|
+ });
|
|
|
+ return observableMountService;
|
|
|
}
|
|
|
|
|
|
- @Provides
|
|
|
- @Singleton
|
|
|
- static ObservableValue<ActualMountService> provideMountService(ActualMountService service) {
|
|
|
- return new SimpleObjectProperty<>(service);
|
|
|
+ //see https://github.com/cryptomator/cryptomator/issues/2786
|
|
|
+ private synchronized static ActualMountService applyWorkaroundForProblematicFuse(MountService targetedService, boolean isDesired, AtomicReference<MountService> firstUsedProblematicFuseMountService) {
|
|
|
+ //set the first used problematic fuse service if applicable
|
|
|
+ var targetIsProblematicFuse = isProblematicFuseService(targetedService);
|
|
|
+ if (targetIsProblematicFuse && firstUsedProblematicFuseMountService.get() == null) {
|
|
|
+ firstUsedProblematicFuseMountService.set(targetedService);
|
|
|
+ }
|
|
|
+
|
|
|
+ //do not use the targeted mount service and fallback to former one, if the service is problematic _and_ not the first problematic one used.
|
|
|
+ if (targetIsProblematicFuse && !firstUsedProblematicFuseMountService.get().equals(targetedService)) {
|
|
|
+ return new ActualMountService(formerSelectedMountService.get(), false);
|
|
|
+ } else {
|
|
|
+ formerSelectedMountService.set(targetedService);
|
|
|
+ return new ActualMountService(targetedService, isDesired);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+ public static boolean isProblematicFuseService(MountService service) {
|
|
|
+ return problematicFuseMountServices.contains(service.getClass().getName());
|
|
|
+ }
|
|
|
}
|
Armin Schrenk