فهرست منبع

refactored code and new method handleDokanySupportEndAndShowDialog

Jan-Peter Klein 1 سال پیش
والد
کامیت
0bbc4ecae5
1فایلهای تغییر یافته به همراه16 افزوده شده و 13 حذف شده
  1. 16 13
      src/main/java/org/cryptomator/ui/fxapp/FxApplication.java

+ 16 - 13
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;
+		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().equals(dokany)) {
-				if (!dokanySupportEndWindowShown) {
-					appWindows.showDokanySupportEndWindow();
-					dokanySupportEndWindowShown = true;
-				}
+			if (vaultSettings.mountService.getValueSafe().contains(dokanyProviderId)) {
+				dokanyFound = true;
 				vaultSettings.mountService.set(null);
 			}
 		}
-
-		launchEventHandler.startHandlingLaunchEvents();
-		autoUnlocker.tryUnlockForTimespan(2, TimeUnit.MINUTES);
+		if(dokanyFound) {
+			appWindows.showDokanySupportEndWindow();
+		}
 	}
 }