From 8f85777887f433fe48e52bc3641094e4a7bb75a9 Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Tue, 31 May 2022 11:18:20 +0200
Subject: [PATCH 01/10] =?UTF-8?q?implemented=20functionality=20of=20featur?=
 =?UTF-8?q?e=20request=20issue=20#1713=20"On=20closing=20of=20the=20applic?=
 =?UTF-8?q?ation:=20Always=20lock=20and=20quit=20=E2=80=93=20without=20ask?=
 =?UTF-8?q?ing"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/cryptomator/common/settings/Settings.java   |  7 +++++++
 .../common/settings/SettingsJsonAdapter.java        |  2 ++
 .../ui/fxapp/FxApplicationTerminator.java           |  7 +++++--
 .../preferences/GeneralPreferencesController.java   |  3 +++
 .../org/cryptomator/ui/quit/QuitController.java     | 13 +++++++++++--
 src/main/resources/fxml/preferences_general.fxml    |  2 ++
 src/main/resources/fxml/quit.fxml                   |  6 +++++-
 src/main/resources/i18n/strings.properties          |  2 ++
 .../common/settings/SettingsJsonAdapterTest.java    |  2 ++
 9 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/settings/Settings.java b/src/main/java/org/cryptomator/common/settings/Settings.java
index 8cc23bbfc..670fec410 100644
--- a/src/main/java/org/cryptomator/common/settings/Settings.java
+++ b/src/main/java/org/cryptomator/common/settings/Settings.java
@@ -32,6 +32,7 @@ public class Settings {
 	public static final boolean DEFAULT_ASKED_FOR_UPDATE_CHECK = false;
 	public static final boolean DEFAULT_CHECK_FOR_UPDATES = false;
 	public static final boolean DEFAULT_START_HIDDEN = false;
+	public static final boolean DEFAULT_AUTO_CLOSE_VAULTS = false;
 	public static final int DEFAULT_PORT = 42427;
 	public static final int DEFAULT_NUM_TRAY_NOTIFICATIONS = 3;
 	public static final WebDavUrlScheme DEFAULT_GVFS_SCHEME = WebDavUrlScheme.DAV;
@@ -51,6 +52,7 @@ public class Settings {
 	private final BooleanProperty askedForUpdateCheck = new SimpleBooleanProperty(DEFAULT_ASKED_FOR_UPDATE_CHECK);
 	private final BooleanProperty checkForUpdates = new SimpleBooleanProperty(DEFAULT_CHECK_FOR_UPDATES);
 	private final BooleanProperty startHidden = new SimpleBooleanProperty(DEFAULT_START_HIDDEN);
+	private final BooleanProperty autoCloseVaults = new SimpleBooleanProperty(DEFAULT_AUTO_CLOSE_VAULTS);
 	private final IntegerProperty port = new SimpleIntegerProperty(DEFAULT_PORT);
 	private final IntegerProperty numTrayNotifications = new SimpleIntegerProperty(DEFAULT_NUM_TRAY_NOTIFICATIONS);
 	private final ObjectProperty<WebDavUrlScheme> preferredGvfsScheme = new SimpleObjectProperty<>(DEFAULT_GVFS_SCHEME);
@@ -82,6 +84,7 @@ public class Settings {
 		askedForUpdateCheck.addListener(this::somethingChanged);
 		checkForUpdates.addListener(this::somethingChanged);
 		startHidden.addListener(this::somethingChanged);
+		autoCloseVaults.addListener(this::somethingChanged);
 		port.addListener(this::somethingChanged);
 		numTrayNotifications.addListener(this::somethingChanged);
 		preferredGvfsScheme.addListener(this::somethingChanged);
@@ -133,6 +136,10 @@ public class Settings {
 		return startHidden;
 	}
 
+	public BooleanProperty autoCloseVaults() {
+		return autoCloseVaults;
+	}
+
 	public IntegerProperty port() {
 		return port;
 	}
diff --git a/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java b/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
index d10066f8f..3f4614604 100644
--- a/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
+++ b/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
@@ -41,6 +41,7 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 		out.name("askedForUpdateCheck").value(value.askedForUpdateCheck().get());
 		out.name("checkForUpdatesEnabled").value(value.checkForUpdates().get());
 		out.name("startHidden").value(value.startHidden().get());
+		out.name("autoCloseVaults").value(value.autoCloseVaults().get());
 		out.name("port").value(value.port().get());
 		out.name("numTrayNotifications").value(value.numTrayNotifications().get());
 		out.name("preferredGvfsScheme").value(value.preferredGvfsScheme().get().name());
@@ -82,6 +83,7 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 				case "askedForUpdateCheck" -> settings.askedForUpdateCheck().set(in.nextBoolean());
 				case "checkForUpdatesEnabled" -> settings.checkForUpdates().set(in.nextBoolean());
 				case "startHidden" -> settings.startHidden().set(in.nextBoolean());
+				case "autoCloseVaults" -> settings.autoCloseVaults().set(in.nextBoolean());
 				case "port" -> settings.port().set(in.nextInt());
 				case "numTrayNotifications" -> settings.numTrayNotifications().set(in.nextInt());
 				case "preferredGvfsScheme" -> settings.preferredGvfsScheme().set(parseWebDavUrlSchemePrefix(in.nextString()));
diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java
index 7c7b07c1e..5b68b5992 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java
@@ -2,6 +2,7 @@ package org.cryptomator.ui.fxapp;
 
 import com.google.common.base.Preconditions;
 import org.cryptomator.common.ShutdownHook;
+import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.vaults.LockNotCompletedException;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
@@ -33,12 +34,14 @@ public class FxApplicationTerminator {
 	private final ShutdownHook shutdownHook;
 	private final FxApplicationWindows appWindows;
 	private final AtomicBoolean allowQuitWithoutPrompt = new AtomicBoolean();
+	private final Settings settings;
 
 	@Inject
-	public FxApplicationTerminator(ObservableList<Vault> vaults, ShutdownHook shutdownHook, FxApplicationWindows appWindows) {
+	public FxApplicationTerminator(ObservableList<Vault> vaults, ShutdownHook shutdownHook, FxApplicationWindows appWindows, Settings settings) {
 		this.vaults = vaults;
 		this.shutdownHook = shutdownHook;
 		this.appWindows = appWindows;
+		this.settings = settings;
 	}
 
 	public void initialize() {
@@ -92,7 +95,7 @@ public class FxApplicationTerminator {
 	 */
 	private void handleQuitRequest(@SuppressWarnings("unused") @Nullable EventObject e, QuitResponse response) {
 		var exitingResponse = new ExitingQuitResponse(response);
-		if (allowQuitWithoutPrompt.get()) {
+		if (allowQuitWithoutPrompt.get() || settings.autoCloseVaults().get()) {
 			exitingResponse.performQuit();
 		} else {
 			appWindows.showQuitWindow(exitingResponse);
diff --git a/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
index d33e919b6..f35f17f27 100644
--- a/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
+++ b/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
@@ -36,6 +36,7 @@ public class GeneralPreferencesController implements FxController {
 	private final FxApplicationWindows appWindows;
 	public ChoiceBox<KeychainAccessProvider> keychainBackendChoiceBox;
 	public CheckBox startHiddenCheckbox;
+	public CheckBox autoCloseVaultsCheckbox;
 	public CheckBox debugModeCheckbox;
 	public CheckBox autoStartCheckbox;
 	public ToggleGroup nodeOrientation;
@@ -55,6 +56,8 @@ public class GeneralPreferencesController implements FxController {
 	public void initialize() {
 		startHiddenCheckbox.selectedProperty().bindBidirectional(settings.startHidden());
 
+		autoCloseVaultsCheckbox.selectedProperty().bindBidirectional(settings.autoCloseVaults());
+
 		debugModeCheckbox.selectedProperty().bindBidirectional(settings.debugMode());
 
 		autoStartProvider.ifPresent(autoStart -> autoStartCheckbox.setSelected(autoStart.isEnabled()));
diff --git a/src/main/java/org/cryptomator/ui/quit/QuitController.java b/src/main/java/org/cryptomator/ui/quit/QuitController.java
index 207ae42c8..b4dfe408e 100644
--- a/src/main/java/org/cryptomator/ui/quit/QuitController.java
+++ b/src/main/java/org/cryptomator/ui/quit/QuitController.java
@@ -1,5 +1,6 @@
 package org.cryptomator.ui.quit;
 
+import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.VaultService;
@@ -11,6 +12,7 @@ import javafx.collections.ObservableList;
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
 import javafx.scene.control.ContentDisplay;
 import javafx.stage.Stage;
 import java.awt.desktop.QuitResponse;
@@ -30,19 +32,26 @@ public class QuitController implements FxController {
 	private final ExecutorService executorService;
 	private final VaultService vaultService;
 	private final AtomicReference<QuitResponse> quitResponse = new AtomicReference<>();
-
+	private final Settings settings;
 	/* FXML */
 	public Button lockAndQuitButton;
+	public CheckBox rememberAlwaysLockAndQuitCheckbox;
 
 	@Inject
-	QuitController(@QuitWindow Stage window, ObservableList<Vault> vaults, ExecutorService executorService, VaultService vaultService) {
+	QuitController(@QuitWindow Stage window, ObservableList<Vault> vaults, ExecutorService executorService, VaultService vaultService, Settings settings) {
 		this.window = window;
 		this.unlockedVaults = vaults.filtered(Vault::isUnlocked);
 		this.executorService = executorService;
 		this.vaultService = vaultService;
+		this.settings = settings;
 		window.setOnCloseRequest(windowEvent -> cancel());
 	}
 
+	@FXML
+	public void initialize() {
+		rememberAlwaysLockAndQuitCheckbox.selectedProperty().bindBidirectional(settings.autoCloseVaults());
+	}
+
 	public void updateQuitRequest(QuitResponse newResponse) {
 		var oldResponse = quitResponse.getAndSet(newResponse);
 		if (oldResponse != null) {
diff --git a/src/main/resources/fxml/preferences_general.fxml b/src/main/resources/fxml/preferences_general.fxml
index 6d2b68447..c255e2a0f 100644
--- a/src/main/resources/fxml/preferences_general.fxml
+++ b/src/main/resources/fxml/preferences_general.fxml
@@ -24,6 +24,8 @@
 
 		<CheckBox fx:id="startHiddenCheckbox" text="%preferences.general.startHidden" />
 
+		<CheckBox fx:id="autoCloseVaultsCheckbox" text="%preferences.general.autoCloseVaults" />
+
 		<HBox spacing="12" alignment="CENTER_LEFT">
 			<Label text="%preferences.general.keychainBackend"/>
 			<ChoiceBox fx:id="keychainBackendChoiceBox"/>
diff --git a/src/main/resources/fxml/quit.fxml b/src/main/resources/fxml/quit.fxml
index 8db6eafc7..9c8bfc416 100644
--- a/src/main/resources/fxml/quit.fxml
+++ b/src/main/resources/fxml/quit.fxml
@@ -10,6 +10,7 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
+<?import javafx.scene.control.CheckBox?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.quit.QuitController"
@@ -26,7 +27,10 @@
 				<Circle styleClass="glyph-icon-primary" radius="24"/>
 				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="QUESTION" glyphSize="24"/>
 			</StackPane>
-			<Label text="%quit.prompt" wrapText="true" textAlignment="LEFT" HBox.hgrow="ALWAYS"/>
+			<VBox alignment="CENTER_LEFT" VBox.vgrow="ALWAYS">
+				<Label text="%quit.prompt" wrapText="true" textAlignment="LEFT" HBox.hgrow="ALWAYS"/>
+				<CheckBox text="%quit.prompt.rememberAlwaysLockAndQuitCheckbox" fx:id="rememberAlwaysLockAndQuitCheckbox"/>
+			</VBox>
 		</HBox>
 
 		<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index 8660c8532..655eb7d94 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -194,6 +194,7 @@ preferences.title=Preferences
 ## General
 preferences.general=General
 preferences.general.startHidden=Hide window when starting Cryptomator
+preferences.general.autoCloseVaults=Lock open vaults automatically when quitting application
 preferences.general.debugLogging=Enable debug logging
 preferences.general.debugDirectory=Reveal log files
 preferences.general.autoStart=Launch Cryptomator on system start
@@ -382,3 +383,4 @@ passwordStrength.messageLabel.4=Very strong
 # Quit
 quit.prompt=Quit application? There are unlocked vaults.
 quit.lockAndQuit=Lock and Quit
+quit.prompt.rememberAlwaysLockAndQuitCheckbox=Always lock all vaults and quit application
\ No newline at end of file
diff --git a/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java b/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java
index a8bc4551a..fc24fdbf1 100644
--- a/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java
+++ b/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java
@@ -27,6 +27,7 @@ public class SettingsJsonAdapterTest {
 						{"id": "1", "path": "/vault1", "mountName": "vault1", "winDriveLetter": "X"},
 						{"id": "2", "path": "/vault2", "mountName": "vault2", "winDriveLetter": "Y"}
 					],
+					"autoCloseVaults" : true,
 					"checkForUpdatesEnabled": true,
 					"port": 8080,
 					"language": "de-DE",
@@ -40,6 +41,7 @@ public class SettingsJsonAdapterTest {
 		Assertions.assertTrue(settings.checkForUpdates().get());
 		Assertions.assertEquals(2, settings.getDirectories().size());
 		Assertions.assertEquals(8080, settings.port().get());
+		Assertions.assertEquals(true, settings.autoCloseVaults().get());
 		Assertions.assertEquals("de-DE", settings.languageProperty().get());
 		Assertions.assertEquals(42, settings.numTrayNotifications().get());
 		Assertions.assertEquals(WebDavUrlScheme.DAV, settings.preferredGvfsScheme().get());

From 6f33cf8df7d49e5ac3e5e683b0ef86e134c0383d Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Tue, 31 May 2022 14:09:12 +0200
Subject: [PATCH 02/10] removed checkbox in quit prompt

---
 .../java/org/cryptomator/ui/quit/QuitController.java   | 10 +---------
 src/main/resources/fxml/quit.fxml                      |  6 +-----
 src/main/resources/i18n/strings.properties             |  3 +--
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/quit/QuitController.java b/src/main/java/org/cryptomator/ui/quit/QuitController.java
index b4dfe408e..e9cf1f365 100644
--- a/src/main/java/org/cryptomator/ui/quit/QuitController.java
+++ b/src/main/java/org/cryptomator/ui/quit/QuitController.java
@@ -12,7 +12,6 @@ import javafx.collections.ObservableList;
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
-import javafx.scene.control.CheckBox;
 import javafx.scene.control.ContentDisplay;
 import javafx.stage.Stage;
 import java.awt.desktop.QuitResponse;
@@ -32,10 +31,9 @@ public class QuitController implements FxController {
 	private final ExecutorService executorService;
 	private final VaultService vaultService;
 	private final AtomicReference<QuitResponse> quitResponse = new AtomicReference<>();
-	private final Settings settings;
+
 	/* FXML */
 	public Button lockAndQuitButton;
-	public CheckBox rememberAlwaysLockAndQuitCheckbox;
 
 	@Inject
 	QuitController(@QuitWindow Stage window, ObservableList<Vault> vaults, ExecutorService executorService, VaultService vaultService, Settings settings) {
@@ -43,15 +41,9 @@ public class QuitController implements FxController {
 		this.unlockedVaults = vaults.filtered(Vault::isUnlocked);
 		this.executorService = executorService;
 		this.vaultService = vaultService;
-		this.settings = settings;
 		window.setOnCloseRequest(windowEvent -> cancel());
 	}
 
-	@FXML
-	public void initialize() {
-		rememberAlwaysLockAndQuitCheckbox.selectedProperty().bindBidirectional(settings.autoCloseVaults());
-	}
-
 	public void updateQuitRequest(QuitResponse newResponse) {
 		var oldResponse = quitResponse.getAndSet(newResponse);
 		if (oldResponse != null) {
diff --git a/src/main/resources/fxml/quit.fxml b/src/main/resources/fxml/quit.fxml
index 9c8bfc416..8db6eafc7 100644
--- a/src/main/resources/fxml/quit.fxml
+++ b/src/main/resources/fxml/quit.fxml
@@ -10,7 +10,6 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
-<?import javafx.scene.control.CheckBox?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.quit.QuitController"
@@ -27,10 +26,7 @@
 				<Circle styleClass="glyph-icon-primary" radius="24"/>
 				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="QUESTION" glyphSize="24"/>
 			</StackPane>
-			<VBox alignment="CENTER_LEFT" VBox.vgrow="ALWAYS">
-				<Label text="%quit.prompt" wrapText="true" textAlignment="LEFT" HBox.hgrow="ALWAYS"/>
-				<CheckBox text="%quit.prompt.rememberAlwaysLockAndQuitCheckbox" fx:id="rememberAlwaysLockAndQuitCheckbox"/>
-			</VBox>
+			<Label text="%quit.prompt" wrapText="true" textAlignment="LEFT" HBox.hgrow="ALWAYS"/>
 		</HBox>
 
 		<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index 655eb7d94..8642be287 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -382,5 +382,4 @@ passwordStrength.messageLabel.4=Very strong
 
 # Quit
 quit.prompt=Quit application? There are unlocked vaults.
-quit.lockAndQuit=Lock and Quit
-quit.prompt.rememberAlwaysLockAndQuitCheckbox=Always lock all vaults and quit application
\ No newline at end of file
+quit.lockAndQuit=Lock and Quit
\ No newline at end of file

From 7cc1a1728cd0633b7fe25084c1dd3b6576569d6e Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Mon, 27 Jun 2022 14:40:20 +0200
Subject: [PATCH 03/10] removed unused parameter

---
 src/main/java/org/cryptomator/ui/quit/QuitController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/cryptomator/ui/quit/QuitController.java b/src/main/java/org/cryptomator/ui/quit/QuitController.java
index e9cf1f365..7be5905d5 100644
--- a/src/main/java/org/cryptomator/ui/quit/QuitController.java
+++ b/src/main/java/org/cryptomator/ui/quit/QuitController.java
@@ -36,7 +36,7 @@ public class QuitController implements FxController {
 	public Button lockAndQuitButton;
 
 	@Inject
-	QuitController(@QuitWindow Stage window, ObservableList<Vault> vaults, ExecutorService executorService, VaultService vaultService, Settings settings) {
+	QuitController(@QuitWindow Stage window, ObservableList<Vault> vaults, ExecutorService executorService, VaultService vaultService) {
 		this.window = window;
 		this.unlockedVaults = vaults.filtered(Vault::isUnlocked);
 		this.executorService = executorService;

From bee9c9f452cee022d2206ba7aa76e23b74d73280 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 28 Jun 2022 15:39:04 +0200
Subject: [PATCH 04/10] closes #1713

quit application by locking open vaults, if user wished so.
---
 .../cryptomator/ui/common/VaultService.java   |  3 +-
 .../ui/fxapp/FxApplicationTerminator.java     | 28 +++++++++++++++++--
 .../cryptomator/ui/quit/QuitController.java   |  1 -
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/common/VaultService.java b/src/main/java/org/cryptomator/ui/common/VaultService.java
index a6486f35f..8486a09c0 100644
--- a/src/main/java/org/cryptomator/ui/common/VaultService.java
+++ b/src/main/java/org/cryptomator/ui/common/VaultService.java
@@ -86,7 +86,8 @@ public class VaultService {
 	}
 
 	/**
-	 * Creates but doesn't start a lock-all task.
+	 * Creates a lock-all task.
+	 * This task itself is _not started_, but its subtasks locking each vault will be already executed.
 	 *
 	 * @param vaults The list of vaults to be locked
 	 * @param forced Whether to attempt a forced lock
diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java
index 5b68b5992..cb34ae3d0 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java
@@ -7,6 +7,7 @@ import org.cryptomator.common.vaults.LockNotCompletedException;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.common.vaults.Volume;
+import org.cryptomator.ui.common.VaultService;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,20 +29,24 @@ import static org.cryptomator.common.vaults.VaultState.Value.*;
 public class FxApplicationTerminator {
 
 	private static final Set<VaultState.Value> STATES_ALLOWING_TERMINATION = EnumSet.of(LOCKED, NEEDS_MIGRATION, MISSING, ERROR);
+	private static final Set<VaultState.Value> STATES_PREVENT_TERMINATION = EnumSet.of(PROCESSING);
 	private static final Logger LOG = LoggerFactory.getLogger(FxApplicationTerminator.class);
 
 	private final ObservableList<Vault> vaults;
 	private final ShutdownHook shutdownHook;
 	private final FxApplicationWindows appWindows;
 	private final AtomicBoolean allowQuitWithoutPrompt = new AtomicBoolean();
+	private final AtomicBoolean preventQuitWithGracefulLock = new AtomicBoolean();
 	private final Settings settings;
+	private final VaultService vaultService;
 
 	@Inject
-	public FxApplicationTerminator(ObservableList<Vault> vaults, ShutdownHook shutdownHook, FxApplicationWindows appWindows, Settings settings) {
+	public FxApplicationTerminator(ObservableList<Vault> vaults, ShutdownHook shutdownHook, FxApplicationWindows appWindows, Settings settings, VaultService vaultService) {
 		this.vaults = vaults;
 		this.shutdownHook = shutdownHook;
 		this.appWindows = appWindows;
 		this.settings = settings;
+		this.vaultService = vaultService;
 	}
 
 	public void initialize() {
@@ -75,6 +80,10 @@ public class FxApplicationTerminator {
 	private void vaultListChanged(@SuppressWarnings("unused") Observable observable) {
 		boolean allowSuddenTermination = vaults.stream().map(Vault::getState).allMatch(STATES_ALLOWING_TERMINATION::contains);
 		boolean stateChanged = allowQuitWithoutPrompt.compareAndSet(!allowSuddenTermination, allowSuddenTermination);
+
+		boolean preventGracefulTermination = vaults.stream().map(Vault::getState).anyMatch(STATES_PREVENT_TERMINATION::contains);
+		preventQuitWithGracefulLock.set(preventGracefulTermination);
+
 		Desktop desktop = Desktop.getDesktop();
 		if (stateChanged && desktop.isSupported(Desktop.Action.APP_SUDDEN_TERMINATION)) {
 			if (allowSuddenTermination) {
@@ -95,8 +104,21 @@ public class FxApplicationTerminator {
 	 */
 	private void handleQuitRequest(@SuppressWarnings("unused") @Nullable EventObject e, QuitResponse response) {
 		var exitingResponse = new ExitingQuitResponse(response);
-		if (allowQuitWithoutPrompt.get() || settings.autoCloseVaults().get()) {
+
+		if (allowQuitWithoutPrompt.get()) {
 			exitingResponse.performQuit();
+		} else if (settings.autoCloseVaults().get() && !preventQuitWithGracefulLock.get()) {
+			var lockAllTask = vaultService.createLockAllTask(vaults.filtered(Vault::isUnlocked), false);
+			lockAllTask.setOnSucceeded(event -> {
+				LOG.info("Locked remaining vaults was succesful.");
+				exitingResponse.performQuit();
+			});
+			lockAllTask.setOnFailed(event -> {
+				LOG.warn("Unable to lock all vaults.");
+				exitingResponse.cancelQuit();
+				//TODO: notify user!?!
+			});
+			lockAllTask.run();
 		} else {
 			appWindows.showQuitWindow(exitingResponse);
 		}
@@ -118,7 +140,7 @@ public class FxApplicationTerminator {
 
 	/**
 	 * A dummy QuitResponse that ignores the response.
-	 *
+	 * <p>
 	 * To be used with {@link #handleQuitRequest(EventObject, QuitResponse)} if the invoking method is not interested in the response.
 	 */
 	private static class NoopQuitResponse implements QuitResponse {
diff --git a/src/main/java/org/cryptomator/ui/quit/QuitController.java b/src/main/java/org/cryptomator/ui/quit/QuitController.java
index 7be5905d5..207ae42c8 100644
--- a/src/main/java/org/cryptomator/ui/quit/QuitController.java
+++ b/src/main/java/org/cryptomator/ui/quit/QuitController.java
@@ -1,6 +1,5 @@
 package org.cryptomator.ui.quit;
 
-import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.VaultService;

From d10d8fb208450efba1baedcedebf5ec5c812cb20 Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Wed, 29 Jun 2022 15:12:43 +0200
Subject: [PATCH 05/10] implemented force quit dialog

---
 src/main/java/module-info.java                |  1 +
 .../org/cryptomator/ui/common/FxmlFile.java   |  1 +
 .../ui/fxapp/FxApplicationModule.java         |  9 +-
 .../ui/fxapp/FxApplicationTerminator.java     |  3 +-
 .../ui/fxapp/FxApplicationWindows.java        |  9 +-
 .../ui/quitforced/QuitForcedComponent.java    | 44 +++++++++
 .../ui/quitforced/QuitForcedController.java   | 93 +++++++++++++++++++
 .../ui/quitforced/QuitForcedModule.java       | 58 ++++++++++++
 .../ui/quitforced/QuitForcedScoped.java       | 13 +++
 .../ui/quitforced/QuitForcedWindow.java       | 14 +++
 src/main/resources/fxml/quit_forced.fxml      | 59 ++++++++++++
 src/main/resources/i18n/strings.properties    |  8 +-
 12 files changed, 307 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/org/cryptomator/ui/quitforced/QuitForcedComponent.java
 create mode 100644 src/main/java/org/cryptomator/ui/quitforced/QuitForcedController.java
 create mode 100644 src/main/java/org/cryptomator/ui/quitforced/QuitForcedModule.java
 create mode 100644 src/main/java/org/cryptomator/ui/quitforced/QuitForcedScoped.java
 create mode 100644 src/main/java/org/cryptomator/ui/quitforced/QuitForcedWindow.java
 create mode 100644 src/main/resources/fxml/quit_forced.fxml

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index dd3d7680b..0d2c141b7 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -51,6 +51,7 @@ module org.cryptomator.desktop {
 	opens org.cryptomator.ui.migration to javafx.fxml;
 	opens org.cryptomator.ui.preferences to javafx.fxml;
 	opens org.cryptomator.ui.quit to javafx.fxml;
+	opens org.cryptomator.ui.quitforced to javafx.fxml;
 	opens org.cryptomator.ui.recoverykey to javafx.fxml;
 	opens org.cryptomator.ui.removevault to javafx.fxml;
 	opens org.cryptomator.ui.stats to javafx.fxml;
diff --git a/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/src/main/java/org/cryptomator/ui/common/FxmlFile.java
index bc952f9d1..e1912aad1 100644
--- a/src/main/java/org/cryptomator/ui/common/FxmlFile.java
+++ b/src/main/java/org/cryptomator/ui/common/FxmlFile.java
@@ -23,6 +23,7 @@ public enum FxmlFile {
 	MIGRATION_SUCCESS("/fxml/migration_success.fxml"), //
 	PREFERENCES("/fxml/preferences.fxml"), //
 	QUIT("/fxml/quit.fxml"), //
+	QUIT_FORCED("/fxml/quit_forced.fxml"), //
 	RECOVERYKEY_CREATE("/fxml/recoverykey_create.fxml"), //
 	RECOVERYKEY_RECOVER("/fxml/recoverykey_recover.fxml"), //
 	RECOVERYKEY_RESET_PASSWORD("/fxml/recoverykey_reset_password.fxml"), //
diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
index 85e46dffa..007e62fd6 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
@@ -14,6 +14,7 @@ import org.cryptomator.ui.lock.LockComponent;
 import org.cryptomator.ui.mainwindow.MainWindowComponent;
 import org.cryptomator.ui.preferences.PreferencesComponent;
 import org.cryptomator.ui.quit.QuitComponent;
+import org.cryptomator.ui.quitforced.QuitForcedComponent;
 import org.cryptomator.ui.traymenu.TrayMenuComponent;
 import org.cryptomator.ui.unlock.UnlockComponent;
 
@@ -25,7 +26,7 @@ import java.io.UncheckedIOException;
 import java.util.Collections;
 import java.util.List;
 
-@Module(includes = {UpdateCheckerModule.class}, subcomponents = {TrayMenuComponent.class, MainWindowComponent.class, PreferencesComponent.class, UnlockComponent.class, LockComponent.class, QuitComponent.class, ErrorComponent.class})
+@Module(includes = {UpdateCheckerModule.class}, subcomponents = {TrayMenuComponent.class, MainWindowComponent.class, PreferencesComponent.class, UnlockComponent.class, LockComponent.class, QuitComponent.class, QuitForcedComponent.class, ErrorComponent.class})
 abstract class FxApplicationModule {
 
 	private static Image createImageFromResource(String resourceName) throws IOException {
@@ -57,4 +58,10 @@ abstract class FxApplicationModule {
 	static QuitComponent provideQuitComponent(QuitComponent.Builder builder) {
 		return builder.build();
 	}
+
+	@Provides
+	@FxApplicationScoped
+	static QuitForcedComponent provideQuitForcedComponent(QuitForcedComponent.Builder builder) {
+		return builder.build();
+	}
 }
diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java
index cb34ae3d0..b38bd0d06 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java
@@ -115,8 +115,7 @@ public class FxApplicationTerminator {
 			});
 			lockAllTask.setOnFailed(event -> {
 				LOG.warn("Unable to lock all vaults.");
-				exitingResponse.cancelQuit();
-				//TODO: notify user!?!
+				appWindows.showQuitForcedWindow(exitingResponse);
 			});
 			lockAllTask.run();
 		} else {
diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java
index ba28f9bc4..d80cb6c5b 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java
@@ -11,6 +11,7 @@ import org.cryptomator.ui.mainwindow.MainWindowComponent;
 import org.cryptomator.ui.preferences.PreferencesComponent;
 import org.cryptomator.ui.preferences.SelectedPreferencesTab;
 import org.cryptomator.ui.quit.QuitComponent;
+import org.cryptomator.ui.quitforced.QuitForcedComponent;
 import org.cryptomator.ui.unlock.UnlockComponent;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -41,6 +42,7 @@ public class FxApplicationWindows {
 	private final Lazy<MainWindowComponent> mainWindow;
 	private final Lazy<PreferencesComponent> preferencesWindow;
 	private final Lazy<QuitComponent> quitWindow;
+	private final Lazy<QuitForcedComponent> quitForcedWindow;
 	private final UnlockComponent.Factory unlockWorkflowFactory;
 	private final LockComponent.Factory lockWorkflowFactory;
 	private final ErrorComponent.Factory errorWindowFactory;
@@ -48,12 +50,13 @@ public class FxApplicationWindows {
 	private final FilteredList<Window> visibleWindows;
 
 	@Inject
-	public FxApplicationWindows(@PrimaryStage Stage primaryStage, Optional<TrayIntegrationProvider> trayIntegration, Lazy<MainWindowComponent> mainWindow, Lazy<PreferencesComponent> preferencesWindow, Lazy<QuitComponent> quitWindow, UnlockComponent.Factory unlockWorkflowFactory, LockComponent.Factory lockWorkflowFactory, ErrorComponent.Factory errorWindowFactory, ExecutorService executor) {
+	public FxApplicationWindows(@PrimaryStage Stage primaryStage, Optional<TrayIntegrationProvider> trayIntegration, Lazy<MainWindowComponent> mainWindow, Lazy<PreferencesComponent> preferencesWindow, Lazy<QuitComponent> quitWindow, Lazy<QuitForcedComponent> quitForcedWindow, UnlockComponent.Factory unlockWorkflowFactory, LockComponent.Factory lockWorkflowFactory, ErrorComponent.Factory errorWindowFactory, ExecutorService executor) {
 		this.primaryStage = primaryStage;
 		this.trayIntegration = trayIntegration;
 		this.mainWindow = mainWindow;
 		this.preferencesWindow = preferencesWindow;
 		this.quitWindow = quitWindow;
+		this.quitForcedWindow = quitForcedWindow;
 		this.unlockWorkflowFactory = unlockWorkflowFactory;
 		this.lockWorkflowFactory = lockWorkflowFactory;
 		this.errorWindowFactory = errorWindowFactory;
@@ -108,6 +111,10 @@ public class FxApplicationWindows {
 		return CompletableFuture.supplyAsync(() -> quitWindow.get().showQuitWindow(response), Platform::runLater).whenComplete(this::reportErrors);
 	}
 
+	public CompletionStage<Stage> showQuitForcedWindow(QuitResponse response) {
+		return CompletableFuture.supplyAsync(() -> quitForcedWindow.get().showQuitForcedWindow(response), Platform::runLater).whenComplete(this::reportErrors);
+	}
+
 	public CompletionStage<Void> startUnlockWorkflow(Vault vault, @Nullable Stage owner) {
 		return CompletableFuture.supplyAsync(() -> {
 					Preconditions.checkState(vault.stateProperty().transition(VaultState.Value.LOCKED, VaultState.Value.PROCESSING), "Vault not locked.");
diff --git a/src/main/java/org/cryptomator/ui/quitforced/QuitForcedComponent.java b/src/main/java/org/cryptomator/ui/quitforced/QuitForcedComponent.java
new file mode 100644
index 000000000..0a6ba5fb2
--- /dev/null
+++ b/src/main/java/org/cryptomator/ui/quitforced/QuitForcedComponent.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the accompanying LICENSE file.
+ *******************************************************************************/
+package org.cryptomator.ui.quitforced;
+
+import dagger.Lazy;
+import dagger.Subcomponent;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
+
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+import java.awt.desktop.QuitResponse;
+
+@QuitForcedScoped
+@Subcomponent(modules = {QuitForcedModule.class})
+public interface QuitForcedComponent {
+
+	@QuitForcedWindow
+	Stage window();
+
+	@FxmlScene(FxmlFile.QUIT_FORCED)
+	Lazy<Scene> scene();
+
+	QuitForcedController controller();
+
+	default Stage showQuitForcedWindow(QuitResponse response) {
+		controller().updateQuitRequest(response);
+		Stage stage = window();
+		stage.setScene(scene().get());
+		stage.show();
+		stage.requestFocus();
+		return stage;
+	}
+
+	@Subcomponent.Builder
+	interface Builder {
+
+		QuitForcedComponent build();
+	}
+
+}
diff --git a/src/main/java/org/cryptomator/ui/quitforced/QuitForcedController.java b/src/main/java/org/cryptomator/ui/quitforced/QuitForcedController.java
new file mode 100644
index 000000000..60e758991
--- /dev/null
+++ b/src/main/java/org/cryptomator/ui/quitforced/QuitForcedController.java
@@ -0,0 +1,93 @@
+package org.cryptomator.ui.quitforced;
+
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.VaultService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javafx.collections.ObservableList;
+import javafx.concurrent.Task;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ContentDisplay;
+import javafx.stage.Stage;
+import java.awt.desktop.QuitResponse;
+import java.util.Collection;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+@QuitForcedScoped
+public class QuitForcedController implements FxController {
+
+	private static final Logger LOG = LoggerFactory.getLogger(QuitForcedController.class);
+
+	private final Stage window;
+	private final ObservableList<Vault> unlockedVaults;
+	private final ExecutorService executorService;
+	private final VaultService vaultService;
+	private final AtomicReference<QuitResponse> quitResponse = new AtomicReference<>();
+
+	/* FXML */
+	public Button forceLockAndQuitButton;
+
+	@Inject
+	QuitForcedController(@QuitForcedWindow Stage window, ObservableList<Vault> vaults, ExecutorService executorService, VaultService vaultService) {
+		this.window = window;
+		this.unlockedVaults = vaults.filtered(Vault::isUnlocked);
+		this.executorService = executorService;
+		this.vaultService = vaultService;
+		window.setOnCloseRequest(windowEvent -> cancel());
+	}
+
+	public void updateQuitRequest(QuitResponse newResponse) {
+		var oldResponse = quitResponse.getAndSet(newResponse);
+		if (oldResponse != null) {
+			oldResponse.cancelQuit();
+		}
+	}
+
+	private void respondToQuitRequest(Consumer<QuitResponse> action) {
+		var response = quitResponse.getAndSet(null);
+		if (response != null) {
+			action.accept(response);
+		}
+	}
+
+	@FXML
+	public void cancel() {
+		LOG.info("Quitting application canceled by user.");
+		window.close();
+		respondToQuitRequest(QuitResponse::cancelQuit);
+	}
+
+	@FXML
+	public void forceLockAndQuit() {
+		forceLockAndQuitButton.setDisable(true);
+		forceLockAndQuitButton.setContentDisplay(ContentDisplay.LEFT);
+
+		Task<Collection<Vault>> lockAllTask = vaultService.createLockAllTask(unlockedVaults, true); // forced set to true
+		lockAllTask.setOnSucceeded(evt -> {
+			LOG.info("Locked {}", lockAllTask.getValue().stream().map(Vault::getDisplayName).collect(Collectors.joining(", ")));
+			if (unlockedVaults.isEmpty()) {
+				window.close();
+				respondToQuitRequest(QuitResponse::performQuit);
+			}
+		});
+		lockAllTask.setOnFailed(evt -> {
+			//TODO: what will happen if force lock and quit app fails?
+
+			LOG.error("Forced locking failed", lockAllTask.getException());
+			forceLockAndQuitButton.setDisable(false);
+			forceLockAndQuitButton.setContentDisplay(ContentDisplay.TEXT_ONLY);
+
+			window.close();
+			respondToQuitRequest(QuitResponse::cancelQuit);
+		});
+		executorService.execute(lockAllTask);
+	}
+
+}
diff --git a/src/main/java/org/cryptomator/ui/quitforced/QuitForcedModule.java b/src/main/java/org/cryptomator/ui/quitforced/QuitForcedModule.java
new file mode 100644
index 000000000..b46de2cc5
--- /dev/null
+++ b/src/main/java/org/cryptomator/ui/quitforced/QuitForcedModule.java
@@ -0,0 +1,58 @@
+package org.cryptomator.ui.quitforced;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.Provides;
+import dagger.multibindings.IntoMap;
+import org.cryptomator.ui.common.DefaultSceneFactory;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.FxControllerKey;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlLoaderFactory;
+import org.cryptomator.ui.common.FxmlScene;
+import org.cryptomator.ui.common.StageFactory;
+
+import javax.inject.Provider;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+@Module
+abstract class QuitForcedModule {
+
+	@Provides
+	@QuitForcedWindow
+	@QuitForcedScoped
+	static FxmlLoaderFactory provideFxmlLoaderFactory(Map<Class<? extends FxController>, Provider<FxController>> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) {
+		return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle);
+	}
+
+	@Provides
+	@QuitForcedWindow
+	@QuitForcedScoped
+	static Stage provideStage(StageFactory factory, ResourceBundle resourceBundle) {
+		Stage stage = factory.create();
+		stage.setMinWidth(300);
+		stage.setMinHeight(100);
+		stage.initModality(Modality.APPLICATION_MODAL);
+		stage.setTitle(resourceBundle.getString("forcedQuit.title"));
+		return stage;
+	}
+
+	@Provides
+	@FxmlScene(FxmlFile.QUIT_FORCED)
+	@QuitForcedScoped
+	static Scene provideQuitScene(@QuitForcedWindow FxmlLoaderFactory fxmlLoaders) {
+		return fxmlLoaders.createScene(FxmlFile.QUIT_FORCED);
+	}
+
+	// ------------------
+
+	@Binds
+	@IntoMap
+	@FxControllerKey(QuitForcedController.class)
+	abstract FxController bindQuitController(QuitForcedController controller);
+
+}
diff --git a/src/main/java/org/cryptomator/ui/quitforced/QuitForcedScoped.java b/src/main/java/org/cryptomator/ui/quitforced/QuitForcedScoped.java
new file mode 100644
index 000000000..53bbc2209
--- /dev/null
+++ b/src/main/java/org/cryptomator/ui/quitforced/QuitForcedScoped.java
@@ -0,0 +1,13 @@
+package org.cryptomator.ui.quitforced;
+
+import javax.inject.Scope;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Scope
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@interface QuitForcedScoped {
+
+}
diff --git a/src/main/java/org/cryptomator/ui/quitforced/QuitForcedWindow.java b/src/main/java/org/cryptomator/ui/quitforced/QuitForcedWindow.java
new file mode 100644
index 000000000..5026a4a5a
--- /dev/null
+++ b/src/main/java/org/cryptomator/ui/quitforced/QuitForcedWindow.java
@@ -0,0 +1,14 @@
+package org.cryptomator.ui.quitforced;
+
+import javax.inject.Qualifier;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Documented
+@Retention(RUNTIME)
+@interface QuitForcedWindow {
+
+}
diff --git a/src/main/resources/fxml/quit_forced.fxml b/src/main/resources/fxml/quit_forced.fxml
new file mode 100644
index 000000000..26f5e9251
--- /dev/null
+++ b/src/main/resources/fxml/quit_forced.fxml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
+<?import org.cryptomator.ui.controls.FontAwesome5Spinner?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.shape.Circle?>
+<?import javafx.scene.Group?>
+<?import javafx.scene.layout.Region?>
+<HBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
+	  fx:controller="org.cryptomator.ui.quitforced.QuitForcedController"
+	  minWidth="400"
+	  maxWidth="400"
+	  minHeight="145"
+	  spacing="12"
+	  alignment="TOP_LEFT">
+	<padding>
+		<Insets topRightBottomLeft="12"/>
+	</padding>
+	<children>
+		<Group>
+			<StackPane>
+				<padding>
+					<Insets topRightBottomLeft="6"/>
+				</padding>
+				<Circle styleClass="glyph-icon-orange" radius="24"/>
+				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="EXCLAMATION" glyphSize="24"/>
+			</StackPane>
+		</Group>
+
+		<VBox HBox.hgrow="ALWAYS">
+			<Label styleClass="label-large" text="%forcedQuit.message" wrapText="true" textAlignment="LEFT">
+				<padding>
+					<Insets bottom="6" top="6"/>
+				</padding>
+			</Label>
+
+			<Label text="%forcedQuit.description" wrapText="true" textAlignment="LEFT"/>
+
+			<Region VBox.vgrow="ALWAYS" minHeight="18"/>
+			<ButtonBar buttonMinWidth="120" buttonOrder="+CI">
+				<buttons>
+					<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" defaultButton="true" cancelButton="true" onAction="#cancel"/>
+					<Button fx:id="forceLockAndQuitButton" text="%forcedQuit.forceLockAndQuitBtn" ButtonBar.buttonData="FINISH" onAction="#forceLockAndQuit" contentDisplay="TEXT_ONLY">
+						<graphic>
+							<FontAwesome5Spinner glyphSize="12"/>
+						</graphic>
+					</Button>
+				</buttons>
+			</ButtonBar>
+		</VBox>
+	</children>
+</HBox>
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index 8642be287..166e9b892 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -382,4 +382,10 @@ passwordStrength.messageLabel.4=Very strong
 
 # Quit
 quit.prompt=Quit application? There are unlocked vaults.
-quit.lockAndQuit=Lock and Quit
\ No newline at end of file
+quit.lockAndQuit=Lock and Quit
+
+# Forced Quit
+forcedQuit.title=Quit application
+forcedQuit.message=Some vaults could not be locked
+forcedQuit.description=Locking vaults was blocked by pending operations or open files. You can force lock remaining vaults, however interrupting I/O may result in the loss of unsaved data.
+forcedQuit.forceLockAndQuitBtn=Force and Quit

From e640e36744f5bc3ae5ea404333940921b95c2f45 Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Wed, 29 Jun 2022 15:27:19 +0200
Subject: [PATCH 06/10] show forced dialog if normal lock and quit fails in
 quit dialog

---
 .../java/org/cryptomator/ui/quit/QuitController.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/quit/QuitController.java b/src/main/java/org/cryptomator/ui/quit/QuitController.java
index 207ae42c8..22a9f0e70 100644
--- a/src/main/java/org/cryptomator/ui/quit/QuitController.java
+++ b/src/main/java/org/cryptomator/ui/quit/QuitController.java
@@ -3,6 +3,7 @@ package org.cryptomator.ui.quit;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.VaultService;
+import org.cryptomator.ui.fxapp.FxApplicationWindows;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,16 +31,17 @@ public class QuitController implements FxController {
 	private final ExecutorService executorService;
 	private final VaultService vaultService;
 	private final AtomicReference<QuitResponse> quitResponse = new AtomicReference<>();
-
+	private final FxApplicationWindows appWindows;
 	/* FXML */
 	public Button lockAndQuitButton;
 
 	@Inject
-	QuitController(@QuitWindow Stage window, ObservableList<Vault> vaults, ExecutorService executorService, VaultService vaultService) {
+	QuitController(@QuitWindow Stage window, ObservableList<Vault> vaults, ExecutorService executorService, VaultService vaultService, FxApplicationWindows appWindows) {
 		this.window = window;
 		this.unlockedVaults = vaults.filtered(Vault::isUnlocked);
 		this.executorService = executorService;
 		this.vaultService = vaultService;
+		this.appWindows = appWindows;
 		window.setOnCloseRequest(windowEvent -> cancel());
 	}
 
@@ -81,9 +83,8 @@ public class QuitController implements FxController {
 			LOG.warn("Locking failed", lockAllTask.getException());
 			lockAndQuitButton.setDisable(false);
 			lockAndQuitButton.setContentDisplay(ContentDisplay.TEXT_ONLY);
-			// TODO: show force lock or force quit scene (and DO NOT cancelQuit() here!) (see https://github.com/cryptomator/cryptomator/pull/1416)
+			appWindows.showQuitForcedWindow(quitResponse.get());
 			window.close();
-			respondToQuitRequest(QuitResponse::cancelQuit);
 		});
 		executorService.execute(lockAllTask);
 	}

From b791df01f70f89122e524745f06dd45f4fc0bef3 Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Thu, 30 Jun 2022 15:41:33 +0200
Subject: [PATCH 07/10] removed quitforced package, moved QuitForcedController
 into quit package and deleted not required files

---
 src/main/java/module-info.java                |  1 -
 .../ui/fxapp/FxApplicationModule.java         | 10 +---
 .../ui/fxapp/FxApplicationTerminator.java     |  4 +-
 .../ui/fxapp/FxApplicationWindows.java        | 21 ++++---
 .../cryptomator/ui/quit/QuitComponent.java    | 24 +++++---
 .../cryptomator/ui/quit/QuitController.java   |  2 +-
 .../QuitForcedController.java                 |  5 +-
 .../org/cryptomator/ui/quit/QuitModule.java   | 13 +++++
 .../ui/quitforced/QuitForcedComponent.java    | 44 --------------
 .../ui/quitforced/QuitForcedModule.java       | 58 -------------------
 .../ui/quitforced/QuitForcedScoped.java       | 13 -----
 .../ui/quitforced/QuitForcedWindow.java       | 14 -----
 src/main/resources/fxml/quit_forced.fxml      |  2 +-
 13 files changed, 49 insertions(+), 162 deletions(-)
 rename src/main/java/org/cryptomator/ui/{quitforced => quit}/QuitForcedController.java (93%)
 delete mode 100644 src/main/java/org/cryptomator/ui/quitforced/QuitForcedComponent.java
 delete mode 100644 src/main/java/org/cryptomator/ui/quitforced/QuitForcedModule.java
 delete mode 100644 src/main/java/org/cryptomator/ui/quitforced/QuitForcedScoped.java
 delete mode 100644 src/main/java/org/cryptomator/ui/quitforced/QuitForcedWindow.java

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 0d2c141b7..dd3d7680b 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -51,7 +51,6 @@ module org.cryptomator.desktop {
 	opens org.cryptomator.ui.migration to javafx.fxml;
 	opens org.cryptomator.ui.preferences to javafx.fxml;
 	opens org.cryptomator.ui.quit to javafx.fxml;
-	opens org.cryptomator.ui.quitforced to javafx.fxml;
 	opens org.cryptomator.ui.recoverykey to javafx.fxml;
 	opens org.cryptomator.ui.removevault to javafx.fxml;
 	opens org.cryptomator.ui.stats to javafx.fxml;
diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
index 007e62fd6..81429181a 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
@@ -14,7 +14,7 @@ import org.cryptomator.ui.lock.LockComponent;
 import org.cryptomator.ui.mainwindow.MainWindowComponent;
 import org.cryptomator.ui.preferences.PreferencesComponent;
 import org.cryptomator.ui.quit.QuitComponent;
-import org.cryptomator.ui.quitforced.QuitForcedComponent;
+
 import org.cryptomator.ui.traymenu.TrayMenuComponent;
 import org.cryptomator.ui.unlock.UnlockComponent;
 
@@ -26,7 +26,7 @@ import java.io.UncheckedIOException;
 import java.util.Collections;
 import java.util.List;
 
-@Module(includes = {UpdateCheckerModule.class}, subcomponents = {TrayMenuComponent.class, MainWindowComponent.class, PreferencesComponent.class, UnlockComponent.class, LockComponent.class, QuitComponent.class, QuitForcedComponent.class, ErrorComponent.class})
+@Module(includes = {UpdateCheckerModule.class}, subcomponents = {TrayMenuComponent.class, MainWindowComponent.class, PreferencesComponent.class, UnlockComponent.class, LockComponent.class, QuitComponent.class, ErrorComponent.class})
 abstract class FxApplicationModule {
 
 	private static Image createImageFromResource(String resourceName) throws IOException {
@@ -59,9 +59,5 @@ abstract class FxApplicationModule {
 		return builder.build();
 	}
 
-	@Provides
-	@FxApplicationScoped
-	static QuitForcedComponent provideQuitForcedComponent(QuitForcedComponent.Builder builder) {
-		return builder.build();
-	}
+
 }
diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java
index b38bd0d06..569a3674a 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java
@@ -115,11 +115,11 @@ public class FxApplicationTerminator {
 			});
 			lockAllTask.setOnFailed(event -> {
 				LOG.warn("Unable to lock all vaults.");
-				appWindows.showQuitForcedWindow(exitingResponse);
+				appWindows.showQuitWindow(exitingResponse, true);
 			});
 			lockAllTask.run();
 		} else {
-			appWindows.showQuitWindow(exitingResponse);
+			appWindows.showQuitWindow(exitingResponse, false);
 		}
 	}
 
diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java
index d80cb6c5b..fa4662ad5 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java
@@ -11,7 +11,7 @@ import org.cryptomator.ui.mainwindow.MainWindowComponent;
 import org.cryptomator.ui.preferences.PreferencesComponent;
 import org.cryptomator.ui.preferences.SelectedPreferencesTab;
 import org.cryptomator.ui.quit.QuitComponent;
-import org.cryptomator.ui.quitforced.QuitForcedComponent;
+
 import org.cryptomator.ui.unlock.UnlockComponent;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -41,8 +41,10 @@ public class FxApplicationWindows {
 	private final Optional<TrayIntegrationProvider> trayIntegration;
 	private final Lazy<MainWindowComponent> mainWindow;
 	private final Lazy<PreferencesComponent> preferencesWindow;
-	private final Lazy<QuitComponent> quitWindow;
-	private final Lazy<QuitForcedComponent> quitForcedWindow;
+
+
+	private final QuitComponent.Builder quitWindowBuilder;
+
 	private final UnlockComponent.Factory unlockWorkflowFactory;
 	private final LockComponent.Factory lockWorkflowFactory;
 	private final ErrorComponent.Factory errorWindowFactory;
@@ -50,13 +52,13 @@ public class FxApplicationWindows {
 	private final FilteredList<Window> visibleWindows;
 
 	@Inject
-	public FxApplicationWindows(@PrimaryStage Stage primaryStage, Optional<TrayIntegrationProvider> trayIntegration, Lazy<MainWindowComponent> mainWindow, Lazy<PreferencesComponent> preferencesWindow, Lazy<QuitComponent> quitWindow, Lazy<QuitForcedComponent> quitForcedWindow, UnlockComponent.Factory unlockWorkflowFactory, LockComponent.Factory lockWorkflowFactory, ErrorComponent.Factory errorWindowFactory, ExecutorService executor) {
+	public FxApplicationWindows(@PrimaryStage Stage primaryStage, Optional<TrayIntegrationProvider> trayIntegration, Lazy<MainWindowComponent> mainWindow, Lazy<PreferencesComponent> preferencesWindow, QuitComponent.Builder quitWindowBuilder, UnlockComponent.Factory unlockWorkflowFactory, LockComponent.Factory lockWorkflowFactory, ErrorComponent.Factory errorWindowFactory, ExecutorService executor) {
 		this.primaryStage = primaryStage;
 		this.trayIntegration = trayIntegration;
 		this.mainWindow = mainWindow;
 		this.preferencesWindow = preferencesWindow;
-		this.quitWindow = quitWindow;
-		this.quitForcedWindow = quitForcedWindow;
+
+		this.quitWindowBuilder = quitWindowBuilder;
 		this.unlockWorkflowFactory = unlockWorkflowFactory;
 		this.lockWorkflowFactory = lockWorkflowFactory;
 		this.errorWindowFactory = errorWindowFactory;
@@ -107,13 +109,10 @@ public class FxApplicationWindows {
 		return CompletableFuture.supplyAsync(() -> preferencesWindow.get().showPreferencesWindow(selectedTab), Platform::runLater).whenComplete(this::reportErrors);
 	}
 
-	public CompletionStage<Stage> showQuitWindow(QuitResponse response) {
-		return CompletableFuture.supplyAsync(() -> quitWindow.get().showQuitWindow(response), Platform::runLater).whenComplete(this::reportErrors);
+	public void showQuitWindow(QuitResponse response, boolean forced) {
+			CompletableFuture.runAsync(() -> quitWindowBuilder.build().showQuitWindow(response,forced), Platform::runLater);
 	}
 
-	public CompletionStage<Stage> showQuitForcedWindow(QuitResponse response) {
-		return CompletableFuture.supplyAsync(() -> quitForcedWindow.get().showQuitForcedWindow(response), Platform::runLater).whenComplete(this::reportErrors);
-	}
 
 	public CompletionStage<Void> startUnlockWorkflow(Vault vault, @Nullable Stage owner) {
 		return CompletableFuture.supplyAsync(() -> {
diff --git a/src/main/java/org/cryptomator/ui/quit/QuitComponent.java b/src/main/java/org/cryptomator/ui/quit/QuitComponent.java
index e100c52e9..be3d7123f 100644
--- a/src/main/java/org/cryptomator/ui/quit/QuitComponent.java
+++ b/src/main/java/org/cryptomator/ui/quit/QuitComponent.java
@@ -22,23 +22,33 @@ public interface QuitComponent {
 	Stage window();
 
 	@FxmlScene(FxmlFile.QUIT)
-	Lazy<Scene> scene();
+	Lazy<Scene> quitScene();
 
-	QuitController controller();
+	@FxmlScene(FxmlFile.QUIT_FORCED)
+	Lazy<Scene> quitForcedScene();
 
-	default Stage showQuitWindow(QuitResponse response) {
-		controller().updateQuitRequest(response);
+	QuitController quitController();
+	QuitForcedController quitForcedController();
+
+	default void showQuitWindow(QuitResponse response, boolean forced) {
 		Stage stage = window();
-		stage.setScene(scene().get());
+		if(forced){
+			quitForcedController().updateQuitRequest(response);
+			stage.setScene(quitForcedScene().get());
+		} else{
+			quitController().updateQuitRequest(response);
+			stage.setScene(quitScene().get());
+		}
+		stage.sizeToScene();
 		stage.show();
-		stage.requestFocus();
-		return stage;
 	}
 
 	@Subcomponent.Builder
 	interface Builder {
 
 		QuitComponent build();
+
+
 	}
 
 }
diff --git a/src/main/java/org/cryptomator/ui/quit/QuitController.java b/src/main/java/org/cryptomator/ui/quit/QuitController.java
index 22a9f0e70..e389f1645 100644
--- a/src/main/java/org/cryptomator/ui/quit/QuitController.java
+++ b/src/main/java/org/cryptomator/ui/quit/QuitController.java
@@ -83,7 +83,7 @@ public class QuitController implements FxController {
 			LOG.warn("Locking failed", lockAllTask.getException());
 			lockAndQuitButton.setDisable(false);
 			lockAndQuitButton.setContentDisplay(ContentDisplay.TEXT_ONLY);
-			appWindows.showQuitForcedWindow(quitResponse.get());
+			appWindows.showQuitWindow(quitResponse.get(),true);
 			window.close();
 		});
 		executorService.execute(lockAllTask);
diff --git a/src/main/java/org/cryptomator/ui/quitforced/QuitForcedController.java b/src/main/java/org/cryptomator/ui/quit/QuitForcedController.java
similarity index 93%
rename from src/main/java/org/cryptomator/ui/quitforced/QuitForcedController.java
rename to src/main/java/org/cryptomator/ui/quit/QuitForcedController.java
index 60e758991..f1474c366 100644
--- a/src/main/java/org/cryptomator/ui/quitforced/QuitForcedController.java
+++ b/src/main/java/org/cryptomator/ui/quit/QuitForcedController.java
@@ -1,4 +1,4 @@
-package org.cryptomator.ui.quitforced;
+package org.cryptomator.ui.quit;
 
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
@@ -20,7 +20,6 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-@QuitForcedScoped
 public class QuitForcedController implements FxController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(QuitForcedController.class);
@@ -35,7 +34,7 @@ public class QuitForcedController implements FxController {
 	public Button forceLockAndQuitButton;
 
 	@Inject
-	QuitForcedController(@QuitForcedWindow Stage window, ObservableList<Vault> vaults, ExecutorService executorService, VaultService vaultService) {
+	QuitForcedController(@QuitWindow Stage window, ObservableList<Vault> vaults, ExecutorService executorService, VaultService vaultService) {
 		this.window = window;
 		this.unlockedVaults = vaults.filtered(Vault::isUnlocked);
 		this.executorService = executorService;
diff --git a/src/main/java/org/cryptomator/ui/quit/QuitModule.java b/src/main/java/org/cryptomator/ui/quit/QuitModule.java
index a1dc581ed..e737799c6 100644
--- a/src/main/java/org/cryptomator/ui/quit/QuitModule.java
+++ b/src/main/java/org/cryptomator/ui/quit/QuitModule.java
@@ -48,6 +48,14 @@ abstract class QuitModule {
 		return fxmlLoaders.createScene(FxmlFile.QUIT);
 	}
 
+	@Provides
+	@FxmlScene(FxmlFile.QUIT_FORCED)
+	@QuitScoped
+	static Scene provideQuitForcedScene(@QuitWindow FxmlLoaderFactory fxmlLoaders) {
+		return fxmlLoaders.createScene(FxmlFile.QUIT_FORCED);
+	}
+
+
 	// ------------------
 
 	@Binds
@@ -55,4 +63,9 @@ abstract class QuitModule {
 	@FxControllerKey(QuitController.class)
 	abstract FxController bindQuitController(QuitController controller);
 
+	@Binds
+	@IntoMap
+	@FxControllerKey(QuitForcedController.class)
+	abstract FxController bindQuitForcedController(QuitForcedController controller);
+
 }
diff --git a/src/main/java/org/cryptomator/ui/quitforced/QuitForcedComponent.java b/src/main/java/org/cryptomator/ui/quitforced/QuitForcedComponent.java
deleted file mode 100644
index 0a6ba5fb2..000000000
--- a/src/main/java/org/cryptomator/ui/quitforced/QuitForcedComponent.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the accompanying LICENSE file.
- *******************************************************************************/
-package org.cryptomator.ui.quitforced;
-
-import dagger.Lazy;
-import dagger.Subcomponent;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlScene;
-
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-import java.awt.desktop.QuitResponse;
-
-@QuitForcedScoped
-@Subcomponent(modules = {QuitForcedModule.class})
-public interface QuitForcedComponent {
-
-	@QuitForcedWindow
-	Stage window();
-
-	@FxmlScene(FxmlFile.QUIT_FORCED)
-	Lazy<Scene> scene();
-
-	QuitForcedController controller();
-
-	default Stage showQuitForcedWindow(QuitResponse response) {
-		controller().updateQuitRequest(response);
-		Stage stage = window();
-		stage.setScene(scene().get());
-		stage.show();
-		stage.requestFocus();
-		return stage;
-	}
-
-	@Subcomponent.Builder
-	interface Builder {
-
-		QuitForcedComponent build();
-	}
-
-}
diff --git a/src/main/java/org/cryptomator/ui/quitforced/QuitForcedModule.java b/src/main/java/org/cryptomator/ui/quitforced/QuitForcedModule.java
deleted file mode 100644
index dbc311339..000000000
--- a/src/main/java/org/cryptomator/ui/quitforced/QuitForcedModule.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.cryptomator.ui.quitforced;
-
-import dagger.Binds;
-import dagger.Module;
-import dagger.Provides;
-import dagger.multibindings.IntoMap;
-import org.cryptomator.ui.common.DefaultSceneFactory;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.FxControllerKey;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlLoaderFactory;
-import org.cryptomator.ui.common.FxmlScene;
-import org.cryptomator.ui.common.StageFactory;
-
-import javax.inject.Provider;
-import javafx.scene.Scene;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-@Module
-abstract class QuitForcedModule {
-
-	@Provides
-	@QuitForcedWindow
-	@QuitForcedScoped
-	static FxmlLoaderFactory provideFxmlLoaderFactory(Map<Class<? extends FxController>, Provider<FxController>> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) {
-		return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle);
-	}
-
-	@Provides
-	@QuitForcedWindow
-	@QuitForcedScoped
-	static Stage provideStage(StageFactory factory, ResourceBundle resourceBundle) {
-		Stage stage = factory.create();
-		stage.setMinWidth(300);
-		stage.setMinHeight(100);
-		stage.initModality(Modality.APPLICATION_MODAL);
-		stage.setTitle(resourceBundle.getString("quit.title"));
-		return stage;
-	}
-
-	@Provides
-	@FxmlScene(FxmlFile.QUIT_FORCED)
-	@QuitForcedScoped
-	static Scene provideQuitScene(@QuitForcedWindow FxmlLoaderFactory fxmlLoaders) {
-		return fxmlLoaders.createScene(FxmlFile.QUIT_FORCED);
-	}
-
-	// ------------------
-
-	@Binds
-	@IntoMap
-	@FxControllerKey(QuitForcedController.class)
-	abstract FxController bindQuitController(QuitForcedController controller);
-
-}
diff --git a/src/main/java/org/cryptomator/ui/quitforced/QuitForcedScoped.java b/src/main/java/org/cryptomator/ui/quitforced/QuitForcedScoped.java
deleted file mode 100644
index 53bbc2209..000000000
--- a/src/main/java/org/cryptomator/ui/quitforced/QuitForcedScoped.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.cryptomator.ui.quitforced;
-
-import javax.inject.Scope;
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-@Scope
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@interface QuitForcedScoped {
-
-}
diff --git a/src/main/java/org/cryptomator/ui/quitforced/QuitForcedWindow.java b/src/main/java/org/cryptomator/ui/quitforced/QuitForcedWindow.java
deleted file mode 100644
index 5026a4a5a..000000000
--- a/src/main/java/org/cryptomator/ui/quitforced/QuitForcedWindow.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.cryptomator.ui.quitforced;
-
-import javax.inject.Qualifier;
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Qualifier
-@Documented
-@Retention(RUNTIME)
-@interface QuitForcedWindow {
-
-}
diff --git a/src/main/resources/fxml/quit_forced.fxml b/src/main/resources/fxml/quit_forced.fxml
index dbc7bcc23..d2e831d4d 100644
--- a/src/main/resources/fxml/quit_forced.fxml
+++ b/src/main/resources/fxml/quit_forced.fxml
@@ -14,7 +14,7 @@
 <?import javafx.scene.layout.Region?>
 <HBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
-	  fx:controller="org.cryptomator.ui.quitforced.QuitForcedController"
+	  fx:controller="org.cryptomator.ui.quit.QuitForcedController"
 	  minWidth="400"
 	  maxWidth="400"
 	  minHeight="145"

From 683276a6c609f940aec48246cd8c3b8f169f17bd Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Tue, 5 Jul 2022 14:22:05 +0200
Subject: [PATCH 08/10] switch scene in quitDialog to quitForcedDialog instead
 of init new window

---
 .../cryptomator/ui/quit/QuitComponent.java    | 14 +++++--------
 .../cryptomator/ui/quit/QuitController.java   | 21 +++++++++++--------
 .../ui/quit/QuitForcedController.java         |  7 ++++---
 .../org/cryptomator/ui/quit/QuitModule.java   | 10 +++++++++
 4 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/quit/QuitComponent.java b/src/main/java/org/cryptomator/ui/quit/QuitComponent.java
index be3d7123f..801aece51 100644
--- a/src/main/java/org/cryptomator/ui/quit/QuitComponent.java
+++ b/src/main/java/org/cryptomator/ui/quit/QuitComponent.java
@@ -13,6 +13,7 @@ import org.cryptomator.ui.common.FxmlScene;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 import java.awt.desktop.QuitResponse;
+import java.util.concurrent.atomic.AtomicReference;
 
 @QuitScoped
 @Subcomponent(modules = {QuitModule.class})
@@ -27,16 +28,15 @@ public interface QuitComponent {
 	@FxmlScene(FxmlFile.QUIT_FORCED)
 	Lazy<Scene> quitForcedScene();
 
-	QuitController quitController();
-	QuitForcedController quitForcedController();
+	@QuitWindow
+	AtomicReference<QuitResponse> quitResponse();
 
 	default void showQuitWindow(QuitResponse response, boolean forced) {
 		Stage stage = window();
+		quitResponse().set(response);
 		if(forced){
-			quitForcedController().updateQuitRequest(response);
 			stage.setScene(quitForcedScene().get());
 		} else{
-			quitController().updateQuitRequest(response);
 			stage.setScene(quitScene().get());
 		}
 		stage.sizeToScene();
@@ -45,10 +45,6 @@ public interface QuitComponent {
 
 	@Subcomponent.Builder
 	interface Builder {
-
 		QuitComponent build();
-
-
 	}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/cryptomator/ui/quit/QuitController.java b/src/main/java/org/cryptomator/ui/quit/QuitController.java
index e389f1645..5ae54f1f5 100644
--- a/src/main/java/org/cryptomator/ui/quit/QuitController.java
+++ b/src/main/java/org/cryptomator/ui/quit/QuitController.java
@@ -1,9 +1,11 @@
 package org.cryptomator.ui.quit;
 
+import dagger.Lazy;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
 import org.cryptomator.ui.common.VaultService;
-import org.cryptomator.ui.fxapp.FxApplicationWindows;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -11,6 +13,7 @@ import javax.inject.Inject;
 import javafx.collections.ObservableList;
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
+import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.ContentDisplay;
 import javafx.stage.Stage;
@@ -30,18 +33,20 @@ public class QuitController implements FxController {
 	private final ObservableList<Vault> unlockedVaults;
 	private final ExecutorService executorService;
 	private final VaultService vaultService;
-	private final AtomicReference<QuitResponse> quitResponse = new AtomicReference<>();
-	private final FxApplicationWindows appWindows;
+	private final AtomicReference<QuitResponse> quitResponse;
 	/* FXML */
 	public Button lockAndQuitButton;
 
+	private final Lazy<Scene> quitForcedScene;
+
 	@Inject
-	QuitController(@QuitWindow Stage window, ObservableList<Vault> vaults, ExecutorService executorService, VaultService vaultService, FxApplicationWindows appWindows) {
+	QuitController(@QuitWindow Stage window, ObservableList<Vault> vaults, ExecutorService executorService, VaultService vaultService, @FxmlScene(FxmlFile.QUIT_FORCED) Lazy<Scene> quitForcedScene, @QuitWindow AtomicReference<QuitResponse> quitResponse) {
 		this.window = window;
 		this.unlockedVaults = vaults.filtered(Vault::isUnlocked);
 		this.executorService = executorService;
 		this.vaultService = vaultService;
-		this.appWindows = appWindows;
+		this.quitForcedScene = quitForcedScene;
+		this.quitResponse = quitResponse;
 		window.setOnCloseRequest(windowEvent -> cancel());
 	}
 
@@ -83,10 +88,8 @@ public class QuitController implements FxController {
 			LOG.warn("Locking failed", lockAllTask.getException());
 			lockAndQuitButton.setDisable(false);
 			lockAndQuitButton.setContentDisplay(ContentDisplay.TEXT_ONLY);
-			appWindows.showQuitWindow(quitResponse.get(),true);
-			window.close();
+			window.setScene(quitForcedScene.get());
 		});
 		executorService.execute(lockAllTask);
 	}
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/cryptomator/ui/quit/QuitForcedController.java b/src/main/java/org/cryptomator/ui/quit/QuitForcedController.java
index f1474c366..8dd4140ac 100644
--- a/src/main/java/org/cryptomator/ui/quit/QuitForcedController.java
+++ b/src/main/java/org/cryptomator/ui/quit/QuitForcedController.java
@@ -28,17 +28,18 @@ public class QuitForcedController implements FxController {
 	private final ObservableList<Vault> unlockedVaults;
 	private final ExecutorService executorService;
 	private final VaultService vaultService;
-	private final AtomicReference<QuitResponse> quitResponse = new AtomicReference<>();
+	private final AtomicReference<QuitResponse> quitResponse;
 
 	/* FXML */
 	public Button forceLockAndQuitButton;
 
 	@Inject
-	QuitForcedController(@QuitWindow Stage window, ObservableList<Vault> vaults, ExecutorService executorService, VaultService vaultService) {
+	QuitForcedController(@QuitWindow Stage window, ObservableList<Vault> vaults, ExecutorService executorService, VaultService vaultService, @QuitWindow AtomicReference<QuitResponse> quitResponse) {
 		this.window = window;
 		this.unlockedVaults = vaults.filtered(Vault::isUnlocked);
 		this.executorService = executorService;
 		this.vaultService = vaultService;
+		this.quitResponse = quitResponse;
 		window.setOnCloseRequest(windowEvent -> cancel());
 	}
 
@@ -58,7 +59,7 @@ public class QuitForcedController implements FxController {
 
 	@FXML
 	public void cancel() {
-		LOG.info("Quitting application canceled by user.");
+		LOG.info("Quitting application forced canceled by user.");
 		window.close();
 		respondToQuitRequest(QuitResponse::cancelQuit);
 	}
diff --git a/src/main/java/org/cryptomator/ui/quit/QuitModule.java b/src/main/java/org/cryptomator/ui/quit/QuitModule.java
index e737799c6..f6615b321 100644
--- a/src/main/java/org/cryptomator/ui/quit/QuitModule.java
+++ b/src/main/java/org/cryptomator/ui/quit/QuitModule.java
@@ -16,8 +16,10 @@ import javax.inject.Provider;
 import javafx.scene.Scene;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
+import java.awt.desktop.QuitResponse;
 import java.util.Map;
 import java.util.ResourceBundle;
+import java.util.concurrent.atomic.AtomicReference;
 
 @Module
 abstract class QuitModule {
@@ -41,6 +43,14 @@ abstract class QuitModule {
 		return stage;
 	}
 
+	@Provides
+	@QuitWindow
+	@QuitScoped
+	static AtomicReference<QuitResponse> provideQuitResponse() {
+		return new AtomicReference<QuitResponse>();
+	}
+
+
 	@Provides
 	@FxmlScene(FxmlFile.QUIT)
 	@QuitScoped

From 9e18215d106bc2241392f5962a6cafffd0604bc6 Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Tue, 5 Jul 2022 16:17:42 +0200
Subject: [PATCH 09/10] removed unused method, del .idea/uiDesigner.xml and
 code cleanup

---
 .idea/uiDesigner.xml                          | 124 ------------------
 .../ui/fxapp/FxApplicationModule.java         |   4 +-
 .../ui/fxapp/FxApplicationWindows.java        |   6 -
 .../GeneralPreferencesController.java         |   3 -
 .../cryptomator/ui/quit/QuitController.java   |   3 +-
 .../ui/quit/QuitForcedController.java         |   7 -
 6 files changed, 2 insertions(+), 145 deletions(-)
 delete mode 100644 .idea/uiDesigner.xml

diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index e96534fb2..000000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
index 81429181a..cdeb764be 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
@@ -58,6 +58,4 @@ abstract class FxApplicationModule {
 	static QuitComponent provideQuitComponent(QuitComponent.Builder builder) {
 		return builder.build();
 	}
-
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java
index fa4662ad5..5d38a9017 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationWindows.java
@@ -11,7 +11,6 @@ import org.cryptomator.ui.mainwindow.MainWindowComponent;
 import org.cryptomator.ui.preferences.PreferencesComponent;
 import org.cryptomator.ui.preferences.SelectedPreferencesTab;
 import org.cryptomator.ui.quit.QuitComponent;
-
 import org.cryptomator.ui.unlock.UnlockComponent;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -41,10 +40,7 @@ public class FxApplicationWindows {
 	private final Optional<TrayIntegrationProvider> trayIntegration;
 	private final Lazy<MainWindowComponent> mainWindow;
 	private final Lazy<PreferencesComponent> preferencesWindow;
-
-
 	private final QuitComponent.Builder quitWindowBuilder;
-
 	private final UnlockComponent.Factory unlockWorkflowFactory;
 	private final LockComponent.Factory lockWorkflowFactory;
 	private final ErrorComponent.Factory errorWindowFactory;
@@ -57,7 +53,6 @@ public class FxApplicationWindows {
 		this.trayIntegration = trayIntegration;
 		this.mainWindow = mainWindow;
 		this.preferencesWindow = preferencesWindow;
-
 		this.quitWindowBuilder = quitWindowBuilder;
 		this.unlockWorkflowFactory = unlockWorkflowFactory;
 		this.lockWorkflowFactory = lockWorkflowFactory;
@@ -113,7 +108,6 @@ public class FxApplicationWindows {
 			CompletableFuture.runAsync(() -> quitWindowBuilder.build().showQuitWindow(response,forced), Platform::runLater);
 	}
 
-
 	public CompletionStage<Void> startUnlockWorkflow(Vault vault, @Nullable Stage owner) {
 		return CompletableFuture.supplyAsync(() -> {
 					Preconditions.checkState(vault.stateProperty().transition(VaultState.Value.LOCKED, VaultState.Value.PROCESSING), "Vault not locked.");
diff --git a/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
index f35f17f27..ace6dadca 100644
--- a/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
+++ b/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
@@ -55,11 +55,8 @@ public class GeneralPreferencesController implements FxController {
 	@FXML
 	public void initialize() {
 		startHiddenCheckbox.selectedProperty().bindBidirectional(settings.startHidden());
-
 		autoCloseVaultsCheckbox.selectedProperty().bindBidirectional(settings.autoCloseVaults());
-
 		debugModeCheckbox.selectedProperty().bindBidirectional(settings.debugMode());
-
 		autoStartProvider.ifPresent(autoStart -> autoStartCheckbox.setSelected(autoStart.isEnabled()));
 
 		var keychainSettingsConverter = new KeychainProviderClassNameConverter(keychainAccessProviders);
diff --git a/src/main/java/org/cryptomator/ui/quit/QuitController.java b/src/main/java/org/cryptomator/ui/quit/QuitController.java
index 5ae54f1f5..787ac23dc 100644
--- a/src/main/java/org/cryptomator/ui/quit/QuitController.java
+++ b/src/main/java/org/cryptomator/ui/quit/QuitController.java
@@ -34,11 +34,10 @@ public class QuitController implements FxController {
 	private final ExecutorService executorService;
 	private final VaultService vaultService;
 	private final AtomicReference<QuitResponse> quitResponse;
+	private final Lazy<Scene> quitForcedScene;
 	/* FXML */
 	public Button lockAndQuitButton;
 
-	private final Lazy<Scene> quitForcedScene;
-
 	@Inject
 	QuitController(@QuitWindow Stage window, ObservableList<Vault> vaults, ExecutorService executorService, VaultService vaultService, @FxmlScene(FxmlFile.QUIT_FORCED) Lazy<Scene> quitForcedScene, @QuitWindow AtomicReference<QuitResponse> quitResponse) {
 		this.window = window;
diff --git a/src/main/java/org/cryptomator/ui/quit/QuitForcedController.java b/src/main/java/org/cryptomator/ui/quit/QuitForcedController.java
index 8dd4140ac..64e99d39c 100644
--- a/src/main/java/org/cryptomator/ui/quit/QuitForcedController.java
+++ b/src/main/java/org/cryptomator/ui/quit/QuitForcedController.java
@@ -43,13 +43,6 @@ public class QuitForcedController implements FxController {
 		window.setOnCloseRequest(windowEvent -> cancel());
 	}
 
-	public void updateQuitRequest(QuitResponse newResponse) {
-		var oldResponse = quitResponse.getAndSet(newResponse);
-		if (oldResponse != null) {
-			oldResponse.cancelQuit();
-		}
-	}
-
 	private void respondToQuitRequest(Consumer<QuitResponse> action) {
 		var response = quitResponse.getAndSet(null);
 		if (response != null) {

From 29d0e258f1e6dc4c0875f4eb11febd8abb5130cd Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Tue, 5 Jul 2022 16:30:32 +0200
Subject: [PATCH 10/10] deleted unused and unnecessary code in QuitController

---
 .../java/org/cryptomator/ui/quit/QuitController.java     | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/quit/QuitController.java b/src/main/java/org/cryptomator/ui/quit/QuitController.java
index 787ac23dc..7a53f5b93 100644
--- a/src/main/java/org/cryptomator/ui/quit/QuitController.java
+++ b/src/main/java/org/cryptomator/ui/quit/QuitController.java
@@ -49,13 +49,6 @@ public class QuitController implements FxController {
 		window.setOnCloseRequest(windowEvent -> cancel());
 	}
 
-	public void updateQuitRequest(QuitResponse newResponse) {
-		var oldResponse = quitResponse.getAndSet(newResponse);
-		if (oldResponse != null) {
-			oldResponse.cancelQuit();
-		}
-	}
-
 	private void respondToQuitRequest(Consumer<QuitResponse> action) {
 		var response = quitResponse.getAndSet(null);
 		if (response != null) {
@@ -85,8 +78,6 @@ public class QuitController implements FxController {
 		});
 		lockAllTask.setOnFailed(evt -> {
 			LOG.warn("Locking failed", lockAllTask.getException());
-			lockAndQuitButton.setDisable(false);
-			lockAndQuitButton.setContentDisplay(ContentDisplay.TEXT_ONLY);
 			window.setScene(quitForcedScene.get());
 		});
 		executorService.execute(lockAllTask);