diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/NioAdapterImpl.java b/main/commons/src/main/java/org/cryptomator/common/settings/NioAdapterImpl.java new file mode 100644 index 000000000..b34ad340d --- /dev/null +++ b/main/commons/src/main/java/org/cryptomator/common/settings/NioAdapterImpl.java @@ -0,0 +1,8 @@ +package org.cryptomator.common.settings; + +public enum NioAdapterImpl { + + WEBDAV, + FUSE + +} diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java b/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java index 889cc623a..88543cc01 100644 --- a/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java +++ b/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java @@ -30,7 +30,7 @@ public class Settings { public static final int DEFAULT_NUM_TRAY_NOTIFICATIONS = 3; public static final String DEFAULT_GVFS_SCHEME = "dav"; public static final boolean DEFAULT_DEBUG_MODE = false; - public static final String DEFAULT_NIO_ADAPTER = "WEBDAV"; + public static final String DEFAULT_NIO_ADAPTER = NioAdapterImpl.WEBDAV.name(); private final ObservableList directories = FXCollections.observableArrayList(VaultSettings::observables); private final BooleanProperty checkForUpdates = new SimpleBooleanProperty(DEFAULT_CHECK_FOR_UDPATES); diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java index 1b28cfe2a..c0caffe44 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java @@ -19,7 +19,7 @@ import javafx.scene.layout.GridPane; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.settings.Settings; import org.cryptomator.ui.l10n.Localization; -import org.cryptomator.ui.model.NioAdapterImpl; +import org.cryptomator.common.settings.NioAdapterImpl; import com.google.common.base.CharMatcher; import com.google.common.base.Strings; @@ -138,8 +138,8 @@ public class SettingsController implements ViewController { } private void changeNioView(String newVal) { - fuseNioAdapter.setVisible(newVal.equalsIgnoreCase("FUSE")); - webdavNioAdapter.setVisible(newVal.equalsIgnoreCase("WEBDAV")); + fuseNioAdapter.setVisible(newVal.equalsIgnoreCase(NioAdapterImpl.FUSE.name())); + webdavNioAdapter.setVisible(newVal.equalsIgnoreCase(NioAdapterImpl.WEBDAV.name())); } @Override diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/NioAdapterImpl.java b/main/ui/src/main/java/org/cryptomator/ui/model/NioAdapterImpl.java deleted file mode 100644 index 6b4cedcdd..000000000 --- a/main/ui/src/main/java/org/cryptomator/ui/model/NioAdapterImpl.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.cryptomator.ui.model; - -import java.util.ArrayList; - -public enum NioAdapterImpl { - - WEBDAV, - FUSE - -} diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java b/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java index 594dfa9d7..fe2028bea 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java @@ -12,7 +12,7 @@ import java.util.Objects; import javax.inject.Scope; -import org.apache.commons.lang3.SystemUtils; +import org.cryptomator.common.settings.NioAdapterImpl; import org.cryptomator.common.settings.Settings; import org.cryptomator.common.settings.VaultSettings;