From 0bbc4ecae51da11aad988414175a66b544187ef2 Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Thu, 13 Jun 2024 12:06:18 +0200
Subject: [PATCH] refactored code and new method
 handleDokanySupportEndAndShowDialog

---
 .../cryptomator/ui/fxapp/FxApplication.java   | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
index 48c7cda62..add7b6fc4 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
@@ -76,24 +76,27 @@ public class FxApplication {
 			appWindows.checkAndShowUpdateReminderWindow();
 		}
 
-		var dokany = "org.cryptomator.frontend.dokany.mount.DokanyMountProvider";
-		boolean dokanySupportEndWindowShown = false;
-		if (settings.mountService.getValueSafe().equals(dokany)) {
-			appWindows.showDokanySupportEndWindow();
-			dokanySupportEndWindowShown = true;
-			settings.mountService.set(null);
-		}
-		for (VaultSettings vaultSettings : settings.directories) {
-			if (vaultSettings.mountService.getValueSafe().equals(dokany)) {
-				if (!dokanySupportEndWindowShown) {
-					appWindows.showDokanySupportEndWindow();
-					dokanySupportEndWindowShown = true;
-				}
-				vaultSettings.mountService.set(null);
-			}
-		}
+		handleDokanySupportEndAndShowDialog();
 
 		launchEventHandler.startHandlingLaunchEvents();
 		autoUnlocker.tryUnlockForTimespan(2, TimeUnit.MINUTES);
 	}
+
+	private void handleDokanySupportEndAndShowDialog() {
+		var dokanyProviderId = "org.cryptomator.frontend.dokany.mount.DokanyMountProvider";
+		boolean dokanyFound = false;
+		if (settings.mountService.getValueSafe().contains(dokanyProviderId)) {
+			dokanyFound = true;
+			settings.mountService.set(null);
+		}
+		for (VaultSettings vaultSettings : settings.directories) {
+			if (vaultSettings.mountService.getValueSafe().contains(dokanyProviderId)) {
+				dokanyFound = true;
+				vaultSettings.mountService.set(null);
+			}
+		}
+		if(dokanyFound) {
+			appWindows.showDokanySupportEndWindow();
+		}
+	}
 }