From 8f46aec851aca952e66a3fd9fbef8ac98b67bcff Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Thu, 26 Oct 2023 10:35:16 +0200
Subject: [PATCH] created MountServiceConverter class

---
 .../common/mount/MountServiceConverter.java   | 29 +++++++++++++++++++
 .../VolumePreferencesController.java          | 22 ++------------
 .../vaultoptions/MountOptionsController.java  | 22 ++------------
 3 files changed, 33 insertions(+), 40 deletions(-)
 create mode 100644 src/main/java/org/cryptomator/common/mount/MountServiceConverter.java

diff --git a/src/main/java/org/cryptomator/common/mount/MountServiceConverter.java b/src/main/java/org/cryptomator/common/mount/MountServiceConverter.java
new file mode 100644
index 000000000..f83380e1e
--- /dev/null
+++ b/src/main/java/org/cryptomator/common/mount/MountServiceConverter.java
@@ -0,0 +1,29 @@
+package org.cryptomator.common.mount;
+
+import org.cryptomator.integrations.mount.MountService;
+
+import javafx.util.StringConverter;
+import java.util.ResourceBundle;
+
+public class MountServiceConverter extends StringConverter<MountService> {
+
+	private final ResourceBundle resourceBundle;
+
+	public MountServiceConverter(ResourceBundle resourceBundle) {
+		this.resourceBundle = resourceBundle;
+	}
+
+	@Override
+	public String toString(MountService provider) {
+		if (provider == null) {
+			return resourceBundle.getString("preferences.volume.type.automatic");
+		} else {
+			return provider.displayName();
+		}
+	}
+
+	@Override
+	public MountService fromString(String string) {
+		throw new UnsupportedOperationException();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
index f684c46c6..fe3979d9f 100644
--- a/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
+++ b/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
@@ -2,6 +2,7 @@ package org.cryptomator.ui.preferences;
 
 import dagger.Lazy;
 import org.cryptomator.common.ObservableUtil;
+import org.cryptomator.common.mount.MountServiceConverter;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.vaults.VaultModule;
 import org.cryptomator.integrations.mount.MountCapability;
@@ -70,7 +71,7 @@ public class VolumePreferencesController implements FxController {
 	public void initialize() {
 		volumeTypeChoiceBox.getItems().add(null);
 		volumeTypeChoiceBox.getItems().addAll(mountProviders);
-		volumeTypeChoiceBox.setConverter(new MountServiceConverter());
+		volumeTypeChoiceBox.setConverter(new MountServiceConverter(resourceBundle));
 		boolean autoSelected = settings.mountService.get() == null;
 		volumeTypeChoiceBox.getSelectionModel().select(autoSelected ? null : selectedMountService.getValue());
 		volumeTypeChoiceBox.valueProperty().addListener((observableValue, oldProvider, newProvider) -> {
@@ -149,25 +150,6 @@ public class VolumePreferencesController implements FxController {
 		return fuseRestartRequired.getValue();
 	}
 
-	/* Helpers */
-
-	public class MountServiceConverter extends StringConverter<MountService> {
-
-		@Override
-		public String toString(MountService provider) {
-			if (provider == null) {
-				return resourceBundle.getString("preferences.volume.type.automatic");
-			} else {
-				return provider.displayName();
-			}
-		}
-
-		@Override
-		public MountService fromString(String string) {
-			throw new UnsupportedOperationException();
-		}
-	}
-
 	public void openDocs() {
 		application.get().getHostServices().showDocument(DOCS_MOUNTING_URL);
 	}
diff --git a/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java b/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
index 0cfd022df..5637633b4 100644
--- a/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
+++ b/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
@@ -3,6 +3,7 @@ package org.cryptomator.ui.vaultoptions;
 import com.google.common.base.Strings;
 import dagger.Lazy;
 import org.cryptomator.common.ObservableUtil;
+import org.cryptomator.common.mount.MountServiceConverter;
 import org.cryptomator.common.mount.WindowsDriveLetters;
 import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.common.vaults.Vault;
@@ -141,7 +142,7 @@ public class MountOptionsController implements FxController {
 
 		vaultVolumeTypeChoiceBox.getItems().add(null);
 		vaultVolumeTypeChoiceBox.getItems().addAll(mountProviders);
-		vaultVolumeTypeChoiceBox.setConverter(new MountServiceConverter());
+		vaultVolumeTypeChoiceBox.setConverter(new MountServiceConverter(resourceBundle));
 		boolean autoSelected = vaultSettings.mountService.get() == null;
 		vaultVolumeTypeChoiceBox.getSelectionModel().select(autoSelected ? null : selectedMountService.getValue());
 		vaultVolumeTypeChoiceBox.valueProperty().addListener((observableValue, oldProvider, newProvider) -> {
@@ -353,23 +354,4 @@ public class MountOptionsController implements FxController {
 		return loopbackPortSupported.get();
 	}
 
-	//Helpers
-	/* Helpers */
-
-	private class MountServiceConverter extends StringConverter<MountService> {
-
-		@Override
-		public String toString(MountService provider) {
-			if (provider == null) {
-				return resourceBundle.getString("preferences.volume.type.automatic");
-			} else {
-				return provider.displayName();
-			}
-		}
-
-		@Override
-		public MountService fromString(String string) {
-			throw new UnsupportedOperationException();
-		}
-	}
 }