From b68b895bbaa34c80728553bcfb08dd18153f755d Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Thu, 2 Nov 2023 16:53:29 +0100 Subject: [PATCH] removed tcp port from volume preferences controller --- .../VolumePreferencesController.java | 59 ++----------------- .../resources/fxml/preferences_volume.fxml | 6 -- 2 files changed, 5 insertions(+), 60 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java index 1fbcc2509..fbd5d11ec 100644 --- a/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java +++ b/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java @@ -11,12 +11,8 @@ import org.cryptomator.ui.common.FxController; import javax.inject.Inject; import javax.inject.Named; import javafx.application.Application; -import javafx.beans.binding.Bindings; -import javafx.beans.binding.BooleanExpression; import javafx.beans.value.ObservableValue; -import javafx.scene.control.Button; import javafx.scene.control.ChoiceBox; -import javafx.scene.control.TextField; import javafx.util.StringConverter; import java.util.List; import java.util.Optional; @@ -27,26 +23,24 @@ import java.util.concurrent.atomic.AtomicReference; public class VolumePreferencesController implements FxController { private static final String DOCS_MOUNTING_URL = "https://docs.cryptomator.org/en/1.7/desktop/volume-type/"; - private static final int MIN_PORT = 1024; - private static final int MAX_PORT = 65535; private final Settings settings; private final ObservableValue selectedMountService; private final ResourceBundle resourceBundle; - private final BooleanExpression loopbackPortSupported; private final ObservableValue mountToDirSupported; private final ObservableValue mountToDriveLetterSupported; private final ObservableValue mountFlagsSupported; private final ObservableValue readonlySupported; - private final ObservableValue fuseRestartRequired; private final Lazy application; private final List mountProviders; public ChoiceBox volumeTypeChoiceBox; - public TextField loopbackPortField; - public Button loopbackPortApplyButton; @Inject - VolumePreferencesController(Settings settings, Lazy application, List mountProviders, @Named("FUPFMS") AtomicReference firstUsedProblematicFuseMountService, ResourceBundle resourceBundle) { + VolumePreferencesController(Settings settings, + Lazy application, + List mountProviders, + @Named("FUPFMS") AtomicReference firstUsedProblematicFuseMountService, + ResourceBundle resourceBundle) { this.settings = settings; this.application = application; this.mountProviders = mountProviders; @@ -54,16 +48,10 @@ public class VolumePreferencesController implements FxController { var fallbackProvider = mountProviders.stream().findFirst().orElse(null); this.selectedMountService = ObservableUtil.mapWithDefault(settings.mountService, serviceName -> mountProviders.stream().filter(s -> s.getClass().getName().equals(serviceName)).findFirst().orElse(fallbackProvider), fallbackProvider); - this.loopbackPortSupported = BooleanExpression.booleanExpression(selectedMountService.map(s -> s.hasCapability(MountCapability.LOOPBACK_PORT))); this.mountToDirSupported = selectedMountService.map(s -> s.hasCapability(MountCapability.MOUNT_WITHIN_EXISTING_PARENT) || s.hasCapability(MountCapability.MOUNT_TO_EXISTING_DIR)); this.mountToDriveLetterSupported = selectedMountService.map(s -> s.hasCapability(MountCapability.MOUNT_AS_DRIVE_LETTER)); this.mountFlagsSupported = selectedMountService.map(s -> s.hasCapability(MountCapability.MOUNT_FLAGS)); this.readonlySupported = selectedMountService.map(s -> s.hasCapability(MountCapability.READ_ONLY)); - this.fuseRestartRequired = selectedMountService.map(s -> // - firstUsedProblematicFuseMountService.get() != null // - && VaultModule.isProblematicFuseService(s) // - && !firstUsedProblematicFuseMountService.get().equals(s) - ); } public void initialize() { @@ -76,38 +64,9 @@ public class VolumePreferencesController implements FxController { var toSet = Optional.ofNullable(newProvider).map(nP -> nP.getClass().getName()).orElse(null); settings.mountService.set(toSet); }); - - loopbackPortField.setText(String.valueOf(settings.port.get())); - loopbackPortApplyButton.visibleProperty().bind(settings.port.asString().isNotEqualTo(loopbackPortField.textProperty())); - loopbackPortApplyButton.disableProperty().bind(Bindings.createBooleanBinding(this::validateLoopbackPort, loopbackPortField.textProperty()).not()); - } - - private boolean validateLoopbackPort() { - try { - int port = Integer.parseInt(loopbackPortField.getText()); - return port == 0 // choose port automatically - || port >= MIN_PORT && port <= MAX_PORT; // port within range - } catch (NumberFormatException e) { - return false; - } - } - - public void doChangeLoopbackPort() { - if (validateLoopbackPort()) { - settings.port.set(Integer.parseInt(loopbackPortField.getText())); - } } /* Property Getters */ - - public BooleanExpression loopbackPortSupportedProperty() { - return loopbackPortSupported; - } - - public boolean isLoopbackPortSupported() { - return loopbackPortSupported.get(); - } - public ObservableValue readonlySupportedProperty() { return readonlySupported; } @@ -140,14 +99,6 @@ public class VolumePreferencesController implements FxController { return mountFlagsSupported.getValue(); } - public ObservableValue fuseRestartRequiredProperty() { - return fuseRestartRequired; - } - - public boolean getFuseRestartRequired() { - return fuseRestartRequired.getValue(); - } - /* Helpers */ public class MountServiceConverter extends StringConverter { diff --git a/src/main/resources/fxml/preferences_volume.fxml b/src/main/resources/fxml/preferences_volume.fxml index fef85aadc..b2f955801 100644 --- a/src/main/resources/fxml/preferences_volume.fxml +++ b/src/main/resources/fxml/preferences_volume.fxml @@ -32,12 +32,6 @@ - -