From 497e5ce73f1054983c9979f1810b88bb6bac6936 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 31 Mar 2021 11:37:55 +0200
Subject: [PATCH 01/67] Add health check window

---
 .../org/cryptomator/ui/common/FxmlFile.java   |  1 +
 .../ui/health/HealthCheckComponent.java       | 39 +++++++++++++
 .../ui/health/HealthCheckModule.java          | 57 +++++++++++++++++++
 .../ui/health/HealthCheckScoped.java          | 13 +++++
 .../ui/health/HealthCheckWindow.java          | 14 +++++
 .../ui/health/StartController.java            | 40 +++++++++++++
 .../ui/mainwindow/MainWindowModule.java       |  3 +-
 .../VaultDetailLockedController.java          | 11 +++-
 .../src/main/resources/fxml/health_start.fxml | 28 +++++++++
 .../resources/fxml/vault_detail_locked.fxml   |  1 +
 .../main/resources/i18n/strings.properties    |  3 +
 11 files changed, 208 insertions(+), 2 deletions(-)
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckComponent.java
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckScoped.java
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckWindow.java
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
 create mode 100644 main/ui/src/main/resources/fxml/health_start.fxml

diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
index 32dc94f14..625c95acb 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
@@ -11,6 +11,7 @@ public enum FxmlFile {
 	CHANGEPASSWORD("/fxml/changepassword.fxml"), //
 	ERROR("/fxml/error.fxml"), //
 	FORGET_PASSWORD("/fxml/forget_password.fxml"), //
+	HEALTH_START("/fxml/health_start.fxml"), //
 	LOCK_FORCED("/fxml/lock_forced.fxml"), //
 	LOCK_FAILED("/fxml/lock_failed.fxml"), //
 	MAIN_WINDOW("/fxml/main_window.fxml"), //
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckComponent.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckComponent.java
new file mode 100644
index 000000000..48b16f694
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckComponent.java
@@ -0,0 +1,39 @@
+package org.cryptomator.ui.health;
+
+import dagger.BindsInstance;
+import dagger.Lazy;
+import dagger.Subcomponent;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
+
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+@HealthCheckScoped
+@Subcomponent(modules = {HealthCheckModule.class})
+public interface HealthCheckComponent {
+
+	@HealthCheckWindow
+	Stage window();
+
+	@FxmlScene(FxmlFile.HEALTH_START)
+	Lazy<Scene> scene();
+
+	default Stage showHealthCheckWindow() {
+		Stage stage = window();
+		stage.setScene(scene().get());
+		stage.show();
+		return stage;
+	}
+
+	@Subcomponent.Builder
+	interface Builder {
+
+		@BindsInstance
+		Builder vault(@HealthCheckWindow Vault vault);
+
+		HealthCheckComponent build();
+	}
+
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
new file mode 100644
index 000000000..ec0c0331f
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
@@ -0,0 +1,57 @@
+package org.cryptomator.ui.health;
+
+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 org.cryptomator.ui.mainwindow.MainWindow;
+
+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 HealthCheckModule {
+
+	@Provides
+	@HealthCheckWindow
+	@HealthCheckScoped
+	static FxmlLoaderFactory provideFxmlLoaderFactory(Map<Class<? extends FxController>, Provider<FxController>> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) {
+		return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle);
+	}
+
+	@Provides
+	@HealthCheckWindow
+	@HealthCheckScoped
+	static Stage provideStage(StageFactory factory, @MainWindow Stage owner, ResourceBundle resourceBundle) {
+		Stage stage = factory.create();
+		stage.setTitle(resourceBundle.getString("health.title"));
+		stage.setResizable(false);
+		stage.initModality(Modality.WINDOW_MODAL);
+		stage.initOwner(owner);
+		return stage;
+	}
+
+	@Provides
+	@FxmlScene(FxmlFile.HEALTH_START)
+	@HealthCheckScoped
+	static Scene provideUnlockSelectMasterkeyFileScene(@HealthCheckWindow FxmlLoaderFactory fxmlLoaders) {
+		return fxmlLoaders.createScene(FxmlFile.HEALTH_START);
+	}
+
+	@Binds
+	@IntoMap
+	@FxControllerKey(StartController.class)
+	abstract FxController bindStartController(StartController controller);
+
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckScoped.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckScoped.java
new file mode 100644
index 000000000..af563d737
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckScoped.java
@@ -0,0 +1,13 @@
+package org.cryptomator.ui.health;
+
+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 HealthCheckScoped {
+
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckWindow.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckWindow.java
new file mode 100644
index 000000000..50243c07a
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckWindow.java
@@ -0,0 +1,14 @@
+package org.cryptomator.ui.health;
+
+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 HealthCheckWindow {
+
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
new file mode 100644
index 000000000..c87e95e0f
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
@@ -0,0 +1,40 @@
+package org.cryptomator.ui.health;
+
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.FxController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
+
+@HealthCheckScoped
+public class StartController implements FxController {
+
+	private static final Logger LOG = LoggerFactory.getLogger(StartController.class);
+
+	private final Vault vault;
+	private final Stage window;
+
+	@Inject
+	public StartController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window) {
+		this.vault = vault;
+		this.window = window;
+	}
+
+	@FXML
+	public void close() {
+		LOG.trace("StartController.close()");
+		window.close();
+	}
+
+	@FXML
+	public void next() {
+		LOG.trace("StartController.next()");
+	}
+
+	public Vault getVault() {
+		return vault;
+	}
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java
index f8316d289..e8aae56fb 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java
@@ -12,6 +12,7 @@ import org.cryptomator.ui.common.FxControllerKey;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 import org.cryptomator.ui.common.StageFactory;
+import org.cryptomator.ui.health.HealthCheckComponent;
 import org.cryptomator.ui.migration.MigrationComponent;
 import org.cryptomator.ui.removevault.RemoveVaultComponent;
 import org.cryptomator.ui.vaultoptions.VaultOptionsComponent;
@@ -27,7 +28,7 @@ import javafx.stage.StageStyle;
 import java.util.Map;
 import java.util.ResourceBundle;
 
-@Module(subcomponents = {AddVaultWizardComponent.class, MigrationComponent.class, RemoveVaultComponent.class, VaultOptionsComponent.class, VaultStatisticsComponent.class, WrongFileAlertComponent.class})
+@Module(subcomponents = {AddVaultWizardComponent.class, HealthCheckComponent.class, MigrationComponent.class, RemoveVaultComponent.class, VaultOptionsComponent.class, VaultStatisticsComponent.class, WrongFileAlertComponent.class})
 abstract class MainWindowModule {
 
 	@Provides
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java
index bc2f2100a..8d3f6a72c 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java
@@ -5,6 +5,7 @@ import org.cryptomator.common.keychain.KeychainManager;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.fxapp.FxApplication;
+import org.cryptomator.ui.health.HealthCheckComponent;
 import org.cryptomator.ui.vaultoptions.SelectedVaultOptionsTab;
 import org.cryptomator.ui.vaultoptions.VaultOptionsComponent;
 
@@ -13,6 +14,7 @@ import javafx.beans.binding.BooleanExpression;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.stage.Stage;
 import java.util.Optional;
@@ -22,15 +24,17 @@ public class VaultDetailLockedController implements FxController {
 
 	private final ReadOnlyObjectProperty<Vault> vault;
 	private final FxApplication application;
+	private final HealthCheckComponent.Builder healthCheckWindow;
 	private final VaultOptionsComponent.Builder vaultOptionsWindow;
 	private final KeychainManager keychain;
 	private final Stage mainWindow;
 	private final BooleanExpression passwordSaved;
 
 	@Inject
-	VaultDetailLockedController(ObjectProperty<Vault> vault, FxApplication application, VaultOptionsComponent.Builder vaultOptionsWindow, KeychainManager keychain, @MainWindow Stage mainWindow) {
+	VaultDetailLockedController(ObjectProperty<Vault> vault, FxApplication application, HealthCheckComponent.Builder healthCheckWindow, VaultOptionsComponent.Builder vaultOptionsWindow, KeychainManager keychain, @MainWindow Stage mainWindow) {
 		this.vault = vault;
 		this.application = application;
+		this.healthCheckWindow = healthCheckWindow;
 		this.vaultOptionsWindow = vaultOptionsWindow;
 		this.keychain = keychain;
 		this.mainWindow = mainWindow;
@@ -56,6 +60,11 @@ public class VaultDetailLockedController implements FxController {
 		vaultOptionsWindow.vault(vault.get()).build().showVaultOptionsWindow(SelectedVaultOptionsTab.KEY);
 	}
 
+	@FXML
+	public void showHealthCheck() {
+		healthCheckWindow.vault(vault.get()).build().showHealthCheckWindow();
+	}
+
 	/* Getter/Setter */
 
 	public ReadOnlyObjectProperty<Vault> vaultProperty() {
diff --git a/main/ui/src/main/resources/fxml/health_start.fxml b/main/ui/src/main/resources/fxml/health_start.fxml
new file mode 100644
index 000000000..246300be7
--- /dev/null
+++ b/main/ui/src/main/resources/fxml/health_start.fxml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.VBox?>
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
+	  fx:controller="org.cryptomator.ui.health.StartController"
+	  minWidth="400"
+	  maxWidth="400"
+	  minHeight="145"
+	  spacing="12">
+	<padding>
+		<Insets topRightBottomLeft="12"/>
+	</padding>
+	<children>
+		<Label text="${controller.vault.displayablePath}"/>
+
+		<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
+			<buttons>
+				<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close"/>
+				<Button text="%unlock.unlockBtn" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#next"/>
+			</buttons>
+		</ButtonBar>
+	</children>
+</VBox>
diff --git a/main/ui/src/main/resources/fxml/vault_detail_locked.fxml b/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
index d4bbc7e4a..3171141d1 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
@@ -33,6 +33,7 @@
 		<Region VBox.vgrow="ALWAYS"/>
 
 		<HBox alignment="BOTTOM_RIGHT">
+			<Button text="TODO Sanitizer" onAction="#showHealthCheck"/>
 			<Button text="%main.vaultDetail.optionsBtn" minWidth="120" onAction="#showVaultOptions">
 				<graphic>
 					<FontAwesome5IconView glyph="COG"/>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index b094095c8..c38ecf37f 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -143,6 +143,9 @@ migration.impossible.heading=Unable to migrate vault
 migration.impossible.reason=The vault cannot be automatically migrated because its storage location or access point is not compatible.
 migration.impossible.moreInfo=The vault can still be opened with an older version. For instructions on how to manually migrate a vault, visit
 
+# Health Check
+health.title=Vault Check
+
 # Preferences
 preferences.title=Preferences
 ## General

From d2cd2c923d64ebdf67aca9fc78111d4d71604c34 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 1 Apr 2021 13:26:33 +0200
Subject: [PATCH 02/67] unlock for health check

---
 .../ui/health/HealthCheckModule.java          | 12 ++-
 .../ui/health/StartController.java            | 81 +++++++++++++++++--
 .../src/main/resources/fxml/health_start.fxml |  8 +-
 3 files changed, 93 insertions(+), 8 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
index ec0c0331f..c5414ab9a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
@@ -4,6 +4,7 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
+import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxControllerKey;
@@ -11,6 +12,8 @@ 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 org.cryptomator.ui.keyloading.KeyLoadingComponent;
+import org.cryptomator.ui.keyloading.KeyLoadingStrategy;
 import org.cryptomator.ui.mainwindow.MainWindow;
 
 import javax.inject.Provider;
@@ -20,9 +23,16 @@ import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;
 
-@Module
+@Module(subcomponents = {KeyLoadingComponent.class})
 abstract class HealthCheckModule {
 
+	@Provides
+	@HealthCheckWindow
+	@HealthCheckScoped
+	static KeyLoadingStrategy provideKeyLoadingStrategy(KeyLoadingComponent.Builder compBuilder, @HealthCheckWindow Vault vault, @HealthCheckWindow Stage window) {
+		return compBuilder.vault(vault).window(window).build().keyloadingStrategy();
+	}
+
 	@Provides
 	@HealthCheckWindow
 	@HealthCheckScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
index c87e95e0f..6d9c51b4b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
@@ -1,26 +1,42 @@
 package org.cryptomator.ui.health;
 
 import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.cryptofs.VaultConfig;
+import org.cryptomator.cryptofs.VaultConfigLoadException;
+import org.cryptomator.cryptofs.VaultKeyInvalidException;
+import org.cryptomator.cryptolib.api.Masterkey;
+import org.cryptomator.cryptolib.api.MasterkeyLoadingFailedException;
 import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.fxapp.FxApplication;
+import org.cryptomator.ui.keyloading.KeyLoadingStrategy;
+import org.cryptomator.ui.unlock.UnlockCancelledException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.stage.Stage;
+import java.net.URI;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
 
 @HealthCheckScoped
 public class StartController implements FxController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(StartController.class);
 
-	private final Vault vault;
 	private final Stage window;
+	private final Optional<VaultConfig.UnverifiedVaultConfig> unverifiedVaultConfig;
+	private final KeyLoadingStrategy keyLoadingStrategy;
+	private final ExecutorService executor;
 
 	@Inject
-	public StartController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window) {
-		this.vault = vault;
+	public StartController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window, @HealthCheckWindow KeyLoadingStrategy keyLoadingStrategy, ExecutorService executor) {
 		this.window = window;
+		this.unverifiedVaultConfig = vault.getUnverifiedVaultConfig();
+		this.keyLoadingStrategy = keyLoadingStrategy;
+		this.executor = executor;
 	}
 
 	@FXML
@@ -32,9 +48,64 @@ public class StartController implements FxController {
 	@FXML
 	public void next() {
 		LOG.trace("StartController.next()");
+		executor.submit(this::loadKey);
 	}
 
-	public Vault getVault() {
-		return vault;
+	private void loadKey() {
+		assert !Platform.isFxApplicationThread();
+		try (var masterkey = keyLoadingStrategy.masterkeyLoader().loadKey(unverifiedVaultConfig.orElseThrow().getKeyId())) {
+			var clone = masterkey.clone(); // original key will get destroyed
+			Platform.runLater(() -> loadedKey(clone));
+		} catch (MasterkeyLoadingFailedException e) {
+			if (keyLoadingStrategy.recoverFromException(e)) {
+				// retry
+				loadKey();
+			} else {
+				Platform.runLater(() -> loadingKeyFailed(e));
+			}
+		}
+	}
+
+	private void loadedKey(Masterkey masterkey) {
+		assert unverifiedVaultConfig.isPresent();
+		var unverifiedCfg = unverifiedVaultConfig.get();
+		try {
+			var verifiedCfg = unverifiedCfg.verify(masterkey.getEncoded(), unverifiedCfg.allegedVaultVersion());
+			LOG.info("Verified vault config with cipher {}", verifiedCfg.getCipherCombo());
+		} catch (VaultKeyInvalidException e) {
+			LOG.error("Invalid key");
+			// TODO show error screen
+		} catch (VaultConfigLoadException e) {
+			LOG.error("Failed to verify vault config", e);
+			// TODO show error screen
+		} finally {
+			masterkey.destroy();
+		}
+	}
+
+	private void loadingKeyFailed(MasterkeyLoadingFailedException e) {
+		if (e instanceof UnlockCancelledException) {
+			// ok
+		} else {
+			LOG.error("Failed to load key.", e);
+			// TODO show error screen
+		}
+	}
+
+	public boolean isInvalidConfig() {
+		return unverifiedVaultConfig.isEmpty();
+	}
+
+	public int getVaultVersion() {
+		return unverifiedVaultConfig
+				.map(VaultConfig.UnverifiedVaultConfig::allegedVaultVersion)
+				.orElse(-1);
+	}
+
+	public String getKeyId() {
+		return unverifiedVaultConfig
+				.map(VaultConfig.UnverifiedVaultConfig::getKeyId)
+				.map(URI::toString)
+				.orElse(null);
 	}
 }
diff --git a/main/ui/src/main/resources/fxml/health_start.fxml b/main/ui/src/main/resources/fxml/health_start.fxml
index 246300be7..15d3809a5 100644
--- a/main/ui/src/main/resources/fxml/health_start.fxml
+++ b/main/ui/src/main/resources/fxml/health_start.fxml
@@ -16,12 +16,16 @@
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
-		<Label text="${controller.vault.displayablePath}"/>
+		<Label text="${controller.keyId}"/>
+
+		<Label text="${controller.vaultVersion}"/>
+
+		<Label text="TODO: Invalid vault config" visible="${controller.invalidConfig}" managed="${controller.invalidConfig}"/>
 
 		<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
 			<buttons>
 				<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close"/>
-				<Button text="%unlock.unlockBtn" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#next"/>
+				<Button text="%unlock.unlockBtn" ButtonBar.buttonData="NEXT_FORWARD" disable="${controller.invalidConfig}" defaultButton="true" onAction="#next"/>
 			</buttons>
 		</ButtonBar>
 	</children>

From 13db1aa9b9a4b9b15001fa3c5763534eed588c49 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 1 Apr 2021 17:40:53 +0200
Subject: [PATCH 03/67] Actually run tests from within Sanitizer UI

---
 main/pom.xml                                  |  2 +-
 .../org/cryptomator/ui/common/FxmlFile.java   |  1 +
 .../ui/health/CheckController.java            | 59 +++++++++++++++++++
 .../ui/health/HealthCheckModule.java          | 46 ++++++++++++++-
 .../ui/health/StartController.java            | 51 ++++++++++------
 .../src/main/resources/fxml/health_check.fxml | 27 +++++++++
 .../src/main/resources/fxml/health_start.fxml |  2 +-
 7 files changed, 165 insertions(+), 23 deletions(-)
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
 create mode 100644 main/ui/src/main/resources/fxml/health_check.fxml

diff --git a/main/pom.xml b/main/pom.xml
index ddd4262ec..02223a389 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -25,7 +25,7 @@
 		<project.jdk.version>16</project.jdk.version>
 
 		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>2.0.0-beta5</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>2.1.0-beta1</cryptomator.cryptofs.version>
 		<cryptomator.integrations.version>1.0.0-beta2</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>1.0.0-beta2</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>1.0.0-beta2</cryptomator.integrations.mac.version>
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
index 625c95acb..a1773d7af 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
@@ -12,6 +12,7 @@ public enum FxmlFile {
 	ERROR("/fxml/error.fxml"), //
 	FORGET_PASSWORD("/fxml/forget_password.fxml"), //
 	HEALTH_START("/fxml/health_start.fxml"), //
+	HEALTH_CHECK("/fxml/health_check.fxml"), //
 	LOCK_FORCED("/fxml/lock_forced.fxml"), //
 	LOCK_FAILED("/fxml/lock_failed.fxml"), //
 	MAIN_WINDOW("/fxml/main_window.fxml"), //
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
new file mode 100644
index 000000000..77b137494
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
@@ -0,0 +1,59 @@
+package org.cryptomator.ui.health;
+
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.cryptofs.VaultConfig;
+import org.cryptomator.cryptofs.health.api.DiagnosticResult;
+import org.cryptomator.cryptofs.health.api.HealthCheck;
+import org.cryptomator.cryptolib.api.Masterkey;
+import org.cryptomator.ui.common.FxController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+
+@HealthCheckScoped
+public class CheckController implements FxController {
+
+	private static final Logger LOG = LoggerFactory.getLogger(CheckController.class);
+
+	private final Vault vault;
+	private final Stage window;
+	private final Masterkey masterkey;
+	private final VaultConfig vaultConfig;
+	private final SecureRandom csprng;
+
+	@Inject
+	public CheckController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, SecureRandom csprng) {
+		this.vault = vault;
+		this.window = window;
+		this.masterkey = Objects.requireNonNull(masterkeyRef.get());
+		this.vaultConfig = Objects.requireNonNull(vaultConfigRef.get());
+		this.csprng = csprng;
+	}
+
+	@FXML
+	public void runCheck() {
+		// TODO run in background task...
+		try (var cryptor = vaultConfig.getCipherCombo().getCryptorProvider(csprng).withKey(masterkey)) {
+			List<DiagnosticResult> results = new ArrayList<>();
+			HealthCheck.allChecks().forEach(c -> {
+				LOG.info("Running check {}...", c.identifier());
+				results.addAll(c.check(vault.getPath(), vaultConfig, masterkey, cryptor));
+			});
+			results.forEach(r -> {
+				LOG.info("Result: {}", r);
+			});
+		}
+	}
+
+	public VaultConfig getVaultConfig() {
+		return vaultConfig;
+	}
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
index c5414ab9a..0a17678fc 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
@@ -5,6 +5,8 @@ import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
 import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.cryptofs.VaultConfig;
+import org.cryptomator.cryptolib.api.Masterkey;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxControllerKey;
@@ -17,15 +19,32 @@ import org.cryptomator.ui.keyloading.KeyLoadingStrategy;
 import org.cryptomator.ui.mainwindow.MainWindow;
 
 import javax.inject.Provider;
+import javafx.beans.Observable;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.scene.Scene;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import java.util.Map;
+import java.util.Optional;
 import java.util.ResourceBundle;
+import java.util.concurrent.atomic.AtomicReference;
 
 @Module(subcomponents = {KeyLoadingComponent.class})
 abstract class HealthCheckModule {
 
+	@Provides
+	@HealthCheckScoped
+	static AtomicReference<Masterkey> provideMasterkeyRef() {
+		return new AtomicReference<>();
+	}
+
+	@Provides
+	@HealthCheckScoped
+	static AtomicReference<VaultConfig> provideVaultConfigRef() {
+		return new AtomicReference<>();
+	}
+
 	@Provides
 	@HealthCheckWindow
 	@HealthCheckScoped
@@ -43,25 +62,48 @@ abstract class HealthCheckModule {
 	@Provides
 	@HealthCheckWindow
 	@HealthCheckScoped
-	static Stage provideStage(StageFactory factory, @MainWindow Stage owner, ResourceBundle resourceBundle) {
+	static Stage provideStage(StageFactory factory, @MainWindow Stage owner, ResourceBundle resourceBundle, ChangeListener<Boolean> showingListener) {
 		Stage stage = factory.create();
 		stage.setTitle(resourceBundle.getString("health.title"));
 		stage.setResizable(false);
 		stage.initModality(Modality.WINDOW_MODAL);
 		stage.initOwner(owner);
+		stage.showingProperty().addListener(showingListener);
 		return stage;
 	}
 
+	@Provides
+	@HealthCheckScoped
+	static ChangeListener<Boolean> provideWindowShowingChangeListener(AtomicReference<Masterkey> masterkey) {
+		return (observable, wasShowing, isShowing) -> {
+			if (!isShowing) {
+				Optional.ofNullable(masterkey.getAndSet(null)).ifPresent(Masterkey::destroy);
+			}
+		};
+	}
+
 	@Provides
 	@FxmlScene(FxmlFile.HEALTH_START)
 	@HealthCheckScoped
-	static Scene provideUnlockSelectMasterkeyFileScene(@HealthCheckWindow FxmlLoaderFactory fxmlLoaders) {
+	static Scene provideHealthStartScene(@HealthCheckWindow FxmlLoaderFactory fxmlLoaders) {
 		return fxmlLoaders.createScene(FxmlFile.HEALTH_START);
 	}
 
+	@Provides
+	@FxmlScene(FxmlFile.HEALTH_CHECK)
+	@HealthCheckScoped
+	static Scene provideHealthCheckScene(@HealthCheckWindow FxmlLoaderFactory fxmlLoaders) {
+		return fxmlLoaders.createScene(FxmlFile.HEALTH_CHECK);
+	}
+
 	@Binds
 	@IntoMap
 	@FxControllerKey(StartController.class)
 	abstract FxController bindStartController(StartController controller);
 
+	@Binds
+	@IntoMap
+	@FxControllerKey(CheckController.class)
+	abstract FxController bindCheckController(CheckController controller);
+
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
index 6d9c51b4b..848be8a9d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
@@ -1,5 +1,6 @@
 package org.cryptomator.ui.health;
 
+import dagger.Lazy;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptofs.VaultConfig;
 import org.cryptomator.cryptofs.VaultConfigLoadException;
@@ -7,6 +8,8 @@ import org.cryptomator.cryptofs.VaultKeyInvalidException;
 import org.cryptomator.cryptolib.api.Masterkey;
 import org.cryptomator.cryptolib.api.MasterkeyLoadingFailedException;
 import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
 import org.cryptomator.ui.fxapp.FxApplication;
 import org.cryptomator.ui.keyloading.KeyLoadingStrategy;
 import org.cryptomator.ui.unlock.UnlockCancelledException;
@@ -16,10 +19,12 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import javafx.application.Platform;
 import javafx.fxml.FXML;
+import javafx.scene.Scene;
 import javafx.stage.Stage;
 import java.net.URI;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicReference;
 
 @HealthCheckScoped
 public class StartController implements FxController {
@@ -30,13 +35,19 @@ public class StartController implements FxController {
 	private final Optional<VaultConfig.UnverifiedVaultConfig> unverifiedVaultConfig;
 	private final KeyLoadingStrategy keyLoadingStrategy;
 	private final ExecutorService executor;
+	private final AtomicReference<Masterkey> masterkeyRef;
+	private final AtomicReference<VaultConfig> vaultConfigRef;
+	private final Lazy<Scene> checkScene;
 
 	@Inject
-	public StartController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window, @HealthCheckWindow KeyLoadingStrategy keyLoadingStrategy, ExecutorService executor) {
+	public StartController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window, @HealthCheckWindow KeyLoadingStrategy keyLoadingStrategy, ExecutorService executor, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, @FxmlScene(FxmlFile.HEALTH_CHECK) Lazy<Scene> checkScene) {
 		this.window = window;
 		this.unverifiedVaultConfig = vault.getUnverifiedVaultConfig();
 		this.keyLoadingStrategy = keyLoadingStrategy;
 		this.executor = executor;
+		this.masterkeyRef = masterkeyRef;
+		this.vaultConfigRef = vaultConfigRef;
+		this.checkScene = checkScene;
 	}
 
 	@FXML
@@ -53,9 +64,16 @@ public class StartController implements FxController {
 
 	private void loadKey() {
 		assert !Platform.isFxApplicationThread();
+		assert unverifiedVaultConfig.isPresent();
 		try (var masterkey = keyLoadingStrategy.masterkeyLoader().loadKey(unverifiedVaultConfig.orElseThrow().getKeyId())) {
-			var clone = masterkey.clone(); // original key will get destroyed
-			Platform.runLater(() -> loadedKey(clone));
+			var unverifiedCfg = unverifiedVaultConfig.get();
+			var verifiedCfg = unverifiedCfg.verify(masterkey.getEncoded(), unverifiedCfg.allegedVaultVersion());
+			vaultConfigRef.set(verifiedCfg);
+			var old = masterkeyRef.getAndSet(masterkey.clone());
+			if (old != null) {
+				old.destroy();
+			}
+			Platform.runLater(this::loadedKey);
 		} catch (MasterkeyLoadingFailedException e) {
 			if (keyLoadingStrategy.recoverFromException(e)) {
 				// retry
@@ -63,29 +81,24 @@ public class StartController implements FxController {
 			} else {
 				Platform.runLater(() -> loadingKeyFailed(e));
 			}
-		}
-	}
-
-	private void loadedKey(Masterkey masterkey) {
-		assert unverifiedVaultConfig.isPresent();
-		var unverifiedCfg = unverifiedVaultConfig.get();
-		try {
-			var verifiedCfg = unverifiedCfg.verify(masterkey.getEncoded(), unverifiedCfg.allegedVaultVersion());
-			LOG.info("Verified vault config with cipher {}", verifiedCfg.getCipherCombo());
 		} catch (VaultKeyInvalidException e) {
-			LOG.error("Invalid key");
-			// TODO show error screen
+			Platform.runLater(() -> loadingKeyFailed(e));
 		} catch (VaultConfigLoadException e) {
-			LOG.error("Failed to verify vault config", e);
-			// TODO show error screen
-		} finally {
-			masterkey.destroy();
+			Platform.runLater(() -> loadingKeyFailed(e));
 		}
 	}
 
-	private void loadingKeyFailed(MasterkeyLoadingFailedException e) {
+	private void loadedKey() {
+		LOG.debug("Loaded valid key");
+		window.setScene(checkScene.get());
+	}
+
+	private void loadingKeyFailed(Exception e) {
 		if (e instanceof UnlockCancelledException) {
 			// ok
+		} else if (e instanceof VaultKeyInvalidException) {
+			LOG.error("Invalid key");
+			// TODO show error screen
 		} else {
 			LOG.error("Failed to load key.", e);
 			// TODO show error screen
diff --git a/main/ui/src/main/resources/fxml/health_check.fxml b/main/ui/src/main/resources/fxml/health_check.fxml
new file mode 100644
index 000000000..42942e01b
--- /dev/null
+++ b/main/ui/src/main/resources/fxml/health_check.fxml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.VBox?>
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
+	  fx:controller="org.cryptomator.ui.health.CheckController"
+	  minWidth="400"
+	  maxWidth="400"
+	  minHeight="145"
+	  spacing="12">
+	<padding>
+		<Insets topRightBottomLeft="12"/>
+	</padding>
+	<children>
+		<Label text="${controller.vaultConfig.cipherCombo}"/>
+
+		<ButtonBar buttonMinWidth="120" buttonOrder="+X">
+			<buttons>
+				<Button text="TODO run check" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#runCheck"/>
+			</buttons>
+		</ButtonBar>
+	</children>
+</VBox>
diff --git a/main/ui/src/main/resources/fxml/health_start.fxml b/main/ui/src/main/resources/fxml/health_start.fxml
index 15d3809a5..351e5885b 100644
--- a/main/ui/src/main/resources/fxml/health_start.fxml
+++ b/main/ui/src/main/resources/fxml/health_start.fxml
@@ -25,7 +25,7 @@
 		<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
 			<buttons>
 				<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close"/>
-				<Button text="%unlock.unlockBtn" ButtonBar.buttonData="NEXT_FORWARD" disable="${controller.invalidConfig}" defaultButton="true" onAction="#next"/>
+				<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" disable="${controller.invalidConfig}" defaultButton="true" onAction="#next"/>
 			</buttons>
 		</ButtonBar>
 	</children>

From 69186b916cecf88bded7b666a60918ea6b79619b Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Fri, 9 Apr 2021 16:04:52 +0200
Subject: [PATCH 04/67] adjusted to new async health check api

---
 main/pom.xml                                  |  2 +-
 .../ui/health/CheckController.java            | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index 02223a389..60ef7e7e9 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -25,7 +25,7 @@
 		<project.jdk.version>16</project.jdk.version>
 
 		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>2.1.0-beta1</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>2.1.0-beta2</cryptomator.cryptofs.version>
 		<cryptomator.integrations.version>1.0.0-beta2</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>1.0.0-beta2</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>1.0.0-beta2</cryptomator.integrations.mac.version>
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
index 77b137494..28b7a4915 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
@@ -16,6 +16,7 @@ import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicReference;
 
 @HealthCheckScoped
@@ -28,28 +29,29 @@ public class CheckController implements FxController {
 	private final Masterkey masterkey;
 	private final VaultConfig vaultConfig;
 	private final SecureRandom csprng;
+	private final ExecutorService executor;
 
 	@Inject
-	public CheckController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, SecureRandom csprng) {
+	public CheckController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, SecureRandom csprng, ExecutorService executor) {
 		this.vault = vault;
 		this.window = window;
 		this.masterkey = Objects.requireNonNull(masterkeyRef.get());
 		this.vaultConfig = Objects.requireNonNull(vaultConfigRef.get());
 		this.csprng = csprng;
+		this.executor = executor;
 	}
 
 	@FXML
 	public void runCheck() {
-		// TODO run in background task...
 		try (var cryptor = vaultConfig.getCipherCombo().getCryptorProvider(csprng).withKey(masterkey)) {
-			List<DiagnosticResult> results = new ArrayList<>();
-			HealthCheck.allChecks().forEach(c -> {
-				LOG.info("Running check {}...", c.identifier());
-				results.addAll(c.check(vault.getPath(), vaultConfig, masterkey, cryptor));
-			});
-			results.forEach(r -> {
-				LOG.info("Result: {}", r);
-			});
+			HealthCheck.allChecks().stream()
+					.peek(check -> {
+						LOG.info("Running check: {}", check.identifier());
+					})
+					.flatMap(check -> check.check(vault.getPath(), vaultConfig, masterkey, cryptor, executor))
+					.forEach(result -> {
+						LOG.info("Result: {}", result);
+					});
 		}
 	}
 

From 1fab246fcd66bdc41f4a4860d01e2710522cce58 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 13 Apr 2021 15:43:59 +0200
Subject: [PATCH 05/67] ugly PoC for new UI

---
 main/pom.xml                                  |  2 +-
 .../ui/health/CheckController.java            | 66 +++++++++++++------
 .../cryptomator/ui/health/CheckListCell.java  | 16 +++++
 .../ui/health/HealthCheckModule.java          | 11 +++-
 .../ui/health/HealthCheckTask.java            | 60 +++++++++++++++++
 .../ui/health/HealthCheckTaskFactory.java     | 35 ++++++++++
 .../cryptomator/ui/health/ResultListCell.java | 17 +++++
 .../src/main/resources/fxml/health_check.fxml | 23 ++++---
 8 files changed, 198 insertions(+), 32 deletions(-)
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTaskFactory.java
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/ResultListCell.java

diff --git a/main/pom.xml b/main/pom.xml
index 60ef7e7e9..293302bd2 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -25,7 +25,7 @@
 		<project.jdk.version>16</project.jdk.version>
 
 		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>2.1.0-beta2</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>2.1.0-beta3</cryptomator.cryptofs.version>
 		<cryptomator.integrations.version>1.0.0-beta2</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>1.0.0-beta2</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>1.0.0-beta2</cryptomator.integrations.mac.version>
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
index 28b7a4915..86400780a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
@@ -10,11 +10,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.scene.control.ListView;
 import javafx.stage.Stage;
 import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicReference;
@@ -22,40 +25,61 @@ import java.util.concurrent.atomic.AtomicReference;
 @HealthCheckScoped
 public class CheckController implements FxController {
 
-	private static final Logger LOG = LoggerFactory.getLogger(CheckController.class);
-
-	private final Vault vault;
 	private final Stage window;
-	private final Masterkey masterkey;
 	private final VaultConfig vaultConfig;
-	private final SecureRandom csprng;
+	private final HealthCheckTaskFactory healthCheckTaskFactory;
 	private final ExecutorService executor;
+	private final ObjectProperty<HealthCheck> selectedCheck;
+	private final ObservableList<HealthCheck> checks;
+	private final ObservableList<DiagnosticResult> results;
+
+	public ListView<HealthCheck> checksListView;
+	public ListView<DiagnosticResult> resultsListView;
 
 	@Inject
-	public CheckController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, SecureRandom csprng, ExecutorService executor) {
-		this.vault = vault;
+	public CheckController(@HealthCheckWindow Stage window, AtomicReference<VaultConfig> vaultConfigRef, HealthCheckTaskFactory healthCheckTaskFactory, ExecutorService executor, ObjectProperty<HealthCheck> selectedCheck) {
 		this.window = window;
-		this.masterkey = Objects.requireNonNull(masterkeyRef.get());
 		this.vaultConfig = Objects.requireNonNull(vaultConfigRef.get());
-		this.csprng = csprng;
+		this.healthCheckTaskFactory = healthCheckTaskFactory;
 		this.executor = executor;
+		this.selectedCheck = selectedCheck;
+		this.checks = FXCollections.observableArrayList(HealthCheck.allChecks());
+		this.results = FXCollections.observableArrayList();
+	}
+
+	@FXML
+	public void initialize() {
+		checksListView.setItems(checks);
+		checksListView.setCellFactory(this::createCheckListCell);
+		resultsListView.setItems(results);
+		resultsListView.setCellFactory(this::createResultListCell);
+		selectedCheck.bind(checksListView.getSelectionModel().selectedItemProperty());
+	}
+
+	private CheckListCell createCheckListCell(ListView<HealthCheck> list) {
+		return new CheckListCell();
+	}
+
+	private ResultListCell createResultListCell(ListView<DiagnosticResult> list) {
+		return new ResultListCell();
 	}
 
 	@FXML
 	public void runCheck() {
-		try (var cryptor = vaultConfig.getCipherCombo().getCryptorProvider(csprng).withKey(masterkey)) {
-			HealthCheck.allChecks().stream()
-					.peek(check -> {
-						LOG.info("Running check: {}", check.identifier());
-					})
-					.flatMap(check -> check.check(vault.getPath(), vaultConfig, masterkey, cryptor, executor))
-					.forEach(result -> {
-						LOG.info("Result: {}", result);
-					});
-		}
+		executor.execute(healthCheckTaskFactory.newTask(selectedCheck.get(), results::add));
 	}
 
+	/* Getter/Setter */
+
 	public VaultConfig getVaultConfig() {
 		return vaultConfig;
 	}
+
+	public HealthCheck getSelectedCheck() {
+		return selectedCheck.get();
+	}
+
+	public ReadOnlyObjectProperty<HealthCheck> selectedCheckProperty() {
+		return selectedCheck;
+	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
new file mode 100644
index 000000000..09e73b4b8
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
@@ -0,0 +1,16 @@
+package org.cryptomator.ui.health;
+
+import org.cryptomator.cryptofs.health.api.HealthCheck;
+
+import javafx.scene.control.ListCell;
+
+class CheckListCell extends ListCell<HealthCheck> {
+
+	@Override
+	protected void updateItem(HealthCheck item, boolean empty) {
+		super.updateItem(item, empty);
+		if (item != null) {
+			setText(item.identifier());
+		}
+	}
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
index 0a17678fc..c6b370469 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
@@ -6,6 +6,7 @@ import dagger.Provides;
 import dagger.multibindings.IntoMap;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptofs.VaultConfig;
+import org.cryptomator.cryptofs.health.api.HealthCheck;
 import org.cryptomator.cryptolib.api.Masterkey;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FxController;
@@ -19,9 +20,9 @@ import org.cryptomator.ui.keyloading.KeyLoadingStrategy;
 import org.cryptomator.ui.mainwindow.MainWindow;
 
 import javax.inject.Provider;
-import javafx.beans.Observable;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.scene.Scene;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
@@ -33,6 +34,12 @@ import java.util.concurrent.atomic.AtomicReference;
 @Module(subcomponents = {KeyLoadingComponent.class})
 abstract class HealthCheckModule {
 
+	@Provides
+	@HealthCheckScoped
+	static ObjectProperty<HealthCheck> selectedHealthCheck() {
+		return new SimpleObjectProperty<HealthCheck>();
+	}
+
 	@Provides
 	@HealthCheckScoped
 	static AtomicReference<Masterkey> provideMasterkeyRef() {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
new file mode 100644
index 000000000..7243fcd3d
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
@@ -0,0 +1,60 @@
+package org.cryptomator.ui.health;
+
+import org.cryptomator.cryptofs.VaultConfig;
+import org.cryptomator.cryptofs.health.api.DiagnosticResult;
+import org.cryptomator.cryptofs.health.api.HealthCheck;
+import org.cryptomator.cryptolib.api.Masterkey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javafx.application.Platform;
+import javafx.concurrent.Task;
+import java.nio.file.Path;
+import java.security.SecureRandom;
+import java.util.Objects;
+import java.util.concurrent.CancellationException;
+import java.util.function.Consumer;
+
+class HealthCheckTask extends Task<Void> {
+
+	private static final Logger LOG = LoggerFactory.getLogger(HealthCheckTask.class);
+
+	private final Path vaultPath;
+	private final VaultConfig vaultConfig;
+	private final Masterkey masterkey;
+	private final SecureRandom csprng;
+	private final HealthCheck check;
+	private final Consumer<DiagnosticResult> resultConsumer;
+
+	public HealthCheckTask(Path vaultPath, VaultConfig vaultConfig, Masterkey masterkey, SecureRandom csprng, HealthCheck check, Consumer<DiagnosticResult> resultConsumer) {
+		this.vaultPath = vaultPath;
+		this.vaultConfig = vaultConfig;
+		this.masterkey = masterkey;
+		this.csprng = csprng;
+		this.check = Objects.requireNonNull(check);
+		this.resultConsumer = resultConsumer;
+	}
+
+	@Override
+	protected Void call() {
+		try (var cryptor = vaultConfig.getCipherCombo().getCryptorProvider(csprng).withKey(masterkey)) {
+			check.check(vaultPath, vaultConfig, masterkey, cryptor, result -> {
+				if (isCancelled()) {
+					throw new CancellationException();
+				}
+				Platform.runLater(() -> resultConsumer.accept(result));
+			});
+		}
+		return null;
+	}
+
+	@Override
+	protected void scheduled() {
+		LOG.info("starting {}", check.identifier());
+	}
+
+	@Override
+	protected void done() {
+		LOG.info("finished {}", check.identifier());
+	}
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTaskFactory.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTaskFactory.java
new file mode 100644
index 000000000..3d192e0fe
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTaskFactory.java
@@ -0,0 +1,35 @@
+package org.cryptomator.ui.health;
+
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.cryptofs.VaultConfig;
+import org.cryptomator.cryptofs.health.api.DiagnosticResult;
+import org.cryptomator.cryptofs.health.api.HealthCheck;
+import org.cryptomator.cryptolib.api.Masterkey;
+
+import javax.inject.Inject;
+import java.security.SecureRandom;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+
+@HealthCheckScoped
+class HealthCheckTaskFactory {
+
+	private final Vault vault;
+	private final Masterkey masterkey;
+	private final VaultConfig vaultConfig;
+	private final SecureRandom csprng;
+
+	@Inject
+	public HealthCheckTaskFactory(@HealthCheckWindow Vault vault, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, SecureRandom csprng) {
+		this.vault = vault;
+		this.masterkey = Objects.requireNonNull(masterkeyRef.get());
+		this.vaultConfig = Objects.requireNonNull(vaultConfigRef.get());
+		this.csprng = csprng;
+	}
+
+	public HealthCheckTask newTask(HealthCheck healthCheck, Consumer<DiagnosticResult> resultConsumer) {
+		return new HealthCheckTask(vault.getPath(), vaultConfig, masterkey, csprng, healthCheck, resultConsumer);
+	}
+
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCell.java
new file mode 100644
index 000000000..1b0d02a11
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCell.java
@@ -0,0 +1,17 @@
+package org.cryptomator.ui.health;
+
+import org.cryptomator.cryptofs.health.api.DiagnosticResult;
+import org.cryptomator.cryptofs.health.api.HealthCheck;
+
+import javafx.scene.control.ListCell;
+
+class ResultListCell extends ListCell<DiagnosticResult> {
+
+	@Override
+	protected void updateItem(DiagnosticResult item, boolean empty) {
+		super.updateItem(item, empty);
+		if (item != null) {
+			setText(item.toString());
+		}
+	}
+}
diff --git a/main/ui/src/main/resources/fxml/health_check.fxml b/main/ui/src/main/resources/fxml/health_check.fxml
index 42942e01b..0ed5ff104 100644
--- a/main/ui/src/main/resources/fxml/health_check.fxml
+++ b/main/ui/src/main/resources/fxml/health_check.fxml
@@ -5,7 +5,9 @@
 <?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.VBox?>
-<VBox xmlns:fx="http://javafx.com/fxml"
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.control.ListView?>
+<HBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.health.CheckController"
 	  minWidth="400"
@@ -16,12 +18,17 @@
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
-		<Label text="${controller.vaultConfig.cipherCombo}"/>
+		<ListView fx:id="checksListView"/>
+		<VBox>
+			<Label text="${controller.vaultConfig.cipherCombo}"/>
 
-		<ButtonBar buttonMinWidth="120" buttonOrder="+X">
-			<buttons>
-				<Button text="TODO run check" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#runCheck"/>
-			</buttons>
-		</ButtonBar>
+			<ListView fx:id="resultsListView"/>
+
+			<ButtonBar buttonMinWidth="120" buttonOrder="+X">
+				<buttons>
+					<Button text="TODO run check" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#runCheck" disable="${selectedCheck.isNull}"/>
+				</buttons>
+			</ButtonBar>
+		</VBox>
 	</children>
-</VBox>
+</HBox>

From f3a03c71eceb98871bd22a5eb7c5aaa65d073da5 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 14 Apr 2021 10:20:34 +0200
Subject: [PATCH 06/67] implemented cancellable health checks

---
 .../ui/health/CheckController.java            | 93 ++++++++++++-------
 .../cryptomator/ui/health/CheckListCell.java  | 35 ++++++-
 .../ui/health/HealthCheckModule.java          | 16 +++-
 .../ui/health/HealthCheckTask.java            | 38 ++++++--
 .../ui/health/HealthCheckTaskFactory.java     | 35 -------
 .../cryptomator/ui/health/ResultListCell.java |  2 +
 .../src/main/resources/fxml/health_check.fxml |  5 +-
 7 files changed, 138 insertions(+), 86 deletions(-)
 delete mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTaskFactory.java

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
index 86400780a..0b4b4a4f0 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
@@ -1,23 +1,29 @@
 package org.cryptomator.ui.health;
 
-import org.cryptomator.common.vaults.Vault;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.EasyBinding;
+import com.tobiasdiez.easybind.optional.OptionalBinding;
+import dagger.Lazy;
 import org.cryptomator.cryptofs.VaultConfig;
 import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 import org.cryptomator.cryptofs.health.api.HealthCheck;
-import org.cryptomator.cryptolib.api.Masterkey;
 import org.cryptomator.ui.common.FxController;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import javafx.beans.binding.Binding;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.binding.BooleanExpression;
+import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.concurrent.Worker;
 import javafx.fxml.FXML;
 import javafx.scene.control.ListView;
 import javafx.stage.Stage;
-import java.security.SecureRandom;
+import java.util.Collection;
 import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicReference;
@@ -27,59 +33,78 @@ public class CheckController implements FxController {
 
 	private final Stage window;
 	private final VaultConfig vaultConfig;
-	private final HealthCheckTaskFactory healthCheckTaskFactory;
 	private final ExecutorService executor;
-	private final ObjectProperty<HealthCheck> selectedCheck;
-	private final ObservableList<HealthCheck> checks;
-	private final ObservableList<DiagnosticResult> results;
+	private final ObjectProperty<HealthCheckTask> selectedTask;
+	private final ObservableList<HealthCheckTask> tasks;
+	private final ObjectBinding<ObservableList<DiagnosticResult>> selectedResults;
+	private final OptionalBinding<Worker.State> selectedTaskState;
+	private final BooleanExpression ready;
+	private final BooleanExpression running;
 
-	public ListView<HealthCheck> checksListView;
+	public ListView<HealthCheckTask> checksListView;
 	public ListView<DiagnosticResult> resultsListView;
 
+
 	@Inject
-	public CheckController(@HealthCheckWindow Stage window, AtomicReference<VaultConfig> vaultConfigRef, HealthCheckTaskFactory healthCheckTaskFactory, ExecutorService executor, ObjectProperty<HealthCheck> selectedCheck) {
+	public CheckController(@HealthCheckWindow Stage window, AtomicReference<VaultConfig> vaultConfigRef, Lazy<Collection<HealthCheckTask>> tasks, ExecutorService executor, ObjectProperty<HealthCheckTask> selectedTask) {
 		this.window = window;
 		this.vaultConfig = Objects.requireNonNull(vaultConfigRef.get());
-		this.healthCheckTaskFactory = healthCheckTaskFactory;
 		this.executor = executor;
-		this.selectedCheck = selectedCheck;
-		this.checks = FXCollections.observableArrayList(HealthCheck.allChecks());
-		this.results = FXCollections.observableArrayList();
+		this.selectedTask = selectedTask;
+		this.selectedResults = Bindings.createObjectBinding(this::getSelectedResults, selectedTask);
+		this.selectedTaskState = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::stateProperty);
+		this.ready = BooleanExpression.booleanExpression(selectedTaskState.map(Worker.State.READY::equals).orElse(false));
+		this.running = BooleanExpression.booleanExpression(selectedTaskState.map(Worker.State.RUNNING::equals).orElse(false));
+		this.tasks = FXCollections.observableArrayList(tasks.get());
 	}
 
 	@FXML
 	public void initialize() {
-		checksListView.setItems(checks);
-		checksListView.setCellFactory(this::createCheckListCell);
-		resultsListView.setItems(results);
-		resultsListView.setCellFactory(this::createResultListCell);
-		selectedCheck.bind(checksListView.getSelectionModel().selectedItemProperty());
-	}
-
-	private CheckListCell createCheckListCell(ListView<HealthCheck> list) {
-		return new CheckListCell();
-	}
-
-	private ResultListCell createResultListCell(ListView<DiagnosticResult> list) {
-		return new ResultListCell();
+		checksListView.setItems(tasks);
+		checksListView.setCellFactory(ignored -> new CheckListCell());
+		resultsListView.itemsProperty().bind(selectedResults);
+		resultsListView.setCellFactory(ignored -> new ResultListCell());
+		selectedTask.bind(checksListView.getSelectionModel().selectedItemProperty());
 	}
 
 	@FXML
 	public void runCheck() {
-		executor.execute(healthCheckTaskFactory.newTask(selectedCheck.get(), results::add));
+		assert selectedTask.get() != null;
+		executor.execute(selectedTask.get());
+	}
+	@FXML
+	public void cancelCheck() {
+		assert selectedTask.get() != null;
+		assert selectedTask.get().isRunning();
+		selectedTask.get().cancel();
 	}
-
 	/* Getter/Setter */
 
 	public VaultConfig getVaultConfig() {
 		return vaultConfig;
 	}
 
-	public HealthCheck getSelectedCheck() {
-		return selectedCheck.get();
+	public boolean isRunning() {
+		return running.get();
 	}
 
-	public ReadOnlyObjectProperty<HealthCheck> selectedCheckProperty() {
-		return selectedCheck;
+	public BooleanExpression runningProperty() {
+		return running;
+	}
+
+	public boolean isReady() {
+		return ready.get();
+	}
+
+	public BooleanExpression readyProperty() {
+		return ready;
+	}
+
+	private ObservableList<DiagnosticResult> getSelectedResults() {
+		if (selectedTask.get() == null) {
+			return FXCollections.emptyObservableList();
+		} else {
+			return selectedTask.get().results();
+		}
 	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
index 09e73b4b8..a7da1c32e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
@@ -1,16 +1,43 @@
 package org.cryptomator.ui.health;
 
-import org.cryptomator.cryptofs.health.api.HealthCheck;
+import org.cryptomator.ui.controls.FontAwesome5Icon;
+import org.cryptomator.ui.controls.FontAwesome5IconView;
 
+import javafx.beans.value.ObservableValue;
+import javafx.concurrent.Worker;
+import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.ListCell;
 
-class CheckListCell extends ListCell<HealthCheck> {
+class CheckListCell extends ListCell<HealthCheckTask> {
+
+	private final FontAwesome5IconView stateIcon = new FontAwesome5IconView();
 
 	@Override
-	protected void updateItem(HealthCheck item, boolean empty) {
+	protected void updateItem(HealthCheckTask item, boolean empty) {
 		super.updateItem(item, empty);
 		if (item != null) {
-			setText(item.identifier());
+			setText(item.getCheck().identifier());
+			item.stateProperty().addListener(this::stateChanged);
+			setGraphic(stateIcon);
+			stateIcon.setGlyph(glyphForState(item.getState()));
+			setContentDisplay(ContentDisplay.LEFT);
+		} else {
+			setText(null);
+			setContentDisplay(ContentDisplay.TEXT_ONLY);
 		}
 	}
+
+	private void stateChanged(ObservableValue<? extends Worker.State> observable, Worker.State oldState, Worker.State newState) {
+		stateIcon.setGlyph(glyphForState(newState));
+	}
+
+	private FontAwesome5Icon glyphForState(Worker.State state) {
+		// TODO choose appropriate glyphs
+		return switch (state) {
+			case READY, SCHEDULED -> FontAwesome5Icon.ANCHOR;
+			case RUNNING -> FontAwesome5Icon.SPINNER;
+			case FAILED, CANCELLED -> FontAwesome5Icon.EXCLAMATION_TRIANGLE;
+			case SUCCEEDED -> FontAwesome5Icon.CHECK;
+		};
+	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
index c6b370469..37915edd6 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
@@ -3,6 +3,7 @@ package org.cryptomator.ui.health;
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
+import dagger.multibindings.ElementsIntoSet;
 import dagger.multibindings.IntoMap;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptofs.VaultConfig;
@@ -26,9 +27,12 @@ import javafx.beans.value.ChangeListener;
 import javafx.scene.Scene;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
+import java.security.SecureRandom;
+import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
 import java.util.ResourceBundle;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
 @Module(subcomponents = {KeyLoadingComponent.class})
@@ -36,8 +40,8 @@ abstract class HealthCheckModule {
 
 	@Provides
 	@HealthCheckScoped
-	static ObjectProperty<HealthCheck> selectedHealthCheck() {
-		return new SimpleObjectProperty<HealthCheck>();
+	static ObjectProperty<HealthCheckTask> selectedHealthCheckTask() {
+		return new SimpleObjectProperty<>();
 	}
 
 	@Provides
@@ -59,6 +63,12 @@ abstract class HealthCheckModule {
 		return compBuilder.vault(vault).window(window).build().keyloadingStrategy();
 	}
 
+	@Provides
+	@HealthCheckScoped
+	static Collection<HealthCheckTask> provideHealthCheckTasks(@HealthCheckWindow Vault vault, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, SecureRandom csprng) {
+		return HealthCheck.allChecks().stream().map(check -> new HealthCheckTask(vault.getPath(), vaultConfigRef.get(), masterkeyRef.get(), csprng, check)).toList();
+	}
+
 	@Provides
 	@HealthCheckWindow
 	@HealthCheckScoped
@@ -72,7 +82,7 @@ abstract class HealthCheckModule {
 	static Stage provideStage(StageFactory factory, @MainWindow Stage owner, ResourceBundle resourceBundle, ChangeListener<Boolean> showingListener) {
 		Stage stage = factory.create();
 		stage.setTitle(resourceBundle.getString("health.title"));
-		stage.setResizable(false);
+		stage.setResizable(true);
 		stage.initModality(Modality.WINDOW_MODAL);
 		stage.initOwner(owner);
 		stage.showingProperty().addListener(showingListener);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
index 7243fcd3d..ba3b5a85d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
@@ -8,7 +8,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javafx.application.Platform;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.concurrent.Task;
+import javafx.concurrent.Worker;
 import java.nio.file.Path;
 import java.security.SecureRandom;
 import java.util.Objects;
@@ -24,15 +29,15 @@ class HealthCheckTask extends Task<Void> {
 	private final Masterkey masterkey;
 	private final SecureRandom csprng;
 	private final HealthCheck check;
-	private final Consumer<DiagnosticResult> resultConsumer;
+	private final ObservableList<DiagnosticResult> results;
 
-	public HealthCheckTask(Path vaultPath, VaultConfig vaultConfig, Masterkey masterkey, SecureRandom csprng, HealthCheck check, Consumer<DiagnosticResult> resultConsumer) {
-		this.vaultPath = vaultPath;
-		this.vaultConfig = vaultConfig;
-		this.masterkey = masterkey;
-		this.csprng = csprng;
+	public HealthCheckTask(Path vaultPath, VaultConfig vaultConfig, Masterkey masterkey, SecureRandom csprng, HealthCheck check) {
+		this.vaultPath = Objects.requireNonNull(vaultPath);
+		this.vaultConfig = Objects.requireNonNull(vaultConfig);
+		this.masterkey = Objects.requireNonNull(masterkey);
+		this.csprng = Objects.requireNonNull(csprng);
 		this.check = Objects.requireNonNull(check);
-		this.resultConsumer = resultConsumer;
+		this.results = FXCollections.observableArrayList();
 	}
 
 	@Override
@@ -42,7 +47,13 @@ class HealthCheckTask extends Task<Void> {
 				if (isCancelled()) {
 					throw new CancellationException();
 				}
-				Platform.runLater(() -> resultConsumer.accept(result));
+				// FIXME: slowdown for demonstration purposes only:
+				try {
+					Thread.sleep(200);
+				} catch (InterruptedException e) {
+					e.printStackTrace();
+				}
+				Platform.runLater(() -> results.add(result));
 			});
 		}
 		return null;
@@ -57,4 +68,15 @@ class HealthCheckTask extends Task<Void> {
 	protected void done() {
 		LOG.info("finished {}", check.identifier());
 	}
+
+	/* Getter */
+
+	public ObservableList<DiagnosticResult> results() {
+		return results;
+	}
+
+	public HealthCheck getCheck() {
+		return check;
+	}
+
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTaskFactory.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTaskFactory.java
deleted file mode 100644
index 3d192e0fe..000000000
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTaskFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.cryptomator.ui.health;
-
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.cryptofs.VaultConfig;
-import org.cryptomator.cryptofs.health.api.DiagnosticResult;
-import org.cryptomator.cryptofs.health.api.HealthCheck;
-import org.cryptomator.cryptolib.api.Masterkey;
-
-import javax.inject.Inject;
-import java.security.SecureRandom;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
-
-@HealthCheckScoped
-class HealthCheckTaskFactory {
-
-	private final Vault vault;
-	private final Masterkey masterkey;
-	private final VaultConfig vaultConfig;
-	private final SecureRandom csprng;
-
-	@Inject
-	public HealthCheckTaskFactory(@HealthCheckWindow Vault vault, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, SecureRandom csprng) {
-		this.vault = vault;
-		this.masterkey = Objects.requireNonNull(masterkeyRef.get());
-		this.vaultConfig = Objects.requireNonNull(vaultConfigRef.get());
-		this.csprng = csprng;
-	}
-
-	public HealthCheckTask newTask(HealthCheck healthCheck, Consumer<DiagnosticResult> resultConsumer) {
-		return new HealthCheckTask(vault.getPath(), vaultConfig, masterkey, csprng, healthCheck, resultConsumer);
-	}
-
-}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCell.java
index 1b0d02a11..6458b4ff4 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCell.java
@@ -12,6 +12,8 @@ class ResultListCell extends ListCell<DiagnosticResult> {
 		super.updateItem(item, empty);
 		if (item != null) {
 			setText(item.toString());
+		} else {
+			setText(null);
 		}
 	}
 }
diff --git a/main/ui/src/main/resources/fxml/health_check.fxml b/main/ui/src/main/resources/fxml/health_check.fxml
index 0ed5ff104..d67f9e1a9 100644
--- a/main/ui/src/main/resources/fxml/health_check.fxml
+++ b/main/ui/src/main/resources/fxml/health_check.fxml
@@ -24,9 +24,10 @@
 
 			<ListView fx:id="resultsListView"/>
 
-			<ButtonBar buttonMinWidth="120" buttonOrder="+X">
+			<ButtonBar buttonMinWidth="120" buttonOrder="+CA">
 				<buttons>
-					<Button text="TODO run check" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#runCheck" disable="${selectedCheck.isNull}"/>
+					<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" onAction="#cancelCheck" disable="${!controller.running}"/>
+					<Button text="TODO run check" ButtonBar.buttonData="APPLY" defaultButton="true" onAction="#runCheck" disable="${!controller.ready}"/>
 				</buttons>
 			</ButtonBar>
 		</VBox>

From 70baa4d09f9b5ba1e5b0dc75212098a7de35eb1d Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 27 Apr 2021 17:41:28 +0200
Subject: [PATCH 07/67] Rework sanitizer workflow: * select set of performed
 HealthChecks prior to loading masterkey * two predefined healthcheck sets and
 custom one * start sequential execution of checks after successful masterkey
 loading * removed vault config info * destroy masterkey on window close, on
 cancellation, on check finish

---
 .../ui/health/CheckController.java            | 33 +++----
 .../ui/health/HealthCheckModule.java          | 45 +++++----
 .../ui/health/HealthCheckTask.java            |  9 +-
 .../ui/health/StartController.java            | 94 ++++++++++++++++---
 .../src/main/resources/fxml/health_check.fxml |  8 +-
 .../src/main/resources/fxml/health_start.fxml | 23 ++++-
 6 files changed, 144 insertions(+), 68 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
index 0b4b4a4f0..40287a6ca 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
@@ -1,38 +1,33 @@
 package org.cryptomator.ui.health;
 
 import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.EasyBinding;
 import com.tobiasdiez.easybind.optional.OptionalBinding;
 import dagger.Lazy;
 import org.cryptomator.cryptofs.VaultConfig;
 import org.cryptomator.cryptofs.health.api.DiagnosticResult;
-import org.cryptomator.cryptofs.health.api.HealthCheck;
 import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
-import javafx.beans.binding.Binding;
 import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
 import javafx.beans.binding.BooleanExpression;
 import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.concurrent.Worker;
 import javafx.fxml.FXML;
 import javafx.scene.control.ListView;
-import javafx.stage.Stage;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
 
 @HealthCheckScoped
 public class CheckController implements FxController {
 
-	private final Stage window;
 	private final VaultConfig vaultConfig;
+	private final Runnable masterkeyDestructor;
 	private final ExecutorService executor;
 	private final ObjectProperty<HealthCheckTask> selectedTask;
 	private final ObservableList<HealthCheckTask> tasks;
@@ -46,10 +41,10 @@ public class CheckController implements FxController {
 
 
 	@Inject
-	public CheckController(@HealthCheckWindow Stage window, AtomicReference<VaultConfig> vaultConfigRef, Lazy<Collection<HealthCheckTask>> tasks, ExecutorService executor, ObjectProperty<HealthCheckTask> selectedTask) {
-		this.window = window;
+	public CheckController(AtomicReference<VaultConfig> vaultConfigRef, Runnable masterkeyDestructor, Lazy<Collection<HealthCheckTask>> tasks, ObjectProperty<HealthCheckTask> selectedTask) {
 		this.vaultConfig = Objects.requireNonNull(vaultConfigRef.get());
-		this.executor = executor;
+		this.masterkeyDestructor = masterkeyDestructor;
+		this.executor = Executors.newSingleThreadExecutor();
 		this.selectedTask = selectedTask;
 		this.selectedResults = Bindings.createObjectBinding(this::getSelectedResults, selectedTask);
 		this.selectedTaskState = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::stateProperty);
@@ -65,19 +60,21 @@ public class CheckController implements FxController {
 		resultsListView.itemsProperty().bind(selectedResults);
 		resultsListView.setCellFactory(ignored -> new ResultListCell());
 		selectedTask.bind(checksListView.getSelectionModel().selectedItemProperty());
+		checksListView.getSelectionModel().select(0);
+
+		tasks.forEach(task -> executor.execute(task));
+
+		//ensure that at the end the masterkey is destroyed
+		executor.submit(masterkeyDestructor);
 	}
 
-	@FXML
-	public void runCheck() {
-		assert selectedTask.get() != null;
-		executor.execute(selectedTask.get());
-	}
 	@FXML
 	public void cancelCheck() {
-		assert selectedTask.get() != null;
-		assert selectedTask.get().isRunning();
-		selectedTask.get().cancel();
+		//assert selectedTask.get().isRunning(); Replace with something like executor.isRunning()
+		executor.shutdownNow();
+		masterkeyDestructor.run();
 	}
+
 	/* Getter/Setter */
 
 	public VaultConfig getVaultConfig() {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
index 37915edd6..886ec3d03 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
@@ -3,7 +3,6 @@ package org.cryptomator.ui.health;
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
-import dagger.multibindings.ElementsIntoSet;
 import dagger.multibindings.IntoMap;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptofs.VaultConfig;
@@ -23,16 +22,15 @@ import org.cryptomator.ui.mainwindow.MainWindow;
 import javax.inject.Provider;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.value.ChangeListener;
 import javafx.scene.Scene;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import java.security.SecureRandom;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
 import java.util.ResourceBundle;
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
 @Module(subcomponents = {KeyLoadingComponent.class})
@@ -50,12 +48,31 @@ abstract class HealthCheckModule {
 		return new AtomicReference<>();
 	}
 
+	@Provides
+	@HealthCheckScoped
+	static Runnable provideMasterkeyDestructor(AtomicReference<Masterkey> masterkeyRef) {
+		return () -> Optional.ofNullable(masterkeyRef.getAndSet(null)).ifPresent(Masterkey::destroy);
+	}
+
 	@Provides
 	@HealthCheckScoped
 	static AtomicReference<VaultConfig> provideVaultConfigRef() {
 		return new AtomicReference<>();
 	}
 
+	@Provides
+	@HealthCheckScoped
+	static Collection<HealthCheck> provideSelectedHealthChecks() {
+		return new ArrayList<>();
+	}
+
+	/* Only inject with Lazy-Wrapper!*/
+	@Provides
+	@HealthCheckScoped
+	static Collection<HealthCheckTask> provideSelectedHealthCheckTasks(Collection<HealthCheck> selectedHealthChecks, @HealthCheckWindow Vault vault, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, SecureRandom csprng) {
+		return selectedHealthChecks.stream().map(check -> new HealthCheckTask(vault.getPath(), vaultConfigRef.get(), masterkeyRef.get(), csprng, check)).toList(); //TODO: for every task clone the masterkey and destroy it afterwards
+	}
+
 	@Provides
 	@HealthCheckWindow
 	@HealthCheckScoped
@@ -63,12 +80,6 @@ abstract class HealthCheckModule {
 		return compBuilder.vault(vault).window(window).build().keyloadingStrategy();
 	}
 
-	@Provides
-	@HealthCheckScoped
-	static Collection<HealthCheckTask> provideHealthCheckTasks(@HealthCheckWindow Vault vault, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, SecureRandom csprng) {
-		return HealthCheck.allChecks().stream().map(check -> new HealthCheckTask(vault.getPath(), vaultConfigRef.get(), masterkeyRef.get(), csprng, check)).toList();
-	}
-
 	@Provides
 	@HealthCheckWindow
 	@HealthCheckScoped
@@ -79,24 +90,18 @@ abstract class HealthCheckModule {
 	@Provides
 	@HealthCheckWindow
 	@HealthCheckScoped
-	static Stage provideStage(StageFactory factory, @MainWindow Stage owner, ResourceBundle resourceBundle, ChangeListener<Boolean> showingListener) {
+	static Stage provideStage(StageFactory factory, @MainWindow Stage owner, ResourceBundle resourceBundle, Runnable masterkeyDestructor) {
 		Stage stage = factory.create();
 		stage.setTitle(resourceBundle.getString("health.title"));
 		stage.setResizable(true);
 		stage.initModality(Modality.WINDOW_MODAL);
 		stage.initOwner(owner);
-		stage.showingProperty().addListener(showingListener);
-		return stage;
-	}
-
-	@Provides
-	@HealthCheckScoped
-	static ChangeListener<Boolean> provideWindowShowingChangeListener(AtomicReference<Masterkey> masterkey) {
-		return (observable, wasShowing, isShowing) -> {
+		stage.showingProperty().addListener((observable, wasShowing, isShowing) -> {  //TODO: should we use showingProperty or onCloseRequest
 			if (!isShowing) {
-				Optional.ofNullable(masterkey.getAndSet(null)).ifPresent(Masterkey::destroy);
+				masterkeyDestructor.run();
 			}
-		};
+		});
+		return stage;
 	}
 
 	@Provides
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
index ba3b5a85d..b345352ab 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
@@ -8,17 +8,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javafx.application.Platform;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.concurrent.Task;
-import javafx.concurrent.Worker;
 import java.nio.file.Path;
 import java.security.SecureRandom;
 import java.util.Objects;
 import java.util.concurrent.CancellationException;
-import java.util.function.Consumer;
 
 class HealthCheckTask extends Task<Void> {
 
@@ -42,8 +38,9 @@ class HealthCheckTask extends Task<Void> {
 
 	@Override
 	protected Void call() {
-		try (var cryptor = vaultConfig.getCipherCombo().getCryptorProvider(csprng).withKey(masterkey)) {
-			check.check(vaultPath, vaultConfig, masterkey, cryptor, result -> {
+		try (var masterkeyClone = masterkey.clone(); //
+			 var cryptor = vaultConfig.getCipherCombo().getCryptorProvider(csprng).withKey(masterkeyClone)) {
+			check.check(vaultPath, vaultConfig, masterkeyClone, cryptor, result -> { //TODO: why using both masterkey and Cryptor ??
 				if (isCancelled()) {
 					throw new CancellationException();
 				}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
index 848be8a9d..170493c97 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
@@ -5,12 +5,13 @@ import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptofs.VaultConfig;
 import org.cryptomator.cryptofs.VaultConfigLoadException;
 import org.cryptomator.cryptofs.VaultKeyInvalidException;
+import org.cryptomator.cryptofs.health.api.HealthCheck;
+import org.cryptomator.cryptofs.health.dirid.DirIdCheck;
 import org.cryptomator.cryptolib.api.Masterkey;
 import org.cryptomator.cryptolib.api.MasterkeyLoadingFailedException;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
-import org.cryptomator.ui.fxapp.FxApplication;
 import org.cryptomator.ui.keyloading.KeyLoadingStrategy;
 import org.cryptomator.ui.unlock.UnlockCancelledException;
 import org.slf4j.Logger;
@@ -18,11 +19,22 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javafx.application.Platform;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.scene.Scene;
+import javafx.scene.control.ListView;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.control.cell.CheckBoxListCell;
 import javafx.stage.Stage;
-import java.net.URI;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -32,22 +44,58 @@ public class StartController implements FxController {
 	private static final Logger LOG = LoggerFactory.getLogger(StartController.class);
 
 	private final Stage window;
+	private final Collection<HealthCheck> availableChecks;
+	private final Map<HealthCheck, BooleanProperty> availableCheckListSelectProperties;
 	private final Optional<VaultConfig.UnverifiedVaultConfig> unverifiedVaultConfig;
 	private final KeyLoadingStrategy keyLoadingStrategy;
 	private final ExecutorService executor;
 	private final AtomicReference<Masterkey> masterkeyRef;
 	private final AtomicReference<VaultConfig> vaultConfigRef;
+	private final Collection<HealthCheck> selectedChecks;
 	private final Lazy<Scene> checkScene;
 
+	/* FXML */
+	public ListView availableChecksList;
+	public RadioButton customCheckSetButton;
+	public RadioButton quickCheckSetButton;
+	public RadioButton fullCheckSetButton;
+	public ToggleGroup checksSetToggleGroup;
+
 	@Inject
-	public StartController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window, @HealthCheckWindow KeyLoadingStrategy keyLoadingStrategy, ExecutorService executor, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, @FxmlScene(FxmlFile.HEALTH_CHECK) Lazy<Scene> checkScene) {
+	public StartController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window, @HealthCheckWindow KeyLoadingStrategy keyLoadingStrategy, ExecutorService executor, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, Collection<HealthCheck> selectedChecks, @FxmlScene(FxmlFile.HEALTH_CHECK) Lazy<Scene> checkScene) {
 		this.window = window;
-		this.unverifiedVaultConfig = vault.getUnverifiedVaultConfig();
+		this.unverifiedVaultConfig = vault.getUnverifiedVaultConfig(); //TODO: prevent workflow at all, if the vault config is emtpy
 		this.keyLoadingStrategy = keyLoadingStrategy;
 		this.executor = executor;
 		this.masterkeyRef = masterkeyRef;
 		this.vaultConfigRef = vaultConfigRef;
+		this.selectedChecks = selectedChecks;
 		this.checkScene = checkScene;
+		this.availableChecks = HealthCheck.allChecks();
+		this.availableCheckListSelectProperties = new HashMap<>();
+
+		availableChecks.forEach(check -> availableCheckListSelectProperties.put(check, new SimpleBooleanProperty(false)));
+	}
+
+	public void initialize() {
+		availableChecksList.setItems(FXCollections.observableList(availableChecks.stream().toList()));
+		availableChecksList.setCellFactory(CheckBoxListCell.forListView(availableCheckListSelectProperties::get));
+		availableChecksList.setEditable(false);
+
+		var availableCheckIds = availableChecks.stream().map(HealthCheck::identifier).toList();
+
+		if (PredefinedCheckSet.QUICK.getCheckIds().stream().anyMatch(checkId -> !availableCheckIds.contains(checkId))) {
+			quickCheckSetButton.setVisible(false);
+			quickCheckSetButton.setManaged(false);
+		}
+		if (PredefinedCheckSet.FULL.getCheckIds().stream().anyMatch(checkId -> !availableCheckIds.contains(checkId))) {
+			fullCheckSetButton.setVisible(false);
+			fullCheckSetButton.setManaged(false);
+		}
+
+		quickCheckSetButton.setUserData(PredefinedCheckSet.QUICK);
+		fullCheckSetButton.setUserData(PredefinedCheckSet.FULL);
+		customCheckSetButton.setUserData(PredefinedCheckSet.CUSTOM);
 	}
 
 	@FXML
@@ -58,6 +106,15 @@ public class StartController implements FxController {
 
 	@FXML
 	public void next() {
+		switch ((PredefinedCheckSet) checksSetToggleGroup.getSelectedToggle().getUserData()) {
+			case FULL -> selectedChecks.addAll(availableChecks);
+			case QUICK -> selectedChecks.addAll(availableChecks.stream().filter(check -> PredefinedCheckSet.QUICK.getCheckIds().contains(check.identifier())).toList());
+			case CUSTOM -> availableCheckListSelectProperties.forEach((check, selected) -> {
+				if (selected.get()) {
+					selectedChecks.add(check);
+				}
+			});
+		}
 		LOG.trace("StartController.next()");
 		executor.submit(this::loadKey);
 	}
@@ -109,16 +166,27 @@ public class StartController implements FxController {
 		return unverifiedVaultConfig.isEmpty();
 	}
 
-	public int getVaultVersion() {
-		return unverifiedVaultConfig
-				.map(VaultConfig.UnverifiedVaultConfig::allegedVaultVersion)
-				.orElse(-1);
+	public BooleanBinding anyCheckSetSelectedProperty() {
+		return checksSetToggleGroup.selectedToggleProperty().isNotNull();
 	}
 
-	public String getKeyId() {
-		return unverifiedVaultConfig
-				.map(VaultConfig.UnverifiedVaultConfig::getKeyId)
-				.map(URI::toString)
-				.orElse(null);
+	public boolean isAnyCheckSetSelected() {
+		return anyCheckSetSelectedProperty().get();
+	}
+
+	enum PredefinedCheckSet {
+		QUICK(DirIdCheck.class.getCanonicalName()), //TODO: get identifier via static method?
+		FULL(DirIdCheck.class.getCanonicalName()),
+		CUSTOM();
+
+		private Collection<String> checkIds;
+
+		PredefinedCheckSet(String... checkIds) {
+			this.checkIds = Set.of(checkIds);
+		}
+
+		Collection<String> getCheckIds() {
+			return checkIds;
+		}
 	}
 }
diff --git a/main/ui/src/main/resources/fxml/health_check.fxml b/main/ui/src/main/resources/fxml/health_check.fxml
index d67f9e1a9..786df27e7 100644
--- a/main/ui/src/main/resources/fxml/health_check.fxml
+++ b/main/ui/src/main/resources/fxml/health_check.fxml
@@ -3,10 +3,9 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.control.ListView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 <HBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.health.CheckController"
@@ -20,14 +19,11 @@
 	<children>
 		<ListView fx:id="checksListView"/>
 		<VBox>
-			<Label text="${controller.vaultConfig.cipherCombo}"/>
-
 			<ListView fx:id="resultsListView"/>
 
 			<ButtonBar buttonMinWidth="120" buttonOrder="+CA">
 				<buttons>
 					<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" onAction="#cancelCheck" disable="${!controller.running}"/>
-					<Button text="TODO run check" ButtonBar.buttonData="APPLY" defaultButton="true" onAction="#runCheck" disable="${!controller.ready}"/>
 				</buttons>
 			</ButtonBar>
 		</VBox>
diff --git a/main/ui/src/main/resources/fxml/health_start.fxml b/main/ui/src/main/resources/fxml/health_start.fxml
index 351e5885b..5be6c9458 100644
--- a/main/ui/src/main/resources/fxml/health_start.fxml
+++ b/main/ui/src/main/resources/fxml/health_start.fxml
@@ -4,6 +4,10 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.VBox?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
@@ -12,20 +16,29 @@
 	  maxWidth="400"
 	  minHeight="145"
 	  spacing="12">
+	<fx:define>
+		<ToggleGroup fx:id="checksSetToggleGroup"/>
+	</fx:define>
 	<padding>
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
-		<Label text="${controller.keyId}"/>
-
-		<Label text="${controller.vaultVersion}"/>
-
 		<Label text="TODO: Invalid vault config" visible="${controller.invalidConfig}" managed="${controller.invalidConfig}"/>
 
+		<Label text="Please select, which check(s) should be performed:"/>
+		<VBox spacing="6" disable="${controller.invalidConfig}">
+			<RadioButton fx:id="quickCheckSetButton" toggleGroup="${checksSetToggleGroup}" text="Quick Check"/>
+			<RadioButton fx:id="fullCheckSetButton" toggleGroup="${checksSetToggleGroup}" text="Full Check"/>
+			<AnchorPane >
+				<RadioButton fx:id="customCheckSetButton" toggleGroup="${checksSetToggleGroup}" text="Custom Check"/>
+				<ListView fx:id="availableChecksList" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="20.0" maxHeight="100" visible="${customCheckSetButton.selected}"/>
+			</AnchorPane>
+		</VBox>
+
 		<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
 			<buttons>
 				<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close"/>
-				<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" disable="${controller.invalidConfig}" defaultButton="true" onAction="#next"/>
+				<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" disable="${controller.invalidConfig || !controller.anyCheckSetSelected}" defaultButton="true" onAction="#next"/>
 			</buttons>
 		</ButtonBar>
 	</children>

From c0baab2329cea8e85b2e9eb8283e5c5fd58ded6a Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Wed, 28 Apr 2021 09:55:31 +0200
Subject: [PATCH 08/67] change comments

---
 .../main/java/org/cryptomator/ui/health/HealthCheckModule.java  | 2 +-
 .../main/java/org/cryptomator/ui/health/HealthCheckTask.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
index 886ec3d03..dc587fdbe 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
@@ -70,7 +70,7 @@ abstract class HealthCheckModule {
 	@Provides
 	@HealthCheckScoped
 	static Collection<HealthCheckTask> provideSelectedHealthCheckTasks(Collection<HealthCheck> selectedHealthChecks, @HealthCheckWindow Vault vault, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, SecureRandom csprng) {
-		return selectedHealthChecks.stream().map(check -> new HealthCheckTask(vault.getPath(), vaultConfigRef.get(), masterkeyRef.get(), csprng, check)).toList(); //TODO: for every task clone the masterkey and destroy it afterwards
+		return selectedHealthChecks.stream().map(check -> new HealthCheckTask(vault.getPath(), vaultConfigRef.get(), masterkeyRef.get(), csprng, check)).toList();
 	}
 
 	@Provides
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
index b345352ab..686054205 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
@@ -40,7 +40,7 @@ class HealthCheckTask extends Task<Void> {
 	protected Void call() {
 		try (var masterkeyClone = masterkey.clone(); //
 			 var cryptor = vaultConfig.getCipherCombo().getCryptorProvider(csprng).withKey(masterkeyClone)) {
-			check.check(vaultPath, vaultConfig, masterkeyClone, cryptor, result -> { //TODO: why using both masterkey and Cryptor ??
+			check.check(vaultPath, vaultConfig, masterkeyClone, cryptor, result -> { //TODO: API-question about using Masterkey _and_ cryptor
 				if (isCancelled()) {
 					throw new CancellationException();
 				}

From f827b1fc89dc70a43ed543aaef4bd438e3298e43 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 29 Apr 2021 16:31:05 +0200
Subject: [PATCH 09/67] Refactor HealthCheckTask execution: * new class
 HealthCheckSupervisor which encapsulates execution of all selected health
 checks * checkControllor only users supervisor

---
 .../ui/controls/FontAwesome5Icon.java         |  1 +
 .../ui/health/CheckController.java            | 96 +++++++++----------
 .../cryptomator/ui/health/CheckListCell.java  |  3 +-
 .../ui/health/HealthCheckModule.java          |  8 --
 .../ui/health/HealthCheckSupervisor.java      | 80 ++++++++++++++++
 .../ui/health/HealthCheckTask.java            | 32 ++++++-
 .../ui/src/main/resources/css/light_theme.css | 48 ++++++++++
 .../src/main/resources/fxml/health_check.fxml | 29 ++++--
 8 files changed, 224 insertions(+), 73 deletions(-)
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckSupervisor.java

diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
index f4d0d058a..e48818c1e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
@@ -6,6 +6,7 @@ package org.cryptomator.ui.controls;
 public enum FontAwesome5Icon {
 	ANCHOR("\uF13D"), //
 	ARROW_UP("\uF062"), //
+	BAN("\uF05E"), //
 	BUG("\uF188"), //
 	CHECK("\uF00C"), //
 	COG("\uF013"), //
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
index 40287a6ca..571a447b5 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
@@ -2,106 +2,98 @@ package org.cryptomator.ui.health;
 
 import com.tobiasdiez.easybind.EasyBind;
 import com.tobiasdiez.easybind.optional.OptionalBinding;
-import dagger.Lazy;
-import org.cryptomator.cryptofs.VaultConfig;
 import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanExpression;
-import javafx.beans.binding.ObjectBinding;
+import javafx.beans.binding.Binding;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.concurrent.Worker;
 import javafx.fxml.FXML;
 import javafx.scene.control.ListView;
-import java.util.Collection;
-import java.util.Objects;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicReference;
 
 @HealthCheckScoped
 public class CheckController implements FxController {
 
-	private final VaultConfig vaultConfig;
-	private final Runnable masterkeyDestructor;
-	private final ExecutorService executor;
+	private final HealthCheckSupervisor supervisor;
+	private final ExecutorService executorService;
 	private final ObjectProperty<HealthCheckTask> selectedTask;
-	private final ObservableList<HealthCheckTask> tasks;
-	private final ObjectBinding<ObservableList<DiagnosticResult>> selectedResults;
+	private final Binding<ObservableList<DiagnosticResult>> selectedResults;
 	private final OptionalBinding<Worker.State> selectedTaskState;
-	private final BooleanExpression ready;
-	private final BooleanExpression running;
+	private final Binding<String> selectedTaskName;
+	private final Binding<String> selectedTaskDescription;
+	private final ReadOnlyBooleanProperty running;
 
+	/* FXML */
 	public ListView<HealthCheckTask> checksListView;
-	public ListView<DiagnosticResult> resultsListView;
+	public TableView<DiagnosticResult> resultsTableView;
+	public TableColumn<DiagnosticResult, String> resultDescriptionColumn;
+	public TableColumn<DiagnosticResult, String> resultSeverityColumn;
 
 
 	@Inject
-	public CheckController(AtomicReference<VaultConfig> vaultConfigRef, Runnable masterkeyDestructor, Lazy<Collection<HealthCheckTask>> tasks, ObjectProperty<HealthCheckTask> selectedTask) {
-		this.vaultConfig = Objects.requireNonNull(vaultConfigRef.get());
-		this.masterkeyDestructor = masterkeyDestructor;
-		this.executor = Executors.newSingleThreadExecutor();
-		this.selectedTask = selectedTask;
-		this.selectedResults = Bindings.createObjectBinding(this::getSelectedResults, selectedTask);
+	public CheckController(HealthCheckSupervisor supervisor, ExecutorService executorService) {
+		this.supervisor = supervisor;
+		this.executorService = executorService;
+		this.selectedTask = new SimpleObjectProperty<>();
+		this.selectedResults = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::results).orElse(FXCollections.emptyObservableList());
 		this.selectedTaskState = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::stateProperty);
-		this.ready = BooleanExpression.booleanExpression(selectedTaskState.map(Worker.State.READY::equals).orElse(false));
-		this.running = BooleanExpression.booleanExpression(selectedTaskState.map(Worker.State.RUNNING::equals).orElse(false));
-		this.tasks = FXCollections.observableArrayList(tasks.get());
+		this.selectedTaskName = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::getTitle).orElse("");
+		this.selectedTaskDescription = EasyBind.wrapNullable(selectedTask).map(task -> task.getCheck().toString()).orElse("");
+		this.running = supervisor.runningProperty();
 	}
 
 	@FXML
 	public void initialize() {
-		checksListView.setItems(tasks);
+		checksListView.setItems(FXCollections.observableArrayList(supervisor.getTasks()));
 		checksListView.setCellFactory(ignored -> new CheckListCell());
-		resultsListView.itemsProperty().bind(selectedResults);
-		resultsListView.setCellFactory(ignored -> new ResultListCell());
-		selectedTask.bind(checksListView.getSelectionModel().selectedItemProperty());
 		checksListView.getSelectionModel().select(0);
+		selectedTask.bind(checksListView.getSelectionModel().selectedItemProperty());
 
-		tasks.forEach(task -> executor.execute(task));
-
-		//ensure that at the end the masterkey is destroyed
-		executor.submit(masterkeyDestructor);
+		resultsTableView.itemsProperty().bind(selectedResults);
+		resultDescriptionColumn.setCellValueFactory(cellFeatures -> new SimpleStringProperty(cellFeatures.getValue().toString()));
+		resultSeverityColumn.setCellValueFactory(cellFeatures -> new SimpleStringProperty(cellFeatures.getValue().getServerity().name()));
+		executorService.execute(supervisor);
 	}
 
 	@FXML
 	public void cancelCheck() {
-		//assert selectedTask.get().isRunning(); Replace with something like executor.isRunning()
-		executor.shutdownNow();
-		masterkeyDestructor.run();
+		assert running.get();
+		supervisor.cancel(true);
 	}
 
-	/* Getter/Setter */
 
-	public VaultConfig getVaultConfig() {
-		return vaultConfig;
-	}
+	/* Getter&Setter */
 
 	public boolean isRunning() {
 		return running.get();
 	}
 
-	public BooleanExpression runningProperty() {
+	public ReadOnlyBooleanProperty runningProperty() {
 		return running;
 	}
 
-	public boolean isReady() {
-		return ready.get();
+	public Binding<String> selectedTaskNameProperty() {
+		return selectedTaskName;
 	}
 
-	public BooleanExpression readyProperty() {
-		return ready;
+	public String isSelectedTaskName() {
+		return selectedTaskName.getValue();
 	}
 
-	private ObservableList<DiagnosticResult> getSelectedResults() {
-		if (selectedTask.get() == null) {
-			return FXCollections.emptyObservableList();
-		} else {
-			return selectedTask.get().results();
-		}
+	public Binding<String> selectedTaskDescriptionProperty() {
+		return selectedTaskDescription;
+	}
+
+	public String isSelectedTaskDescription() {
+		return selectedTaskDescription.getValue();
 	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
index a7da1c32e..d3f6712a4 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
@@ -36,7 +36,8 @@ class CheckListCell extends ListCell<HealthCheckTask> {
 		return switch (state) {
 			case READY, SCHEDULED -> FontAwesome5Icon.ANCHOR;
 			case RUNNING -> FontAwesome5Icon.SPINNER;
-			case FAILED, CANCELLED -> FontAwesome5Icon.EXCLAMATION_TRIANGLE;
+			case FAILED -> FontAwesome5Icon.EXCLAMATION_TRIANGLE;
+			case CANCELLED -> FontAwesome5Icon.BAN;
 			case SUCCEEDED -> FontAwesome5Icon.CHECK;
 		};
 	}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
index dc587fdbe..281af947d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
@@ -20,8 +20,6 @@ import org.cryptomator.ui.keyloading.KeyLoadingStrategy;
 import org.cryptomator.ui.mainwindow.MainWindow;
 
 import javax.inject.Provider;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.Scene;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
@@ -36,12 +34,6 @@ import java.util.concurrent.atomic.AtomicReference;
 @Module(subcomponents = {KeyLoadingComponent.class})
 abstract class HealthCheckModule {
 
-	@Provides
-	@HealthCheckScoped
-	static ObjectProperty<HealthCheckTask> selectedHealthCheckTask() {
-		return new SimpleObjectProperty<>();
-	}
-
 	@Provides
 	@HealthCheckScoped
 	static AtomicReference<Masterkey> provideMasterkeyRef() {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckSupervisor.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckSupervisor.java
new file mode 100644
index 000000000..5b42429fd
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckSupervisor.java
@@ -0,0 +1,80 @@
+package org.cryptomator.ui.health;
+
+import dagger.Lazy;
+
+import javax.inject.Inject;
+import javafx.concurrent.Task;
+import java.util.Collection;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicReference;
+
+@HealthCheckScoped
+public class HealthCheckSupervisor extends Task<Void> {
+
+	private final ExecutorService executor;
+	private final Lazy<Collection<HealthCheckTask>> lazyTasks;
+	private final Runnable masterkeyDestructor;
+	private final AtomicReference<HealthCheckTask> currentTask;
+	private final ConcurrentLinkedQueue<HealthCheckTask> remainingTasks;
+
+	@Inject
+	public HealthCheckSupervisor(Lazy<Collection<HealthCheckTask>> lazyTasks, Runnable masterkeyDestructor) {
+		this.lazyTasks = lazyTasks;
+		this.masterkeyDestructor = masterkeyDestructor;
+		this.currentTask = new AtomicReference<>(null);
+		this.executor = Executors.newSingleThreadExecutor();
+		this.remainingTasks = new ConcurrentLinkedQueue<>();
+	}
+
+	public Void call() {
+		remainingTasks.addAll(lazyTasks.get());
+		while (!remainingTasks.isEmpty()) {
+			final var task = remainingTasks.remove();
+			currentTask.set(task);
+			executor.execute(task); //TODO: think about if we set the scheduled property for all tasks?
+			try {
+				task.get();
+			} catch (InterruptedException e) {
+				executor.shutdownNow();
+				cleanup();
+				;
+				Thread.currentThread().interrupt(); //TODO: do we need this?
+			} catch (ExecutionException e) {
+				e.printStackTrace();
+			} catch (CancellationException e) {
+				// ok
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public boolean cancel(boolean mayInterruptIfRunning) {
+		cleanup();
+		currentTask.get().cancel(mayInterruptIfRunning);
+		if (mayInterruptIfRunning) {
+			executor.shutdownNow();
+		} else {
+			executor.shutdown();
+		}
+		return super.cancel(mayInterruptIfRunning);
+	}
+
+	private void cleanup() {
+		remainingTasks.forEach(task -> task.cancel(false));
+		remainingTasks.clear();
+	}
+
+	@Override
+	protected void done() {
+		masterkeyDestructor.run(); //TODO: if we destroy it, no check can rerun
+	}
+
+	public Collection<HealthCheckTask> getTasks() {
+		return lazyTasks.get();
+	}
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
index 686054205..56bcffc17 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
@@ -14,7 +14,9 @@ import javafx.concurrent.Task;
 import java.nio.file.Path;
 import java.security.SecureRandom;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.CancellationException;
+import java.util.concurrent.atomic.AtomicReference;
 
 class HealthCheckTask extends Task<Void> {
 
@@ -27,6 +29,9 @@ class HealthCheckTask extends Task<Void> {
 	private final HealthCheck check;
 	private final ObservableList<DiagnosticResult> results;
 
+	private final AtomicReference<State> endState;
+	private final AtomicReference<Throwable> exceptionOnDone;
+
 	public HealthCheckTask(Path vaultPath, VaultConfig vaultConfig, Masterkey masterkey, SecureRandom csprng, HealthCheck check) {
 		this.vaultPath = Objects.requireNonNull(vaultPath);
 		this.vaultConfig = Objects.requireNonNull(vaultConfig);
@@ -34,6 +39,11 @@ class HealthCheckTask extends Task<Void> {
 		this.csprng = Objects.requireNonNull(csprng);
 		this.check = Objects.requireNonNull(check);
 		this.results = FXCollections.observableArrayList();
+		this.endState = new AtomicReference<>(null);
+		this.exceptionOnDone = new AtomicReference<>();
+
+		var tmp = check.identifier();
+		updateTitle(tmp.substring(tmp.length() - 10)); //TODO: new method with reliable logic
 	}
 
 	@Override
@@ -46,9 +56,14 @@ class HealthCheckTask extends Task<Void> {
 				}
 				// FIXME: slowdown for demonstration purposes only:
 				try {
-					Thread.sleep(200);
+					Thread.sleep(2000);
 				} catch (InterruptedException e) {
-					e.printStackTrace();
+					if(isCancelled()) {
+						return;
+					} else {
+						Thread.currentThread().interrupt();
+						throw new RuntimeException(e);
+					}
 				}
 				Platform.runLater(() -> results.add(result));
 			});
@@ -64,6 +79,12 @@ class HealthCheckTask extends Task<Void> {
 	@Override
 	protected void done() {
 		LOG.info("finished {}", check.identifier());
+		Platform.runLater(() -> endState.set(getState()));
+	}
+
+	@Override
+	protected void failed() {
+		Platform.runLater(() -> exceptionOnDone.set(getException()));
 	}
 
 	/* Getter */
@@ -76,4 +97,11 @@ class HealthCheckTask extends Task<Void> {
 		return check;
 	}
 
+	public State getEndState() {
+		return endState.get();
+	}
+
+	public Optional<Throwable> getExceptionOnDone() {
+		return Optional.ofNullable(exceptionOnDone.get());
+	}
 }
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index b0ba8ac8c..34b388c3f 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -947,3 +947,51 @@
 	-fx-fill: linear-gradient(to bottom, PRIMARY, transparent);
 	-fx-stroke: transparent;
 }
+
+/*****
+	Sanitizer Results
+	TODO: make it pretty and copy it to dark theme
+****/
+
+.table-view{
+   -fx-background-color: transparent;
+}
+
+.table-view:focused{
+    -fx-background-color: transparent;
+}
+
+.table-view .column-header-background{
+    -fx-background-color: linear-gradient(#131313 0%, #424141 100%);
+}
+
+.table-view .column-header-background .label{
+    -fx-background-color: transparent;
+    -fx-text-fill: white;
+}
+
+.table-view .column-header {
+    -fx-background-color: transparent;
+}
+
+.table-view .table-cell{
+    -fx-text-fill: white;
+}
+
+.table-row-cell{
+    -fx-background-color: #616161;
+    -fx-background-insets: 0, 0 0 1 0;
+    -fx-padding: 0.0em;
+}
+
+.table-row-cell:odd{
+    -fx-background-color: #424242;
+    -fx-background-insets: 0, 0 0 1 0;
+    -fx-padding: 0.0em;
+}
+
+.table-row-cell:selected {
+    -fx-background-color: #005797;
+    -fx-background-insets: 0;
+    -fx-background-radius: 1;
+}
diff --git a/main/ui/src/main/resources/fxml/health_check.fxml b/main/ui/src/main/resources/fxml/health_check.fxml
index 786df27e7..131d025ab 100644
--- a/main/ui/src/main/resources/fxml/health_check.fxml
+++ b/main/ui/src/main/resources/fxml/health_check.fxml
@@ -2,10 +2,13 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Text?>
 <HBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.health.CheckController"
@@ -17,15 +20,21 @@
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
-		<ListView fx:id="checksListView"/>
-		<VBox>
-			<ListView fx:id="resultsListView"/>
-
-			<ButtonBar buttonMinWidth="120" buttonOrder="+CA">
-				<buttons>
-					<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" onAction="#cancelCheck" disable="${!controller.running}"/>
-				</buttons>
-			</ButtonBar>
+		<VBox minWidth="80">
+			<Label fx:id="listHeading" text="Health checks"/>
+			<ListView fx:id="checksListView"/>
+			<Button text="%generic.button.cancel" onAction="#cancelCheck" disable="${!controller.running}" maxWidth="Infinity"/>
+		</VBox>
+		<VBox spacing="6">
+			<Label fx:id="checkTitle" styleClass="label-large" text="${controller.selectedTaskName}" />
+			<Text fx:id="checkDescription" styleClass="label" text="${controller.selectedTaskDescription}" />
+			<TableView fx:id="resultsTableView" >
+				<columns>
+					<TableColumn fx:id="resultDescriptionColumn" text="Info" editable="false"/>
+					<TableColumn fx:id="resultSeverityColumn" text="Severity" editable="false"/>
+					<!--TableColumn fx:id="resultAction" text="Action" /-->
+				</columns>
+			</TableView>
 		</VBox>
 	</children>
 </HBox>

From e2565097cde8c3912ed76105bd7bafd7cf3ee438 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 29 Apr 2021 16:31:39 +0200
Subject: [PATCH 10/67] add function to export a report of health checks

---
 .../ui/health/CheckController.java            |  9 +-
 .../ui/health/HealthReportWriteTask.java      | 91 +++++++++++++++++++
 .../src/main/resources/fxml/health_check.fxml |  1 +
 3 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/HealthReportWriteTask.java

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
index 571a447b5..2af708589 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
@@ -24,6 +24,7 @@ import java.util.concurrent.ExecutorService;
 public class CheckController implements FxController {
 
 	private final HealthCheckSupervisor supervisor;
+	private final HealthReportWriteTask reportWriter;
 	private final ExecutorService executorService;
 	private final ObjectProperty<HealthCheckTask> selectedTask;
 	private final Binding<ObservableList<DiagnosticResult>> selectedResults;
@@ -40,8 +41,9 @@ public class CheckController implements FxController {
 
 
 	@Inject
-	public CheckController(HealthCheckSupervisor supervisor, ExecutorService executorService) {
+	public CheckController(HealthCheckSupervisor supervisor, HealthReportWriteTask reportWriteTask, ExecutorService executorService) {
 		this.supervisor = supervisor;
+		this.reportWriter = reportWriteTask;
 		this.executorService = executorService;
 		this.selectedTask = new SimpleObjectProperty<>();
 		this.selectedResults = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::results).orElse(FXCollections.emptyObservableList());
@@ -71,6 +73,11 @@ public class CheckController implements FxController {
 	}
 
 
+	@FXML
+	public void exportResults() {
+		executorService.execute(reportWriter);
+	}
+
 	/* Getter&Setter */
 
 	public boolean isRunning() {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthReportWriteTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthReportWriteTask.java
new file mode 100644
index 000000000..efaead6e0
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthReportWriteTask.java
@@ -0,0 +1,91 @@
+package org.cryptomator.ui.health;
+
+import dagger.Lazy;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.cryptomator.common.Environment;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.cryptofs.VaultConfig;
+
+import javax.inject.Inject;
+import javafx.concurrent.Task;
+import javafx.concurrent.Worker;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.ByteChannel;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+
+@HealthCheckScoped
+public class HealthReportWriteTask extends Task<Void> {
+
+	private static final String REPORT_HEADER = """
+			**************************************
+			*   Cryptomator Vault Health Report  *
+			**************************************
+			Analyzed vault: %s (Current name \"%s\")
+			Vault storage path: %s
+				
+			""";
+	private static final String REPORT_CHECK_SUCCESS = "\tCheck %s successful. Results:\n";
+	private static final String REPORT_CHECK_RESULT = "\t\t %s - %s\n";
+	private static final String REPORT_CHECK_CANCELED = "\tCheck %s canceled.\n";
+	private static final String REPORT_CHECK_FAILED = "\tCheck %s failed.\n";
+
+	private final Vault vault;
+	private final VaultConfig vaultConfig;
+	private final Lazy<Collection<HealthCheckTask>> tasks;
+	private final Environment env;
+
+	@Inject
+	public HealthReportWriteTask(@HealthCheckWindow Vault vault, AtomicReference<VaultConfig> vaultConfigRef, Lazy<Collection<HealthCheckTask>> tasks, Environment env) {
+		this.vault = vault;
+		this.vaultConfig = Objects.requireNonNull(vaultConfigRef.get());
+		this.tasks = tasks;
+		this.env = env;
+	}
+
+	@Override
+	protected Void call() throws IOException {
+		var path = env.getLogDir().orElse(Path.of(System.getProperty("user.home"))).resolve("healthReport_" + vault.getDisplayName() + "(" + vaultConfig.getId() + ")" + ".log");
+		final var tasks = this.tasks.get();
+		//use file channel, since results can be pretty big
+		try (var channel = Files.newByteChannel(path, StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING)) {
+			internalWrite(channel, String.format(REPORT_HEADER, vaultConfig.getId(), vault.getDisplayName(), vault.getPath()));
+			for (var task : tasks) {
+				final var state = task.getEndState();
+				if (state == Worker.State.SUCCEEDED) {
+					internalWrite(channel, REPORT_CHECK_SUCCESS, task.getCheck().identifier());
+					for (var result : task.results()) {
+						internalWrite(channel, REPORT_CHECK_RESULT, result.getServerity(), result);
+					}
+				} else if (state == Worker.State.CANCELLED) {
+					internalWrite(channel, REPORT_CHECK_CANCELED, task.getCheck().identifier());
+				} else if (state == Worker.State.FAILED) {
+					internalWrite(channel, REPORT_CHECK_FAILED, task.getCheck().identifier());
+					internalWrite(channel, prepareFailureMsg(task));
+				} else {
+					throw new IllegalStateException("Cannot export unfinished task");
+				}
+			}
+		}
+		return null;
+	}
+
+	private void internalWrite(ByteChannel channel, String s, Object... formatArguments) throws IOException {
+		channel.write(ByteBuffer.wrap(s.formatted(formatArguments).getBytes(StandardCharsets.UTF_8)));
+	}
+
+	private String prepareFailureMsg(HealthCheckTask task) {
+		return task.getExceptionOnDone() //
+				.map(t -> ExceptionUtils.getStackTrace(t)).orElse("Unknown reason of failure.") //
+				.lines().map(line -> "\t\t" + line + "\n") //
+				.collect(Collectors.joining());
+	}
+
+}
diff --git a/main/ui/src/main/resources/fxml/health_check.fxml b/main/ui/src/main/resources/fxml/health_check.fxml
index 131d025ab..7ccc88d73 100644
--- a/main/ui/src/main/resources/fxml/health_check.fxml
+++ b/main/ui/src/main/resources/fxml/health_check.fxml
@@ -24,6 +24,7 @@
 			<Label fx:id="listHeading" text="Health checks"/>
 			<ListView fx:id="checksListView"/>
 			<Button text="%generic.button.cancel" onAction="#cancelCheck" disable="${!controller.running}" maxWidth="Infinity"/>
+			<Button text="Export Results" onAction="#exportResults" disable="${controller.running}" maxWidth="Infinity"/>
 		</VBox>
 		<VBox spacing="6">
 			<Label fx:id="checkTitle" styleClass="label-large" text="${controller.selectedTaskName}" />

From 54128a0016eda70f01f5e52f18be4ad08a063a63 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 30 Apr 2021 11:32:56 +0200
Subject: [PATCH 11/67] Refined exportet health report

---
 .../ui/health/HealthReportWriteTask.java      | 51 ++++++++++++-------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthReportWriteTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthReportWriteTask.java
index efaead6e0..169a00e62 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthReportWriteTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthReportWriteTask.java
@@ -5,10 +5,10 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptofs.VaultConfig;
+import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 
 import javax.inject.Inject;
 import javafx.concurrent.Task;
-import javafx.concurrent.Worker;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.ByteChannel;
@@ -16,6 +16,9 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
@@ -30,12 +33,15 @@ public class HealthReportWriteTask extends Task<Void> {
 			**************************************
 			Analyzed vault: %s (Current name \"%s\")
 			Vault storage path: %s
-				
 			""";
-	private static final String REPORT_CHECK_SUCCESS = "\tCheck %s successful. Results:\n";
-	private static final String REPORT_CHECK_RESULT = "\t\t %s - %s\n";
-	private static final String REPORT_CHECK_CANCELED = "\tCheck %s canceled.\n";
-	private static final String REPORT_CHECK_FAILED = "\tCheck %s failed.\n";
+	private static final String REPORT_CHECK_HEADER = """
+			   
+			   
+			Check %s
+			------------------------------
+			""";
+	private static final String REPORT_CHECK_RESULT = "%s - %s";
+	private static final DateTimeFormatter TIME_STAMP = DateTimeFormatter.ofPattern("yyyyMMdd-HHmmss").withZone(ZoneId.systemDefault());
 
 	private final Vault vault;
 	private final VaultConfig vaultConfig;
@@ -52,25 +58,27 @@ public class HealthReportWriteTask extends Task<Void> {
 
 	@Override
 	protected Void call() throws IOException {
-		var path = env.getLogDir().orElse(Path.of(System.getProperty("user.home"))).resolve("healthReport_" + vault.getDisplayName() + "(" + vaultConfig.getId() + ")" + ".log");
+		var path = env.getLogDir().orElse(Path.of(System.getProperty("user.home"))).resolve("healthReport_" + vault.getDisplayName() + "_" + TIME_STAMP.format(Instant.now()) + ".log");
 		final var tasks = this.tasks.get();
 		//use file channel, since results can be pretty big
 		try (var channel = Files.newByteChannel(path, StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING)) {
 			internalWrite(channel, String.format(REPORT_HEADER, vaultConfig.getId(), vault.getDisplayName(), vault.getPath()));
 			for (var task : tasks) {
+				internalWrite(channel, REPORT_CHECK_HEADER, task.getCheck().identifier());
 				final var state = task.getEndState();
-				if (state == Worker.State.SUCCEEDED) {
-					internalWrite(channel, REPORT_CHECK_SUCCESS, task.getCheck().identifier());
-					for (var result : task.results()) {
-						internalWrite(channel, REPORT_CHECK_RESULT, result.getServerity(), result);
+				switch (state) {
+					case SUCCEEDED -> {
+						internalWrite(channel, "STATUS: SUCCESS\nRESULTS:\n");
+						for (var result : task.results()) {
+							internalWrite(channel, REPORT_CHECK_RESULT, severityToString(result.getServerity()), result);
+						}
 					}
-				} else if (state == Worker.State.CANCELLED) {
-					internalWrite(channel, REPORT_CHECK_CANCELED, task.getCheck().identifier());
-				} else if (state == Worker.State.FAILED) {
-					internalWrite(channel, REPORT_CHECK_FAILED, task.getCheck().identifier());
-					internalWrite(channel, prepareFailureMsg(task));
-				} else {
-					throw new IllegalStateException("Cannot export unfinished task");
+					case CANCELLED -> internalWrite(channel, "STATUS: CANCELED\n");
+					case FAILED -> {
+						internalWrite(channel, "STATUS: FAILED\nREASON:\n", task.getCheck().identifier());
+						internalWrite(channel, prepareFailureMsg(task));
+					}
+					case READY, RUNNING, SCHEDULED -> throw new IllegalStateException("Cannot export unfinished task");
 				}
 			}
 		}
@@ -81,6 +89,13 @@ public class HealthReportWriteTask extends Task<Void> {
 		channel.write(ByteBuffer.wrap(s.formatted(formatArguments).getBytes(StandardCharsets.UTF_8)));
 	}
 
+	private String severityToString(DiagnosticResult.Severity s) {
+		return switch (s) {
+			case GOOD, INFO, WARN -> s.name();
+			case CRITICAL -> "CRIT";
+		};
+	}
+
 	private String prepareFailureMsg(HealthCheckTask task) {
 		return task.getExceptionOnDone() //
 				.map(t -> ExceptionUtils.getStackTrace(t)).orElse("Unknown reason of failure.") //

From 89e680fb45eede96575e5f1a4c44fe3eef2d9f73 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 30 Apr 2021 11:42:31 +0200
Subject: [PATCH 12/67] reveal report storage location when task is finished.

---
 .../ui/health/HealthReportWriteTask.java      | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthReportWriteTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthReportWriteTask.java
index 169a00e62..8ed4ded6f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthReportWriteTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthReportWriteTask.java
@@ -4,8 +4,10 @@ import dagger.Lazy;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.common.vaults.Volume;
 import org.cryptomator.cryptofs.VaultConfig;
 import org.cryptomator.cryptofs.health.api.DiagnosticResult;
+import org.cryptomator.ui.common.HostServiceRevealer;
 
 import javax.inject.Inject;
 import javafx.concurrent.Task;
@@ -46,19 +48,20 @@ public class HealthReportWriteTask extends Task<Void> {
 	private final Vault vault;
 	private final VaultConfig vaultConfig;
 	private final Lazy<Collection<HealthCheckTask>> tasks;
-	private final Environment env;
+	private final Path path;
+	private final HostServiceRevealer revealer;
 
 	@Inject
-	public HealthReportWriteTask(@HealthCheckWindow Vault vault, AtomicReference<VaultConfig> vaultConfigRef, Lazy<Collection<HealthCheckTask>> tasks, Environment env) {
+	public HealthReportWriteTask(@HealthCheckWindow Vault vault, AtomicReference<VaultConfig> vaultConfigRef, Lazy<Collection<HealthCheckTask>> tasks, Environment env, HostServiceRevealer revealer) {
 		this.vault = vault;
 		this.vaultConfig = Objects.requireNonNull(vaultConfigRef.get());
 		this.tasks = tasks;
-		this.env = env;
+		this.revealer = revealer;
+		this.path = env.getLogDir().orElse(Path.of(System.getProperty("user.home"))).resolve("healthReport_" + vault.getDisplayName() + "_" + TIME_STAMP.format(Instant.now()) + ".log");
 	}
 
 	@Override
 	protected Void call() throws IOException {
-		var path = env.getLogDir().orElse(Path.of(System.getProperty("user.home"))).resolve("healthReport_" + vault.getDisplayName() + "_" + TIME_STAMP.format(Instant.now()) + ".log");
 		final var tasks = this.tasks.get();
 		//use file channel, since results can be pretty big
 		try (var channel = Files.newByteChannel(path, StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING)) {
@@ -103,4 +106,13 @@ public class HealthReportWriteTask extends Task<Void> {
 				.collect(Collectors.joining());
 	}
 
+	@Override
+	protected void succeeded() {
+		try {
+			revealer.reveal(path);
+		} catch (Volume.VolumeException e) {
+			//should not happen
+		}
+	}
+
 }

From 189699d3595c053279800b607da7a057239719cb Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 6 May 2021 15:44:27 +0200
Subject: [PATCH 13/67] sh*te happens

check value instead reference for null
---
 .../keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java
index 464671929..f8fbdd720 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java
@@ -92,7 +92,7 @@ public class MasterkeyFileLoadingStrategy implements KeyLoadingStrategy {
 	}
 
 	private Path getAlternateMasterkeyFilePath() throws UnlockCancelledException, InterruptedException {
-		if (filePath == null) {
+		if (filePath.get() == null) {
 			return switch (askUserForMasterkeyFilePath()) {
 				case MASTERKEYFILE_PROVIDED -> filePath.get();
 				case CANCELED -> throw new UnlockCancelledException("Choosing masterkey file cancelled.");

From 64d54133f8f25773af0bcfdc06361cb2d3ab9285 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Fri, 7 May 2021 15:51:47 +0200
Subject: [PATCH 14/67] split up check view: - checkListController is
 responsible for selecting and (batch)running checks - checkDetailController
 is responsible for displaying results

---
 main/pom.xml                                  |   2 +-
 .../org/cryptomator/ui/common/FxmlFile.java   |   2 +-
 .../cryptomator/ui/health/BatchService.java   |  36 ++++++
 ...roller.java => CheckDetailController.java} |  57 ++--------
 .../ui/health/CheckListController.java        | 105 ++++++++++++++++++
 .../ui/health/HealthCheckModule.java          |  52 +++++----
 .../ui/health/HealthCheckSupervisor.java      |  80 -------------
 .../ui/health/StartController.java            |  64 -----------
 .../src/main/resources/fxml/health_check.fxml |  41 -------
 .../resources/fxml/health_check_details.fxml  |  22 ++++
 .../resources/fxml/health_check_list.fxml     |  39 +++++++
 .../src/main/resources/fxml/health_start.fxml |  15 +--
 .../main/resources/license/THIRD-PARTY.txt    |  10 +-
 13 files changed, 251 insertions(+), 274 deletions(-)
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/BatchService.java
 rename main/ui/src/main/java/org/cryptomator/ui/health/{CheckController.java => CheckDetailController.java} (56%)
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
 delete mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckSupervisor.java
 delete mode 100644 main/ui/src/main/resources/fxml/health_check.fxml
 create mode 100644 main/ui/src/main/resources/fxml/health_check_details.fxml
 create mode 100644 main/ui/src/main/resources/fxml/health_check_list.fxml

diff --git a/main/pom.xml b/main/pom.xml
index 848eddaf0..8c4ad71d3 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -25,7 +25,7 @@
 		<project.jdk.version>16</project.jdk.version>
 
 		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>2.1.0-beta4</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>2.1.0-beta5</cryptomator.cryptofs.version>
 		<cryptomator.integrations.version>1.0.0-beta2</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>1.0.0-beta2</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>1.0.0-beta2</cryptomator.integrations.mac.version>
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
index a1773d7af..32c142762 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
@@ -12,7 +12,7 @@ public enum FxmlFile {
 	ERROR("/fxml/error.fxml"), //
 	FORGET_PASSWORD("/fxml/forget_password.fxml"), //
 	HEALTH_START("/fxml/health_start.fxml"), //
-	HEALTH_CHECK("/fxml/health_check.fxml"), //
+	HEALTH_CHECK("/fxml/health_check_list.fxml"), //
 	LOCK_FORCED("/fxml/lock_forced.fxml"), //
 	LOCK_FAILED("/fxml/lock_failed.fxml"), //
 	MAIN_WINDOW("/fxml/main_window.fxml"), //
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/BatchService.java b/main/ui/src/main/java/org/cryptomator/ui/health/BatchService.java
new file mode 100644
index 000000000..f3968c27d
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/BatchService.java
@@ -0,0 +1,36 @@
+package org.cryptomator.ui.health;
+
+import com.google.common.base.Preconditions;
+import com.google.common.base.Suppliers;
+import dagger.Lazy;
+
+import javax.inject.Inject;
+import javafx.concurrent.Service;
+import javafx.concurrent.Task;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;
+
+public class BatchService extends Service<Void> {
+
+	private final Iterator<HealthCheckTask> remainingTasks;
+
+	@Inject
+	public BatchService(Iterable<HealthCheckTask> tasks) {
+		this.remainingTasks = tasks.iterator();
+	}
+
+	@Override
+	protected Task<Void> createTask() {
+		Preconditions.checkState(remainingTasks.hasNext(), "No remaining tasks");
+		return remainingTasks.next();
+	}
+
+	@Override
+	protected void succeeded() {
+		if (remainingTasks.hasNext()) {
+			this.restart();
+		}
+	}
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
similarity index 56%
rename from main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
rename to main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
index 2af708589..7dd1603c9 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
@@ -8,99 +8,56 @@ import org.cryptomator.ui.common.FxController;
 import javax.inject.Inject;
 import javafx.beans.binding.Binding;
 import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.concurrent.Worker;
 import javafx.fxml.FXML;
-import javafx.scene.control.ListView;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
-import java.util.concurrent.ExecutorService;
 
-@HealthCheckScoped
-public class CheckController implements FxController {
+public class CheckDetailController implements FxController {
 
-	private final HealthCheckSupervisor supervisor;
-	private final HealthReportWriteTask reportWriter;
-	private final ExecutorService executorService;
-	private final ObjectProperty<HealthCheckTask> selectedTask;
 	private final Binding<ObservableList<DiagnosticResult>> selectedResults;
 	private final OptionalBinding<Worker.State> selectedTaskState;
 	private final Binding<String> selectedTaskName;
 	private final Binding<String> selectedTaskDescription;
-	private final ReadOnlyBooleanProperty running;
 
-	/* FXML */
-	public ListView<HealthCheckTask> checksListView;
 	public TableView<DiagnosticResult> resultsTableView;
 	public TableColumn<DiagnosticResult, String> resultDescriptionColumn;
 	public TableColumn<DiagnosticResult, String> resultSeverityColumn;
 
-
 	@Inject
-	public CheckController(HealthCheckSupervisor supervisor, HealthReportWriteTask reportWriteTask, ExecutorService executorService) {
-		this.supervisor = supervisor;
-		this.reportWriter = reportWriteTask;
-		this.executorService = executorService;
-		this.selectedTask = new SimpleObjectProperty<>();
+	public CheckDetailController(ObjectProperty<HealthCheckTask> selectedTask) {
 		this.selectedResults = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::results).orElse(FXCollections.emptyObservableList());
 		this.selectedTaskState = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::stateProperty);
 		this.selectedTaskName = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::getTitle).orElse("");
 		this.selectedTaskDescription = EasyBind.wrapNullable(selectedTask).map(task -> task.getCheck().toString()).orElse("");
-		this.running = supervisor.runningProperty();
 	}
 
 	@FXML
 	public void initialize() {
-		checksListView.setItems(FXCollections.observableArrayList(supervisor.getTasks()));
-		checksListView.setCellFactory(ignored -> new CheckListCell());
-		checksListView.getSelectionModel().select(0);
-		selectedTask.bind(checksListView.getSelectionModel().selectedItemProperty());
-
 		resultsTableView.itemsProperty().bind(selectedResults);
 		resultDescriptionColumn.setCellValueFactory(cellFeatures -> new SimpleStringProperty(cellFeatures.getValue().toString()));
 		resultSeverityColumn.setCellValueFactory(cellFeatures -> new SimpleStringProperty(cellFeatures.getValue().getServerity().name()));
-		executorService.execute(supervisor);
 	}
 
-	@FXML
-	public void cancelCheck() {
-		assert running.get();
-		supervisor.cancel(true);
-	}
+	/* Getter/Setter */
 
-
-	@FXML
-	public void exportResults() {
-		executorService.execute(reportWriter);
-	}
-
-	/* Getter&Setter */
-
-	public boolean isRunning() {
-		return running.get();
-	}
-
-	public ReadOnlyBooleanProperty runningProperty() {
-		return running;
+	public String getSelectedTaskName() {
+		return selectedTaskName.getValue();
 	}
 
 	public Binding<String> selectedTaskNameProperty() {
 		return selectedTaskName;
 	}
 
-	public String isSelectedTaskName() {
-		return selectedTaskName.getValue();
+	public String getSelectedTaskDescription() {
+		return selectedTaskDescription.getValue();
 	}
 
 	public Binding<String> selectedTaskDescriptionProperty() {
 		return selectedTaskDescription;
 	}
 
-	public String isSelectedTaskDescription() {
-		return selectedTaskDescription.getValue();
-	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
new file mode 100644
index 000000000..dc340001c
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
@@ -0,0 +1,105 @@
+package org.cryptomator.ui.health;
+
+import com.google.common.base.Preconditions;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.optional.OptionalBinding;
+import dagger.Lazy;
+import org.cryptomator.cryptofs.health.api.DiagnosticResult;
+import org.cryptomator.ui.common.FxController;
+
+import javax.inject.Inject;
+import javafx.beans.binding.Binding;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.concurrent.Worker;
+import javafx.fxml.FXML;
+import javafx.scene.control.ListView;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import java.util.Collection;
+import java.util.concurrent.ExecutorService;
+
+@HealthCheckScoped
+public class CheckListController implements FxController {
+
+	private final ObservableList<HealthCheckTask> tasks;
+	private final HealthReportWriteTask reportWriter;
+	private final ExecutorService executorService;
+	private final ObjectProperty<HealthCheckTask> selectedTask;
+	private final SimpleObjectProperty<Worker<?>> runningTask;
+	private final Binding<Boolean> running;
+	private final BooleanBinding anyCheckSelected;
+
+	/* FXML */
+	public ListView<HealthCheckTask> checksListView;
+
+	@Inject
+	public CheckListController(Lazy<Collection<HealthCheckTask>> tasks, HealthReportWriteTask reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService) {
+		this.tasks = FXCollections.observableArrayList(tasks.get());
+		this.reportWriter = reportWriteTask;
+		this.executorService = executorService;
+		this.selectedTask = selectedTask;
+		this.runningTask = new SimpleObjectProperty<>();
+		this.running = EasyBind.wrapNullable(runningTask).map(Worker::isRunning).orElse(false);
+		this.anyCheckSelected = selectedTask.isNotNull();
+	}
+
+	@FXML
+	public void initialize() {
+		checksListView.setItems(tasks);
+		checksListView.setCellFactory(ignored -> new CheckListCell());
+		selectedTask.bind(checksListView.getSelectionModel().selectedItemProperty());
+	}
+
+	@FXML
+	public synchronized void runSelectedChecks() {
+		Preconditions.checkState(runningTask.get() == null);
+		var batch = new BatchService(checksListView.getSelectionModel().getSelectedItems());
+		batch.setExecutor(executorService);
+		batch.start();
+		runningTask.set(batch);
+	}
+
+	@FXML
+	public synchronized void runAllChecks() {
+		Preconditions.checkState(runningTask.get() == null);
+		var batch = new BatchService(checksListView.getItems());
+		batch.setExecutor(executorService);
+		batch.start();
+		runningTask.set(batch);
+	}
+
+	@FXML
+	public synchronized void cancelCheck() {
+		Preconditions.checkState(runningTask.get() != null);
+		runningTask.get().cancel();
+	}
+
+	@FXML
+	public void exportResults() {
+		executorService.execute(reportWriter);
+	}
+
+	/* Getter/Setter */
+
+	public boolean isRunning() {
+		return running.getValue();
+	}
+
+	public Binding<Boolean> runningProperty() {
+		return running;
+	}
+
+	public boolean isAnyCheckSelected() {
+		return anyCheckSelected.get();
+	}
+
+	public BooleanBinding anyCheckSelectedProperty() {
+		return anyCheckSelected;
+	}
+
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
index 281af947d..fa9b69adc 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
@@ -20,11 +20,13 @@ import org.cryptomator.ui.keyloading.KeyLoadingStrategy;
 import org.cryptomator.ui.mainwindow.MainWindow;
 
 import javax.inject.Provider;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.value.ChangeListener;
 import javafx.scene.Scene;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import java.security.SecureRandom;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
@@ -40,12 +42,6 @@ abstract class HealthCheckModule {
 		return new AtomicReference<>();
 	}
 
-	@Provides
-	@HealthCheckScoped
-	static Runnable provideMasterkeyDestructor(AtomicReference<Masterkey> masterkeyRef) {
-		return () -> Optional.ofNullable(masterkeyRef.getAndSet(null)).ifPresent(Masterkey::destroy);
-	}
-
 	@Provides
 	@HealthCheckScoped
 	static AtomicReference<VaultConfig> provideVaultConfigRef() {
@@ -54,15 +50,21 @@ abstract class HealthCheckModule {
 
 	@Provides
 	@HealthCheckScoped
-	static Collection<HealthCheck> provideSelectedHealthChecks() {
-		return new ArrayList<>();
+	static Collection<HealthCheck> provideAvailableHealthChecks() {
+		return HealthCheck.allChecks();
+	}
+
+	@Provides
+	@HealthCheckScoped
+	static ObjectProperty<HealthCheckTask> provideSelectedHealthCheckTask() {
+		return new SimpleObjectProperty<>();
 	}
 
 	/* Only inject with Lazy-Wrapper!*/
 	@Provides
 	@HealthCheckScoped
-	static Collection<HealthCheckTask> provideSelectedHealthCheckTasks(Collection<HealthCheck> selectedHealthChecks, @HealthCheckWindow Vault vault, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, SecureRandom csprng) {
-		return selectedHealthChecks.stream().map(check -> new HealthCheckTask(vault.getPath(), vaultConfigRef.get(), masterkeyRef.get(), csprng, check)).toList();
+	static Collection<HealthCheckTask> provideAvailableHealthCheckTasks(Collection<HealthCheck> availableHealthChecks, @HealthCheckWindow Vault vault, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, SecureRandom csprng) {
+		return availableHealthChecks.stream().map(check -> new HealthCheckTask(vault.getPath(), vaultConfigRef.get(), masterkeyRef.get(), csprng, check)).toList();
 	}
 
 	@Provides
@@ -82,20 +84,26 @@ abstract class HealthCheckModule {
 	@Provides
 	@HealthCheckWindow
 	@HealthCheckScoped
-	static Stage provideStage(StageFactory factory, @MainWindow Stage owner, ResourceBundle resourceBundle, Runnable masterkeyDestructor) {
+	static Stage provideStage(StageFactory factory, @MainWindow Stage owner, ResourceBundle resourceBundle, ChangeListener<Boolean> showingListener) {
 		Stage stage = factory.create();
 		stage.setTitle(resourceBundle.getString("health.title"));
 		stage.setResizable(true);
 		stage.initModality(Modality.WINDOW_MODAL);
 		stage.initOwner(owner);
-		stage.showingProperty().addListener((observable, wasShowing, isShowing) -> {  //TODO: should we use showingProperty or onCloseRequest
-			if (!isShowing) {
-				masterkeyDestructor.run();
-			}
-		});
+		stage.showingProperty().addListener(showingListener); // bind masterkey lifecycle to window
 		return stage;
 	}
 
+	@Provides
+	@HealthCheckScoped
+	static ChangeListener<Boolean> provideWindowShowingChangeListener(AtomicReference<Masterkey> masterkey) {
+		return (observable, wasShowing, isShowing) -> {
+			if (!isShowing) {
+				Optional.ofNullable(masterkey.getAndSet(null)).ifPresent(Masterkey::destroy);
+			}
+		};
+	}
+
 	@Provides
 	@FxmlScene(FxmlFile.HEALTH_START)
 	@HealthCheckScoped
@@ -117,7 +125,13 @@ abstract class HealthCheckModule {
 
 	@Binds
 	@IntoMap
-	@FxControllerKey(CheckController.class)
-	abstract FxController bindCheckController(CheckController controller);
+	@FxControllerKey(CheckListController.class)
+	abstract FxController bindCheckController(CheckListController controller);
+
+	@Binds
+	@IntoMap
+	@FxControllerKey(CheckDetailController.class)
+	abstract FxController bindCheckDetailController(CheckDetailController controller);
+
 
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckSupervisor.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckSupervisor.java
deleted file mode 100644
index 5b42429fd..000000000
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckSupervisor.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.cryptomator.ui.health;
-
-import dagger.Lazy;
-
-import javax.inject.Inject;
-import javafx.concurrent.Task;
-import java.util.Collection;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicReference;
-
-@HealthCheckScoped
-public class HealthCheckSupervisor extends Task<Void> {
-
-	private final ExecutorService executor;
-	private final Lazy<Collection<HealthCheckTask>> lazyTasks;
-	private final Runnable masterkeyDestructor;
-	private final AtomicReference<HealthCheckTask> currentTask;
-	private final ConcurrentLinkedQueue<HealthCheckTask> remainingTasks;
-
-	@Inject
-	public HealthCheckSupervisor(Lazy<Collection<HealthCheckTask>> lazyTasks, Runnable masterkeyDestructor) {
-		this.lazyTasks = lazyTasks;
-		this.masterkeyDestructor = masterkeyDestructor;
-		this.currentTask = new AtomicReference<>(null);
-		this.executor = Executors.newSingleThreadExecutor();
-		this.remainingTasks = new ConcurrentLinkedQueue<>();
-	}
-
-	public Void call() {
-		remainingTasks.addAll(lazyTasks.get());
-		while (!remainingTasks.isEmpty()) {
-			final var task = remainingTasks.remove();
-			currentTask.set(task);
-			executor.execute(task); //TODO: think about if we set the scheduled property for all tasks?
-			try {
-				task.get();
-			} catch (InterruptedException e) {
-				executor.shutdownNow();
-				cleanup();
-				;
-				Thread.currentThread().interrupt(); //TODO: do we need this?
-			} catch (ExecutionException e) {
-				e.printStackTrace();
-			} catch (CancellationException e) {
-				// ok
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public boolean cancel(boolean mayInterruptIfRunning) {
-		cleanup();
-		currentTask.get().cancel(mayInterruptIfRunning);
-		if (mayInterruptIfRunning) {
-			executor.shutdownNow();
-		} else {
-			executor.shutdown();
-		}
-		return super.cancel(mayInterruptIfRunning);
-	}
-
-	private void cleanup() {
-		remainingTasks.forEach(task -> task.cancel(false));
-		remainingTasks.clear();
-	}
-
-	@Override
-	protected void done() {
-		masterkeyDestructor.run(); //TODO: if we destroy it, no check can rerun
-	}
-
-	public Collection<HealthCheckTask> getTasks() {
-		return lazyTasks.get();
-	}
-}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
index a614da59c..469503732 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
@@ -44,8 +44,6 @@ public class StartController implements FxController {
 	private static final Logger LOG = LoggerFactory.getLogger(StartController.class);
 
 	private final Stage window;
-	private final Collection<HealthCheck> availableChecks;
-	private final Map<HealthCheck, BooleanProperty> availableCheckListSelectProperties;
 	private final Optional<VaultConfig.UnverifiedVaultConfig> unverifiedVaultConfig;
 	private final KeyLoadingStrategy keyLoadingStrategy;
 	private final ExecutorService executor;
@@ -55,11 +53,6 @@ public class StartController implements FxController {
 	private final Lazy<Scene> checkScene;
 
 	/* FXML */
-	public ListView availableChecksList;
-	public RadioButton customCheckSetButton;
-	public RadioButton quickCheckSetButton;
-	public RadioButton fullCheckSetButton;
-	public ToggleGroup checksSetToggleGroup;
 
 	@Inject
 	public StartController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window, @HealthCheckWindow KeyLoadingStrategy keyLoadingStrategy, ExecutorService executor, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, Collection<HealthCheck> selectedChecks, @FxmlScene(FxmlFile.HEALTH_CHECK) Lazy<Scene> checkScene) {
@@ -71,31 +64,6 @@ public class StartController implements FxController {
 		this.vaultConfigRef = vaultConfigRef;
 		this.selectedChecks = selectedChecks;
 		this.checkScene = checkScene;
-		this.availableChecks = HealthCheck.allChecks();
-		this.availableCheckListSelectProperties = new HashMap<>();
-
-		availableChecks.forEach(check -> availableCheckListSelectProperties.put(check, new SimpleBooleanProperty(false)));
-	}
-
-	public void initialize() {
-		availableChecksList.setItems(FXCollections.observableList(availableChecks.stream().toList()));
-		availableChecksList.setCellFactory(CheckBoxListCell.forListView(availableCheckListSelectProperties::get));
-		availableChecksList.setEditable(false);
-
-		var availableCheckIds = availableChecks.stream().map(HealthCheck::identifier).toList();
-
-		if (PredefinedCheckSet.QUICK.getCheckIds().stream().anyMatch(checkId -> !availableCheckIds.contains(checkId))) {
-			quickCheckSetButton.setVisible(false);
-			quickCheckSetButton.setManaged(false);
-		}
-		if (PredefinedCheckSet.FULL.getCheckIds().stream().anyMatch(checkId -> !availableCheckIds.contains(checkId))) {
-			fullCheckSetButton.setVisible(false);
-			fullCheckSetButton.setManaged(false);
-		}
-
-		quickCheckSetButton.setUserData(PredefinedCheckSet.QUICK);
-		fullCheckSetButton.setUserData(PredefinedCheckSet.FULL);
-		customCheckSetButton.setUserData(PredefinedCheckSet.CUSTOM);
 	}
 
 	@FXML
@@ -106,15 +74,6 @@ public class StartController implements FxController {
 
 	@FXML
 	public void next() {
-		switch ((PredefinedCheckSet) checksSetToggleGroup.getSelectedToggle().getUserData()) {
-			case FULL -> selectedChecks.addAll(availableChecks);
-			case QUICK -> selectedChecks.addAll(availableChecks.stream().filter(check -> PredefinedCheckSet.QUICK.getCheckIds().contains(check.identifier())).toList());
-			case CUSTOM -> availableCheckListSelectProperties.forEach((check, selected) -> {
-				if (selected.get()) {
-					selectedChecks.add(check);
-				}
-			});
-		}
 		LOG.trace("StartController.next()");
 		executor.submit(this::loadKey);
 	}
@@ -166,27 +125,4 @@ public class StartController implements FxController {
 		return unverifiedVaultConfig.isEmpty();
 	}
 
-	public BooleanBinding anyCheckSetSelectedProperty() {
-		return checksSetToggleGroup.selectedToggleProperty().isNotNull();
-	}
-
-	public boolean isAnyCheckSetSelected() {
-		return anyCheckSetSelectedProperty().get();
-	}
-
-	enum PredefinedCheckSet {
-		QUICK(DirIdCheck.class.getCanonicalName()), //TODO: get identifier via static method?
-		FULL(DirIdCheck.class.getCanonicalName()),
-		CUSTOM();
-
-		private Collection<String> checkIds;
-
-		PredefinedCheckSet(String... checkIds) {
-			this.checkIds = Set.of(checkIds);
-		}
-
-		Collection<String> getCheckIds() {
-			return checkIds;
-		}
-	}
 }
diff --git a/main/ui/src/main/resources/fxml/health_check.fxml b/main/ui/src/main/resources/fxml/health_check.fxml
deleted file mode 100644
index 7ccc88d73..000000000
--- a/main/ui/src/main/resources/fxml/health_check.fxml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ListView?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Text?>
-<HBox xmlns:fx="http://javafx.com/fxml"
-	  xmlns="http://javafx.com/javafx"
-	  fx:controller="org.cryptomator.ui.health.CheckController"
-	  minWidth="400"
-	  maxWidth="400"
-	  minHeight="145"
-	  spacing="12">
-	<padding>
-		<Insets topRightBottomLeft="12"/>
-	</padding>
-	<children>
-		<VBox minWidth="80">
-			<Label fx:id="listHeading" text="Health checks"/>
-			<ListView fx:id="checksListView"/>
-			<Button text="%generic.button.cancel" onAction="#cancelCheck" disable="${!controller.running}" maxWidth="Infinity"/>
-			<Button text="Export Results" onAction="#exportResults" disable="${controller.running}" maxWidth="Infinity"/>
-		</VBox>
-		<VBox spacing="6">
-			<Label fx:id="checkTitle" styleClass="label-large" text="${controller.selectedTaskName}" />
-			<Text fx:id="checkDescription" styleClass="label" text="${controller.selectedTaskDescription}" />
-			<TableView fx:id="resultsTableView" >
-				<columns>
-					<TableColumn fx:id="resultDescriptionColumn" text="Info" editable="false"/>
-					<TableColumn fx:id="resultSeverityColumn" text="Severity" editable="false"/>
-					<!--TableColumn fx:id="resultAction" text="Action" /-->
-				</columns>
-			</TableView>
-		</VBox>
-	</children>
-</HBox>
diff --git a/main/ui/src/main/resources/fxml/health_check_details.fxml b/main/ui/src/main/resources/fxml/health_check_details.fxml
new file mode 100644
index 000000000..7fe7b9e3c
--- /dev/null
+++ b/main/ui/src/main/resources/fxml/health_check_details.fxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Text?>
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
+	  fx:controller="org.cryptomator.ui.health.CheckDetailController"
+	  spacing="6">
+	<Label fx:id="checkTitle" styleClass="label-large" text="${controller.selectedTaskName}"/>
+	<Text fx:id="checkDescription" styleClass="label" text="${controller.selectedTaskDescription}"/>
+	<!-- TODO hide if state != succeeded: -->
+	<TableView fx:id="resultsTableView">
+		<columns>
+			<TableColumn fx:id="resultDescriptionColumn" text="Info" editable="false"/>
+			<TableColumn fx:id="resultSeverityColumn" text="Severity" editable="false"/>
+			<!--TableColumn fx:id="resultAction" text="Action" /-->
+		</columns>
+	</TableView>
+</VBox>
\ No newline at end of file
diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
new file mode 100644
index 000000000..21e0bfd3c
--- /dev/null
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
+	  fx:controller="org.cryptomator.ui.health.CheckListController"
+	  minWidth="400"
+	  maxWidth="400"
+	  minHeight="145"
+	  spacing="12">
+	<padding>
+		<Insets topRightBottomLeft="12"/>
+	</padding>
+	<children>
+		<HBox>
+			<VBox minWidth="80">
+				<Label fx:id="listHeading" text="Health checks"/>
+				<ListView fx:id="checksListView"/>
+				<!-- TODO: clean up button states: -->
+				<Button text="TODO: run selected" onAction="#runSelectedChecks" disable="${controller.running || !controller.anyCheckSelected}" maxWidth="Infinity"/>
+				<Button text="TODO: run all" onAction="#runAllChecks" disable="${controller.running}"  maxWidth="Infinity"/>
+				<Button text="%generic.button.cancel" onAction="#cancelCheck" disable="${!controller.running}" maxWidth="Infinity"/>
+			</VBox>
+			<fx:include source="/fxml/health_check_details.fxml" visible="${controller.anyCheckSelected}" managed="${controller.anyCheckSelected}"/>
+		</HBox>
+		<ButtonBar buttonMinWidth="120" buttonOrder="+X">
+			<buttons>
+				<!-- TODO: hide/disable if no results yet -->
+				<Button text="TODO Export Results" ButtonBar.buttonData="NEXT_FORWARD" disable="${controller.running}" onAction="#exportResults"/>
+			</buttons>
+		</ButtonBar>
+	</children>
+</VBox>
diff --git a/main/ui/src/main/resources/fxml/health_start.fxml b/main/ui/src/main/resources/fxml/health_start.fxml
index 5be6c9458..ccabefc11 100644
--- a/main/ui/src/main/resources/fxml/health_start.fxml
+++ b/main/ui/src/main/resources/fxml/health_start.fxml
@@ -16,29 +16,18 @@
 	  maxWidth="400"
 	  minHeight="145"
 	  spacing="12">
-	<fx:define>
-		<ToggleGroup fx:id="checksSetToggleGroup"/>
-	</fx:define>
 	<padding>
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
 		<Label text="TODO: Invalid vault config" visible="${controller.invalidConfig}" managed="${controller.invalidConfig}"/>
 
-		<Label text="Please select, which check(s) should be performed:"/>
-		<VBox spacing="6" disable="${controller.invalidConfig}">
-			<RadioButton fx:id="quickCheckSetButton" toggleGroup="${checksSetToggleGroup}" text="Quick Check"/>
-			<RadioButton fx:id="fullCheckSetButton" toggleGroup="${checksSetToggleGroup}" text="Full Check"/>
-			<AnchorPane >
-				<RadioButton fx:id="customCheckSetButton" toggleGroup="${checksSetToggleGroup}" text="Custom Check"/>
-				<ListView fx:id="availableChecksList" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="20.0" maxHeight="100" visible="${customCheckSetButton.selected}"/>
-			</AnchorPane>
-		</VBox>
+		<Label text="TODO: Blabla going to health check now...:"/>
 
 		<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
 			<buttons>
 				<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close"/>
-				<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" disable="${controller.invalidConfig || !controller.anyCheckSetSelected}" defaultButton="true" onAction="#next"/>
+				<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" disable="${controller.invalidConfig}" defaultButton="true" onAction="#next"/>
 			</buttons>
 		</ButtonBar>
 	</children>
diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt
index d1910d669..41c3b21ae 100644
--- a/main/ui/src/main/resources/license/THIRD-PARTY.txt
+++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt
@@ -19,10 +19,10 @@ Cryptomator uses 45 third-party dependencies under the following licenses:
 			- jnr-ffi (com.github.jnr:jnr-ffi:2.1.12 - http://github.com/jnr/jnr-ffi)
 			- FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/)
 			- Gson (com.google.code.gson:gson:2.8.6 - https://github.com/google/gson/gson)
-			- Dagger (com.google.dagger:dagger:2.32 - https://github.com/google/dagger)
-			- error-prone annotations (com.google.errorprone:error_prone_annotations:2.3.4 - http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations)
+			- Dagger (com.google.dagger:dagger:2.35.1 - https://github.com/google/dagger)
+			- error-prone annotations (com.google.errorprone:error_prone_annotations:2.5.1 - http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations)
 			- Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess)
-			- Guava: Google Core Libraries for Java (com.google.guava:guava:30.1-jre - https://github.com/google/guava/guava)
+			- Guava: Google Core Libraries for Java (com.google.guava:guava:30.1.1-jre - https://github.com/google/guava/guava)
 			- Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture)
 			- J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.3 - https://github.com/google/j2objc/)
 			- Apache Commons CLI (commons-cli:commons-cli:1.4 - http://commons.apache.org/proper/commons-cli/)
@@ -70,11 +70,11 @@ Cryptomator uses 45 third-party dependencies under the following licenses:
 			- Java Native Access (net.java.dev.jna:jna:5.7.0 - https://github.com/java-native-access/jna)
 			- Java Native Access Platform (net.java.dev.jna:jna-platform:5.7.0 - https://github.com/java-native-access/jna)
         MIT License:
-			- java jwt (com.auth0:java-jwt:3.13.0 - https://github.com/auth0/java-jwt)
+			- java jwt (com.auth0:java-jwt:3.15.0 - https://github.com/auth0/java-jwt)
 			- jnr-x86asm (com.github.jnr:jnr-x86asm:1.0.2 - http://github.com/jnr/jnr-x86asm)
 			- jnr-fuse (com.github.serceman:jnr-fuse:0.5.5 - https://github.com/SerCeMan/jnr-fuse)
 			- zxcvbn4j (com.nulab-inc:zxcvbn:1.3.0 - https://github.com/nulab/zxcvbn4j)
-			- Checker Qual (org.checkerframework:checker-qual:3.5.0 - https://checkerframework.org)
+			- Checker Qual (org.checkerframework:checker-qual:3.8.0 - https://checkerframework.org)
 			- SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - http://www.slf4j.org)
         The BSD 2-Clause License:
 			- EasyBind (com.tobiasdiez:easybind:2.1.0 - https://github.com/tobiasdiez/EasyBind)

From 2e52afed5191ede28622dd8cdabd80ce582937b8 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 10 May 2021 13:39:46 +0200
Subject: [PATCH 15/67] write report synchronously, reducing complexity

---
 .../ui/health/CheckListController.java        | 22 +++---
 .../ui/health/HealthCheckModule.java          |  1 +
 .../ui/health/HealthCheckTask.java            | 19 ------
 ...ReportWriteTask.java => ReportWriter.java} | 68 ++++++++-----------
 4 files changed, 41 insertions(+), 69 deletions(-)
 rename main/ui/src/main/java/org/cryptomator/ui/health/{HealthReportWriteTask.java => ReportWriter.java} (50%)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
index dc340001c..9021e1a55 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
@@ -2,32 +2,32 @@ package org.cryptomator.ui.health;
 
 import com.google.common.base.Preconditions;
 import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.optional.OptionalBinding;
 import dagger.Lazy;
-import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 import org.cryptomator.ui.common.FxController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javafx.beans.binding.Binding;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.concurrent.Worker;
 import javafx.fxml.FXML;
 import javafx.scene.control.ListView;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableView;
+import java.io.IOException;
 import java.util.Collection;
 import java.util.concurrent.ExecutorService;
 
 @HealthCheckScoped
 public class CheckListController implements FxController {
 
+	private static final Logger LOG = LoggerFactory.getLogger(CheckListController.class);
+
 	private final ObservableList<HealthCheckTask> tasks;
-	private final HealthReportWriteTask reportWriter;
+	private final ReportWriter reportWriter;
 	private final ExecutorService executorService;
 	private final ObjectProperty<HealthCheckTask> selectedTask;
 	private final SimpleObjectProperty<Worker<?>> runningTask;
@@ -38,13 +38,13 @@ public class CheckListController implements FxController {
 	public ListView<HealthCheckTask> checksListView;
 
 	@Inject
-	public CheckListController(Lazy<Collection<HealthCheckTask>> tasks, HealthReportWriteTask reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService) {
+	public CheckListController(Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService) {
 		this.tasks = FXCollections.observableArrayList(tasks.get());
 		this.reportWriter = reportWriteTask;
 		this.executorService = executorService;
 		this.selectedTask = selectedTask;
 		this.runningTask = new SimpleObjectProperty<>();
-		this.running = EasyBind.wrapNullable(runningTask).map(Worker::isRunning).orElse(false);
+		this.running = EasyBind.wrapNullable(runningTask).mapObservable(Worker::runningProperty).orElse(false);
 		this.anyCheckSelected = selectedTask.isNotNull();
 	}
 
@@ -81,7 +81,11 @@ public class CheckListController implements FxController {
 
 	@FXML
 	public void exportResults() {
-		executorService.execute(reportWriter);
+		try {
+			reportWriter.writeReport(tasks);
+		} catch (IOException e) {
+			LOG.error("Failed to write health check report.", e);
+		}
 	}
 
 	/* Getter/Setter */
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
index fa9b69adc..aafb5cb22 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
@@ -27,6 +27,7 @@ import javafx.scene.Scene;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import java.security.SecureRandom;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
index 56bcffc17..2ba16cab2 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
@@ -29,9 +29,6 @@ class HealthCheckTask extends Task<Void> {
 	private final HealthCheck check;
 	private final ObservableList<DiagnosticResult> results;
 
-	private final AtomicReference<State> endState;
-	private final AtomicReference<Throwable> exceptionOnDone;
-
 	public HealthCheckTask(Path vaultPath, VaultConfig vaultConfig, Masterkey masterkey, SecureRandom csprng, HealthCheck check) {
 		this.vaultPath = Objects.requireNonNull(vaultPath);
 		this.vaultConfig = Objects.requireNonNull(vaultConfig);
@@ -39,8 +36,6 @@ class HealthCheckTask extends Task<Void> {
 		this.csprng = Objects.requireNonNull(csprng);
 		this.check = Objects.requireNonNull(check);
 		this.results = FXCollections.observableArrayList();
-		this.endState = new AtomicReference<>(null);
-		this.exceptionOnDone = new AtomicReference<>();
 
 		var tmp = check.identifier();
 		updateTitle(tmp.substring(tmp.length() - 10)); //TODO: new method with reliable logic
@@ -79,12 +74,6 @@ class HealthCheckTask extends Task<Void> {
 	@Override
 	protected void done() {
 		LOG.info("finished {}", check.identifier());
-		Platform.runLater(() -> endState.set(getState()));
-	}
-
-	@Override
-	protected void failed() {
-		Platform.runLater(() -> exceptionOnDone.set(getException()));
 	}
 
 	/* Getter */
@@ -96,12 +85,4 @@ class HealthCheckTask extends Task<Void> {
 	public HealthCheck getCheck() {
 		return check;
 	}
-
-	public State getEndState() {
-		return endState.get();
-	}
-
-	public Optional<Throwable> getExceptionOnDone() {
-		return Optional.ofNullable(exceptionOnDone.get());
-	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthReportWriteTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
similarity index 50%
rename from main/ui/src/main/java/org/cryptomator/ui/health/HealthReportWriteTask.java
rename to main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
index 8ed4ded6f..4e03500be 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthReportWriteTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
@@ -6,14 +6,13 @@ import org.cryptomator.common.Environment;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.Volume;
 import org.cryptomator.cryptofs.VaultConfig;
-import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 import org.cryptomator.ui.common.HostServiceRevealer;
 
 import javax.inject.Inject;
 import javafx.concurrent.Task;
+import java.io.BufferedWriter;
 import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.ByteChannel;
+import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -27,13 +26,13 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 @HealthCheckScoped
-public class HealthReportWriteTask extends Task<Void> {
+public class ReportWriter {
 
 	private static final String REPORT_HEADER = """
 			**************************************
 			*   Cryptomator Vault Health Report  *
 			**************************************
-			Analyzed vault: %s (Current name \"%s\")
+			Analyzed vault: %s (Current name "%s")
 			Vault storage path: %s
 			""";
 	private static final String REPORT_CHECK_HEADER = """
@@ -42,72 +41,59 @@ public class HealthReportWriteTask extends Task<Void> {
 			Check %s
 			------------------------------
 			""";
-	private static final String REPORT_CHECK_RESULT = "%s - %s";
+	private static final String REPORT_CHECK_RESULT = "%8s - %s";
 	private static final DateTimeFormatter TIME_STAMP = DateTimeFormatter.ofPattern("yyyyMMdd-HHmmss").withZone(ZoneId.systemDefault());
 
 	private final Vault vault;
 	private final VaultConfig vaultConfig;
-	private final Lazy<Collection<HealthCheckTask>> tasks;
 	private final Path path;
 	private final HostServiceRevealer revealer;
 
 	@Inject
-	public HealthReportWriteTask(@HealthCheckWindow Vault vault, AtomicReference<VaultConfig> vaultConfigRef, Lazy<Collection<HealthCheckTask>> tasks, Environment env, HostServiceRevealer revealer) {
+	public ReportWriter(@HealthCheckWindow Vault vault, AtomicReference<VaultConfig> vaultConfigRef, Environment env, HostServiceRevealer revealer) {
 		this.vault = vault;
 		this.vaultConfig = Objects.requireNonNull(vaultConfigRef.get());
-		this.tasks = tasks;
 		this.revealer = revealer;
 		this.path = env.getLogDir().orElse(Path.of(System.getProperty("user.home"))).resolve("healthReport_" + vault.getDisplayName() + "_" + TIME_STAMP.format(Instant.now()) + ".log");
 	}
 
-	@Override
-	protected Void call() throws IOException {
-		final var tasks = this.tasks.get();
-		//use file channel, since results can be pretty big
-		try (var channel = Files.newByteChannel(path, StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING)) {
-			internalWrite(channel, String.format(REPORT_HEADER, vaultConfig.getId(), vault.getDisplayName(), vault.getPath()));
+	protected void writeReport(Collection<HealthCheckTask> tasks) throws IOException {
+		try (var out = Files.newOutputStream(path, StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING); //
+			 var writer = new BufferedWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8))) {
+			writer.write(REPORT_HEADER.formatted(vaultConfig.getId(), vault.getDisplayName(), vault.getPath()));
 			for (var task : tasks) {
-				internalWrite(channel, REPORT_CHECK_HEADER, task.getCheck().identifier());
-				final var state = task.getEndState();
-				switch (state) {
+				writer.write(REPORT_CHECK_HEADER.formatted(task.getCheck().identifier()));
+				switch (task.getState()) {
 					case SUCCEEDED -> {
-						internalWrite(channel, "STATUS: SUCCESS\nRESULTS:\n");
+						writer.write("STATUS: SUCCESS\nRESULTS:\n");
 						for (var result : task.results()) {
-							internalWrite(channel, REPORT_CHECK_RESULT, severityToString(result.getServerity()), result);
+							writer.write(REPORT_CHECK_RESULT.formatted(result.getServerity(), result));
 						}
 					}
-					case CANCELLED -> internalWrite(channel, "STATUS: CANCELED\n");
+					case CANCELLED -> writer.write("STATUS: CANCELED\n");
 					case FAILED -> {
-						internalWrite(channel, "STATUS: FAILED\nREASON:\n", task.getCheck().identifier());
-						internalWrite(channel, prepareFailureMsg(task));
+						writer.write("STATUS: FAILED\nREASON:\n" + task.getCheck().identifier());
+						writer.write(prepareFailureMsg(task));
 					}
 					case READY, RUNNING, SCHEDULED -> throw new IllegalStateException("Cannot export unfinished task");
 				}
 			}
 		}
-		return null;
-	}
-
-	private void internalWrite(ByteChannel channel, String s, Object... formatArguments) throws IOException {
-		channel.write(ByteBuffer.wrap(s.formatted(formatArguments).getBytes(StandardCharsets.UTF_8)));
-	}
-
-	private String severityToString(DiagnosticResult.Severity s) {
-		return switch (s) {
-			case GOOD, INFO, WARN -> s.name();
-			case CRITICAL -> "CRIT";
-		};
+		reveal();
 	}
 
 	private String prepareFailureMsg(HealthCheckTask task) {
-		return task.getExceptionOnDone() //
-				.map(t -> ExceptionUtils.getStackTrace(t)).orElse("Unknown reason of failure.") //
-				.lines().map(line -> "\t\t" + line + "\n") //
-				.collect(Collectors.joining());
+		if (task.getException() != null) {
+			return ExceptionUtils.getStackTrace(task.getException()) //
+					.lines() //
+					.map(line -> "\t\t" + line + "\n") //
+					.collect(Collectors.joining());
+		} else {
+			return "Unknown reason of failure.";
+		}
 	}
 
-	@Override
-	protected void succeeded() {
+	private void reveal() {
 		try {
 			revealer.reveal(path);
 		} catch (Volume.VolumeException e) {

From 40dbc0ba48c00bfeffc20048503b7aa1903b5b1e Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 10 May 2021 15:38:37 +0200
Subject: [PATCH 16/67] cleanup

---
 .../main/java/org/cryptomator/ui/health/HealthCheckTask.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
index 2ba16cab2..7636ab8d9 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
@@ -14,9 +14,7 @@ import javafx.concurrent.Task;
 import java.nio.file.Path;
 import java.security.SecureRandom;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.concurrent.CancellationException;
-import java.util.concurrent.atomic.AtomicReference;
 
 class HealthCheckTask extends Task<Void> {
 
@@ -53,7 +51,7 @@ class HealthCheckTask extends Task<Void> {
 				try {
 					Thread.sleep(2000);
 				} catch (InterruptedException e) {
-					if(isCancelled()) {
+					if (isCancelled()) {
 						return;
 					} else {
 						Thread.currentThread().interrupt();

From 6b871e56c8d01ca9e37864fb902344908e3de5a4 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 10 May 2021 15:38:52 +0200
Subject: [PATCH 17/67] hide results until task is started

---
 .../ui/health/CheckDetailController.java      | 53 ++++++++++++-------
 .../resources/fxml/health_check_details.fxml  |  7 ++-
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
index 7dd1603c9..60bb0522f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
@@ -7,6 +7,7 @@ import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
 import javafx.beans.binding.Binding;
+import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
@@ -18,10 +19,11 @@ import javafx.scene.control.TableView;
 
 public class CheckDetailController implements FxController {
 
-	private final Binding<ObservableList<DiagnosticResult>> selectedResults;
-	private final OptionalBinding<Worker.State> selectedTaskState;
-	private final Binding<String> selectedTaskName;
-	private final Binding<String> selectedTaskDescription;
+	private final Binding<ObservableList<DiagnosticResult>> results;
+	private final OptionalBinding<Worker.State> taskState;
+	private final Binding<String> taskName;
+	private final Binding<String> taskDescription;
+	private final BooleanBinding producingResults;
 
 	public TableView<DiagnosticResult> resultsTableView;
 	public TableColumn<DiagnosticResult, String> resultDescriptionColumn;
@@ -29,35 +31,50 @@ public class CheckDetailController implements FxController {
 
 	@Inject
 	public CheckDetailController(ObjectProperty<HealthCheckTask> selectedTask) {
-		this.selectedResults = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::results).orElse(FXCollections.emptyObservableList());
-		this.selectedTaskState = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::stateProperty);
-		this.selectedTaskName = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::getTitle).orElse("");
-		this.selectedTaskDescription = EasyBind.wrapNullable(selectedTask).map(task -> task.getCheck().toString()).orElse("");
+		this.results = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::results).orElse(FXCollections.emptyObservableList());
+		this.taskState = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::stateProperty);
+		this.taskName = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::getTitle).orElse("");
+		this.taskDescription = EasyBind.wrapNullable(selectedTask).map(task -> task.getCheck().toString()).orElse("");
+		this.producingResults = taskState.filter(this::producesResults).isPresent();
+	}
+
+	private boolean producesResults(Worker.State state) {
+		return switch (state) {
+			case SCHEDULED, RUNNING, SUCCEEDED -> true;
+			case READY, CANCELLED, FAILED -> false;
+		};
 	}
 
 	@FXML
 	public void initialize() {
-		resultsTableView.itemsProperty().bind(selectedResults);
+		resultsTableView.itemsProperty().bind(results);
 		resultDescriptionColumn.setCellValueFactory(cellFeatures -> new SimpleStringProperty(cellFeatures.getValue().toString()));
 		resultSeverityColumn.setCellValueFactory(cellFeatures -> new SimpleStringProperty(cellFeatures.getValue().getServerity().name()));
 	}
-
 	/* Getter/Setter */
 
-	public String getSelectedTaskName() {
-		return selectedTaskName.getValue();
+
+	public String getTaskName() {
+		return taskName.getValue();
 	}
 
-	public Binding<String> selectedTaskNameProperty() {
-		return selectedTaskName;
+	public Binding<String> taskNameProperty() {
+		return taskName;
 	}
 
-	public String getSelectedTaskDescription() {
-		return selectedTaskDescription.getValue();
+	public String getTaskDescription() {
+		return taskDescription.getValue();
 	}
 
-	public Binding<String> selectedTaskDescriptionProperty() {
-		return selectedTaskDescription;
+	public Binding<String> taskDescriptionProperty() {
+		return taskDescription;
 	}
 
+	public boolean isProducingResults() {
+		return producingResults.get();
+	}
+
+	public BooleanBinding producingResultsProperty() {
+		return producingResults;
+	}
 }
diff --git a/main/ui/src/main/resources/fxml/health_check_details.fxml b/main/ui/src/main/resources/fxml/health_check_details.fxml
index 7fe7b9e3c..bf884f6dc 100644
--- a/main/ui/src/main/resources/fxml/health_check_details.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_details.fxml
@@ -9,10 +9,9 @@
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.health.CheckDetailController"
 	  spacing="6">
-	<Label fx:id="checkTitle" styleClass="label-large" text="${controller.selectedTaskName}"/>
-	<Text fx:id="checkDescription" styleClass="label" text="${controller.selectedTaskDescription}"/>
-	<!-- TODO hide if state != succeeded: -->
-	<TableView fx:id="resultsTableView">
+	<Label fx:id="checkTitle" styleClass="label-large" text="${controller.taskName}"/>
+	<Text fx:id="checkDescription" styleClass="label" text="${controller.taskDescription}"/>
+	<TableView fx:id="resultsTableView" visible="${controller.producingResults}" managed="${controller.producingResults}">
 		<columns>
 			<TableColumn fx:id="resultDescriptionColumn" text="Info" editable="false"/>
 			<TableColumn fx:id="resultSeverityColumn" text="Severity" editable="false"/>

From a47c05c87dfdcc7951859f7c41d461af5a51a18e Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 10 May 2021 15:56:46 +0200
Subject: [PATCH 18/67] hide/disable elements if not relevant in current state

---
 .../cryptomator/ui/health/CheckListController.java | 14 ++++++++++++--
 .../src/main/resources/fxml/health_check_list.fxml |  6 +++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
index 9021e1a55..700230e45 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
@@ -33,10 +33,12 @@ public class CheckListController implements FxController {
 	private final SimpleObjectProperty<Worker<?>> runningTask;
 	private final Binding<Boolean> running;
 	private final BooleanBinding anyCheckSelected;
+	private final BooleanBinding readyToRun;
 
 	/* FXML */
 	public ListView<HealthCheckTask> checksListView;
 
+
 	@Inject
 	public CheckListController(Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService) {
 		this.tasks = FXCollections.observableArrayList(tasks.get());
@@ -46,6 +48,7 @@ public class CheckListController implements FxController {
 		this.runningTask = new SimpleObjectProperty<>();
 		this.running = EasyBind.wrapNullable(runningTask).mapObservable(Worker::runningProperty).orElse(false);
 		this.anyCheckSelected = selectedTask.isNotNull();
+		this.readyToRun = runningTask.isNull();
 	}
 
 	@FXML
@@ -87,9 +90,17 @@ public class CheckListController implements FxController {
 			LOG.error("Failed to write health check report.", e);
 		}
 	}
-
 	/* Getter/Setter */
 
+
+	public boolean isReadyToRun() {
+		return readyToRun.get();
+	}
+
+	public BooleanBinding readyToRunProperty() {
+		return readyToRun;
+	}
+
 	public boolean isRunning() {
 		return running.getValue();
 	}
@@ -105,5 +116,4 @@ public class CheckListController implements FxController {
 	public BooleanBinding anyCheckSelectedProperty() {
 		return anyCheckSelected;
 	}
-
 }
diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
index 21e0bfd3c..377b93724 100644
--- a/main/ui/src/main/resources/fxml/health_check_list.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -23,9 +23,9 @@
 				<Label fx:id="listHeading" text="Health checks"/>
 				<ListView fx:id="checksListView"/>
 				<!-- TODO: clean up button states: -->
-				<Button text="TODO: run selected" onAction="#runSelectedChecks" disable="${controller.running || !controller.anyCheckSelected}" maxWidth="Infinity"/>
-				<Button text="TODO: run all" onAction="#runAllChecks" disable="${controller.running}"  maxWidth="Infinity"/>
-				<Button text="%generic.button.cancel" onAction="#cancelCheck" disable="${!controller.running}" maxWidth="Infinity"/>
+				<Button text="TODO: run selected" onAction="#runSelectedChecks" disable="${controller.anyCheckSelected}" visible="${controller.readyToRun}" managed="${controller.readyToRun}" maxWidth="Infinity"/>
+				<Button text="TODO: run all" onAction="#runAllChecks" visible="${controller.readyToRun}" managed="${controller.readyToRun}" maxWidth="Infinity"/>
+				<Button text="%generic.button.cancel" onAction="#cancelCheck" visible="${controller.running}" managed="${controller.running}" maxWidth="Infinity"/>
 			</VBox>
 			<fx:include source="/fxml/health_check_details.fxml" visible="${controller.anyCheckSelected}" managed="${controller.anyCheckSelected}"/>
 		</HBox>

From a2ad7d69abe5e1a09c13b08f10efd631bc6e7640 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@zoho.eu>
Date: Mon, 17 May 2021 10:18:10 +0200
Subject: [PATCH 19/67] Simplify password creation (#1646)

* Remove the password properties and directly access password fields from included fxml files
* wipe the password fields when closing a window
---
 .../ui/addvaultwizard/AddVaultModule.java     | 13 ++-------
 .../CreateNewVaultPasswordController.java     | 25 +++++++++--------
 .../ChangePasswordController.java             | 28 +++++++++----------
 .../changepassword/ChangePasswordModule.java  | 15 ++--------
 .../ui/common/NewPasswordController.java      | 23 ++++++++-------
 .../ui/controls/SecurePasswordField.java      |  2 +-
 .../ui/recoverykey/RecoveryKeyModule.java     | 16 ++---------
 .../RecoveryKeyResetPasswordController.java   | 25 ++++++++---------
 .../resources/fxml/addvault_new_password.fxml |  2 +-
 .../main/resources/fxml/changepassword.fxml   |  2 +-
 .../fxml/recoverykey_reset_password.fxml      |  4 +--
 11 files changed, 64 insertions(+), 91 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java
index 42d243e80..8a5a776ea 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java
@@ -6,10 +6,10 @@ import dagger.Provides;
 import dagger.multibindings.IntoMap;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.DefaultSceneFactory;
-import org.cryptomator.ui.common.FxmlLoaderFactory;
 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.NewPasswordController;
 import org.cryptomator.ui.common.PasswordStrengthUtil;
@@ -33,13 +33,6 @@ import java.util.ResourceBundle;
 @Module
 public abstract class AddVaultModule {
 
-	@Provides
-	@AddVaultWizardScoped
-	@Named("newPassword")
-	static ObjectProperty<CharSequence> provideNewPasswordProperty() {
-		return new SimpleObjectProperty<>("");
-	}
-
 	@Provides
 	@AddVaultWizardWindow
 	@AddVaultWizardScoped
@@ -167,8 +160,8 @@ public abstract class AddVaultModule {
 	@Provides
 	@IntoMap
 	@FxControllerKey(NewPasswordController.class)
-	static FxController provideNewPasswordController(ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater, @Named("newPassword") ObjectProperty<CharSequence> password) {
-		return new NewPasswordController(resourceBundle, strengthRater, password);
+	static FxController provideNewPasswordController(ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater) {
+		return new NewPasswordController(resourceBundle, strengthRater);
 	}
 
 	@Binds
diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java
index 4be978956..4b4e02ed2 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java
@@ -14,6 +14,7 @@ import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
+import org.cryptomator.ui.common.NewPasswordController;
 import org.cryptomator.ui.common.Tasks;
 import org.cryptomator.ui.keyloading.masterkeyfile.MasterkeyFileLoadingStrategy;
 import org.cryptomator.ui.recoverykey.RecoveryKeyFactory;
@@ -23,7 +24,6 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
 import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -41,7 +41,6 @@ import java.net.URI;
 import java.nio.channels.WritableByteChannel;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.security.SecureRandom;
@@ -70,7 +69,6 @@ public class CreateNewVaultPasswordController implements FxController {
 	private final StringProperty recoveryKeyProperty;
 	private final VaultListManager vaultListManager;
 	private final ResourceBundle resourceBundle;
-	private final ObjectProperty<CharSequence> password;
 	private final ReadmeGenerator readmeGenerator;
 	private final SecureRandom csprng;
 	private final MasterkeyFileAccess masterkeyFileAccess;
@@ -81,9 +79,10 @@ public class CreateNewVaultPasswordController implements FxController {
 	public ToggleGroup recoveryKeyChoice;
 	public Toggle showRecoveryKey;
 	public Toggle skipRecoveryKey;
+	public NewPasswordController newPasswordSceneController;
 
 	@Inject
-	CreateNewVaultPasswordController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_NEW_LOCATION) Lazy<Scene> chooseLocationScene, @FxmlScene(FxmlFile.ADDVAULT_NEW_RECOVERYKEY) Lazy<Scene> recoveryKeyScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy<Scene> successScene, ErrorComponent.Builder errorComponent, ExecutorService executor, RecoveryKeyFactory recoveryKeyFactory, @Named("vaultName") StringProperty vaultName, ObjectProperty<Path> vaultPath, @AddVaultWizardWindow ObjectProperty<Vault> vault, @Named("recoveryKey") StringProperty recoveryKey, VaultListManager vaultListManager, ResourceBundle resourceBundle, @Named("newPassword") ObjectProperty<CharSequence> password, ReadmeGenerator readmeGenerator, SecureRandom csprng, MasterkeyFileAccess masterkeyFileAccess) {
+	CreateNewVaultPasswordController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_NEW_LOCATION) Lazy<Scene> chooseLocationScene, @FxmlScene(FxmlFile.ADDVAULT_NEW_RECOVERYKEY) Lazy<Scene> recoveryKeyScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy<Scene> successScene, ErrorComponent.Builder errorComponent, ExecutorService executor, RecoveryKeyFactory recoveryKeyFactory, @Named("vaultName") StringProperty vaultName, ObjectProperty<Path> vaultPath, @AddVaultWizardWindow ObjectProperty<Vault> vault, @Named("recoveryKey") StringProperty recoveryKey, VaultListManager vaultListManager, ResourceBundle resourceBundle, ReadmeGenerator readmeGenerator, SecureRandom csprng, MasterkeyFileAccess masterkeyFileAccess) {
 		this.window = window;
 		this.chooseLocationScene = chooseLocationScene;
 		this.recoveryKeyScene = recoveryKeyScene;
@@ -97,7 +96,6 @@ public class CreateNewVaultPasswordController implements FxController {
 		this.recoveryKeyProperty = recoveryKey;
 		this.vaultListManager = vaultListManager;
 		this.resourceBundle = resourceBundle;
-		this.password = password;
 		this.readmeGenerator = readmeGenerator;
 		this.csprng = csprng;
 		this.masterkeyFileAccess = masterkeyFileAccess;
@@ -108,8 +106,11 @@ public class CreateNewVaultPasswordController implements FxController {
 
 	@FXML
 	public void initialize() {
-		BooleanBinding isValidNewPassword = Bindings.createBooleanBinding(() -> password.get() != null && password.get().length() > 0, password);
-		readyToCreateVault.bind(isValidNewPassword.and(recoveryKeyChoice.selectedToggleProperty().isNotNull()).and(processing.not()));
+		readyToCreateVault.bind(newPasswordSceneController.passwordsMatchAndSufficientProperty().and(recoveryKeyChoice.selectedToggleProperty().isNotNull()).and(processing.not()));
+		window.setOnHiding(event -> {
+			newPasswordSceneController.passwordField.wipe();
+			newPasswordSceneController.reenterField.wipe();
+		});
 	}
 
 	@FXML
@@ -142,8 +143,8 @@ public class CreateNewVaultPasswordController implements FxController {
 		Path pathToVault = vaultPathProperty.get();
 		processing.set(true);
 		Tasks.create(() -> {
-			initializeVault(pathToVault, password.get());
-			return recoveryKeyFactory.createRecoveryKey(pathToVault, password.get());
+			initializeVault(pathToVault);
+			return recoveryKeyFactory.createRecoveryKey(pathToVault, newPasswordSceneController.passwordField.getCharacters());
 		}).onSuccess(recoveryKey -> {
 			initializationSucceeded(pathToVault);
 			recoveryKeyProperty.set(recoveryKey);
@@ -160,7 +161,7 @@ public class CreateNewVaultPasswordController implements FxController {
 		Path pathToVault = vaultPathProperty.get();
 		processing.set(true);
 		Tasks.create(() -> {
-			initializeVault(pathToVault, password.get());
+			initializeVault(pathToVault);
 		}).onSuccess(() -> {
 			initializationSucceeded(pathToVault);
 			window.setScene(successScene.get());
@@ -172,11 +173,11 @@ public class CreateNewVaultPasswordController implements FxController {
 		}).runOnce(executor);
 	}
 
-	private void initializeVault(Path path, CharSequence passphrase) throws IOException {
+	private void initializeVault(Path path) throws IOException {
 		// 1. write masterkey:
 		Path masterkeyFilePath = path.resolve(MASTERKEY_FILENAME);
 		try (Masterkey masterkey = Masterkey.generate(csprng)) {
-			masterkeyFileAccess.persist(masterkey, masterkeyFilePath, passphrase);
+			masterkeyFileAccess.persist(masterkey, masterkeyFilePath, newPasswordSceneController.passwordField.getCharacters());
 
 			// 2. initialize vault:
 			try {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
index b0ad164e2..808375ecd 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
@@ -10,21 +10,18 @@ import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.ui.common.Animations;
 import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.NewPasswordController;
 import org.cryptomator.ui.controls.NiceSecurePasswordField;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
-import javax.inject.Named;
-import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.ObjectProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.stage.Stage;
 import java.io.IOException;
-import java.nio.CharBuffer;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
@@ -41,7 +38,6 @@ public class ChangePasswordController implements FxController {
 
 	private final Stage window;
 	private final Vault vault;
-	private final ObjectProperty<CharSequence> newPassword;
 	private final ErrorComponent.Builder errorComponent;
 	private final KeychainManager keychain;
 	private final SecureRandom csprng;
@@ -50,12 +46,12 @@ public class ChangePasswordController implements FxController {
 	public NiceSecurePasswordField oldPasswordField;
 	public CheckBox finalConfirmationCheckbox;
 	public Button finishButton;
+	public NewPasswordController newPasswordController;
 
 	@Inject
-	public ChangePasswordController(@ChangePasswordWindow Stage window, @ChangePasswordWindow Vault vault, @Named("newPassword") ObjectProperty<CharSequence> newPassword, ErrorComponent.Builder errorComponent, KeychainManager keychain, SecureRandom csprng, MasterkeyFileAccess masterkeyFileAccess) {
+	public ChangePasswordController(@ChangePasswordWindow Stage window, @ChangePasswordWindow Vault vault, ErrorComponent.Builder errorComponent, KeychainManager keychain, SecureRandom csprng, MasterkeyFileAccess masterkeyFileAccess) {
 		this.window = window;
 		this.vault = vault;
-		this.newPassword = newPassword;
 		this.errorComponent = errorComponent;
 		this.keychain = keychain;
 		this.csprng = csprng;
@@ -66,8 +62,12 @@ public class ChangePasswordController implements FxController {
 	public void initialize() {
 		BooleanBinding checkboxNotConfirmed = finalConfirmationCheckbox.selectedProperty().not();
 		BooleanBinding oldPasswordFieldEmpty = oldPasswordField.textProperty().isEmpty();
-		BooleanBinding newPasswordInvalid = Bindings.createBooleanBinding(() -> newPassword.get() == null || newPassword.get().length() == 0, newPassword);
-		finishButton.disableProperty().bind(checkboxNotConfirmed.or(oldPasswordFieldEmpty).or(newPasswordInvalid));
+		finishButton.disableProperty().bind(checkboxNotConfirmed.or(oldPasswordFieldEmpty).or(newPasswordController.passwordsMatchAndSufficientProperty().not()));
+		window.setOnHiding(event -> {
+			oldPasswordField.wipe();
+			newPasswordController.passwordField.wipe();
+			newPasswordController.reenterField.wipe();
+		});
 	}
 
 	@FXML
@@ -78,10 +78,8 @@ public class ChangePasswordController implements FxController {
 	@FXML
 	public void finish() {
 		try {
-			//String normalizedOldPassphrase = Normalizer.normalize(oldPasswordField.getCharacters(), Normalizer.Form.NFC);
-			//String normalizedNewPassphrase = Normalizer.normalize(newPassword.get(), Normalizer.Form.NFC);
-			CharSequence oldPassphrase = oldPasswordField.getCharacters(); // TODO verify: is this already NFC-normalized?
-			CharSequence newPassphrase = newPassword.get(); // TODO verify: is this already NFC-normalized?
+			CharSequence oldPassphrase = oldPasswordField.getCharacters();
+			CharSequence newPassphrase = newPasswordController.passwordField.getCharacters();
 			Path masterkeyPath = vault.getPath().resolve(MASTERKEY_FILENAME);
 			byte[] oldMasterkeyBytes = Files.readAllBytes(masterkeyPath);
 			byte[] newMasterkeyBytes = masterkeyFileAccess.changePassphrase(oldMasterkeyBytes, oldPassphrase, newPassphrase);
@@ -89,8 +87,8 @@ public class ChangePasswordController implements FxController {
 			Files.move(masterkeyPath, backupKeyPath, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE);
 			Files.write(masterkeyPath, newMasterkeyBytes, StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE);
 			LOG.info("Successfully changed password for {}", vault.getDisplayName());
-			window.close();
 			updatePasswordInSystemkeychain();
+			window.close();
 		} catch (InvalidPassphraseException e) {
 			Animations.createShakeWindowAnimation(window).play();
 			oldPasswordField.selectAll();
@@ -104,7 +102,7 @@ public class ChangePasswordController implements FxController {
 	private void updatePasswordInSystemkeychain() {
 		if (keychain.isSupported()) {
 			try {
-				keychain.changePassphrase(vault.getId(), CharBuffer.wrap(newPassword.get()));
+				keychain.changePassphrase(vault.getId(), newPasswordController.passwordField.getCharacters());
 				LOG.info("Successfully updated password in system keychain for {}", vault.getDisplayName());
 			} catch (KeychainAccessException e) {
 				LOG.error("Failed to update password in system keychain.", e);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java
index e80871208..d95b19410 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java
@@ -5,10 +5,10 @@ import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
 import org.cryptomator.ui.common.DefaultSceneFactory;
-import org.cryptomator.ui.common.FxmlLoaderFactory;
 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.NewPasswordController;
 import org.cryptomator.ui.common.PasswordStrengthUtil;
@@ -16,8 +16,6 @@ import org.cryptomator.ui.common.StageFactory;
 
 import javax.inject.Named;
 import javax.inject.Provider;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.Scene;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
@@ -27,13 +25,6 @@ import java.util.ResourceBundle;
 @Module
 abstract class ChangePasswordModule {
 
-	@Provides
-	@ChangePasswordScoped
-	@Named("newPassword")
-	static ObjectProperty<CharSequence> provideNewPasswordProperty() {
-		return new SimpleObjectProperty<>("");
-	}
-
 	@Provides
 	@ChangePasswordWindow
 	@ChangePasswordScoped
@@ -71,8 +62,8 @@ abstract class ChangePasswordModule {
 	@Provides
 	@IntoMap
 	@FxControllerKey(NewPasswordController.class)
-	static FxController provideNewPasswordController(ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater, @Named("newPassword") ObjectProperty<CharSequence> password) {
-		return new NewPasswordController(resourceBundle, strengthRater, password);
+	static FxController provideNewPasswordController(ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater) {
+		return new NewPasswordController(resourceBundle, strengthRater);
 	}
 
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
index b7bf48870..13e59f2cd 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
@@ -8,7 +8,8 @@ import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.beans.property.ReadOnlyBooleanWrapper;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
@@ -18,8 +19,8 @@ public class NewPasswordController implements FxController {
 
 	private final ResourceBundle resourceBundle;
 	private final PasswordStrengthUtil strengthRater;
-	private final ObjectProperty<CharSequence> password;
 	private final IntegerProperty passwordStrength = new SimpleIntegerProperty(-1);
+	private final ReadOnlyBooleanWrapper passwordsMatchAndSufficient = new ReadOnlyBooleanWrapper();
 
 	public NiceSecurePasswordField passwordField;
 	public NiceSecurePasswordField reenterField;
@@ -31,10 +32,9 @@ public class NewPasswordController implements FxController {
 	public FontAwesome5IconView passwordMatchCheckmark;
 	public FontAwesome5IconView passwordMatchCross;
 
-	public NewPasswordController(ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater, ObjectProperty<CharSequence> password) {
+	public NewPasswordController(ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater) {
 		this.resourceBundle = resourceBundle;
 		this.strengthRater = strengthRater;
-		this.password = password;
 	}
 
 	@FXML
@@ -44,7 +44,7 @@ public class NewPasswordController implements FxController {
 		passwordStrengthLabel.graphicProperty().bind(Bindings.createObjectBinding(this::getIconViewForPasswordStrengthLabel, passwordField.textProperty(), passwordStrength));
 		passwordStrengthLabel.textProperty().bind(EasyBind.map(passwordStrength, strengthRater::getStrengthDescription));
 
-		BooleanBinding passwordsMatch = Bindings.createBooleanBinding(this::hasSamePasswordInBothFields, passwordField.textProperty(), reenterField.textProperty());
+		BooleanBinding passwordsMatch = Bindings.createBooleanBinding(this::passwordFieldsMatch, passwordField.textProperty(), reenterField.textProperty());
 		BooleanBinding reenterFieldNotEmpty = reenterField.textProperty().isNotEmpty();
 		passwordMatchLabel.visibleProperty().bind(reenterFieldNotEmpty);
 		passwordMatchLabel.graphicProperty().bind(Bindings.when(passwordsMatch.and(reenterFieldNotEmpty)).then(passwordMatchCheckmark).otherwise(passwordMatchCross));
@@ -54,6 +54,7 @@ public class NewPasswordController implements FxController {
 		reenterField.textProperty().addListener(this::passwordsDidChange);
 	}
 
+
 	private FontAwesome5IconView getIconViewForPasswordStrengthLabel() {
 		if (passwordField.getCharacters().length() == 0) {
 			return null;
@@ -67,17 +68,19 @@ public class NewPasswordController implements FxController {
 	}
 
 	private void passwordsDidChange(@SuppressWarnings("unused") Observable observable) {
-		if (hasSamePasswordInBothFields() && strengthRater.fulfillsMinimumRequirements(passwordField.getCharacters())) {
-			password.set(passwordField.getCharacters());
-		} else {
-			password.set("");
+		if (passwordFieldsMatch() && strengthRater.fulfillsMinimumRequirements(passwordField.getCharacters())) {
+			passwordsMatchAndSufficient.setValue(true);
 		}
 	}
 
-	private boolean hasSamePasswordInBothFields() {
+	private boolean passwordFieldsMatch() {
 		return CharSequence.compare(passwordField.getCharacters(), reenterField.getCharacters()) == 0;
 	}
 
+	public ReadOnlyBooleanProperty passwordsMatchAndSufficientProperty() {
+		return passwordsMatchAndSufficient.getReadOnlyProperty();
+	}
+
 	/* Getter/Setter */
 
 	public IntegerProperty passwordStrengthProperty() {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/SecurePasswordField.java b/main/ui/src/main/java/org/cryptomator/ui/controls/SecurePasswordField.java
index 0fde886f6..3689b7e6e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/SecurePasswordField.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/SecurePasswordField.java
@@ -123,7 +123,7 @@ public class SecurePasswordField extends TextField {
 	}
 
 	private void updateCapsLocked() {
-		// AWT code needed until https://bugs.openjdk.java.net/browse/JDK-8090882 is closed:
+		//TODO: fixed in JavaFX 17. AWT code needed until update (see https://bugs.openjdk.java.net/browse/JDK-8259680)
 		capsLocked.set(isFocused() && Toolkit.getDefaultToolkit().getLockingKeyState(java.awt.event.KeyEvent.VK_CAPS_LOCK));
 	}
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
index 58d9fbde9..b30167e73 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
@@ -6,10 +6,10 @@ import dagger.Provides;
 import dagger.multibindings.IntoMap;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.DefaultSceneFactory;
-import org.cryptomator.ui.common.FxmlLoaderFactory;
 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.NewPasswordController;
 import org.cryptomator.ui.common.PasswordStrengthUtil;
@@ -17,8 +17,6 @@ import org.cryptomator.ui.common.StageFactory;
 
 import javax.inject.Named;
 import javax.inject.Provider;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.Scene;
@@ -56,14 +54,6 @@ abstract class RecoveryKeyModule {
 		return new SimpleStringProperty();
 	}
 
-	@Provides
-	@RecoveryKeyScoped
-	@Named("newPassword")
-	static ObjectProperty<CharSequence> provideNewPasswordProperty() {
-		return new SimpleObjectProperty<>("");
-	}
-
-
 	// ------------------
 
 	@Provides
@@ -126,8 +116,8 @@ abstract class RecoveryKeyModule {
 	@Provides
 	@IntoMap
 	@FxControllerKey(NewPasswordController.class)
-	static FxController provideNewPasswordController(ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater, @Named("newPassword") ObjectProperty<CharSequence> password) {
-		return new NewPasswordController(resourceBundle, strengthRater, password);
+	static FxController provideNewPasswordController(ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater) {
+		return new NewPasswordController(resourceBundle, strengthRater);
 	}
 
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
index cdf54990f..a2319ba3c 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
@@ -6,14 +6,12 @@ import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
+import org.cryptomator.ui.common.NewPasswordController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
-import javax.inject.Named;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.StringProperty;
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
@@ -32,21 +30,19 @@ public class RecoveryKeyResetPasswordController implements FxController {
 	private final RecoveryKeyFactory recoveryKeyFactory;
 	private final ExecutorService executor;
 	private final StringProperty recoveryKey;
-	private final ObjectProperty<CharSequence> newPassword;
 	private final Lazy<Scene> recoverScene;
-	private final BooleanBinding invalidNewPassword;
 	private final ErrorComponent.Builder errorComponent;
 
+	public NewPasswordController newPasswordController;
+
 	@Inject
-	public RecoveryKeyResetPasswordController(@RecoveryKeyWindow Stage window, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, @Named("newPassword") ObjectProperty<CharSequence> newPassword, @FxmlScene(FxmlFile.RECOVERYKEY_RECOVER) Lazy<Scene> recoverScene, ErrorComponent.Builder errorComponent) {
+	public RecoveryKeyResetPasswordController(@RecoveryKeyWindow Stage window, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, @FxmlScene(FxmlFile.RECOVERYKEY_RECOVER) Lazy<Scene> recoverScene, ErrorComponent.Builder errorComponent) {
 		this.window = window;
 		this.vault = vault;
 		this.recoveryKeyFactory = recoveryKeyFactory;
 		this.executor = executor;
 		this.recoveryKey = recoveryKey;
-		this.newPassword = newPassword;
 		this.recoverScene = recoverScene;
-		this.invalidNewPassword = Bindings.createBooleanBinding(this::isInvalidNewPassword, newPassword);
 		this.errorComponent = errorComponent;
 	}
 
@@ -81,7 +77,7 @@ public class RecoveryKeyResetPasswordController implements FxController {
 
 		@Override
 		protected Void call() throws IOException, IllegalArgumentException {
-			recoveryKeyFactory.resetPasswordWithRecoveryKey(vault.getPath(), recoveryKey.get(), newPassword.get());
+			recoveryKeyFactory.resetPasswordWithRecoveryKey(vault.getPath(), recoveryKey.get(), newPasswordController.passwordField.getCharacters());
 			return null;
 		}
 
@@ -89,11 +85,12 @@ public class RecoveryKeyResetPasswordController implements FxController {
 
 	/* Getter/Setter */
 
-	public BooleanBinding invalidNewPasswordProperty() {
-		return invalidNewPassword;
+	public ReadOnlyBooleanProperty validPasswordProperty() {
+		return newPasswordController.passwordsMatchAndSufficientProperty();
 	}
 
-	public boolean isInvalidNewPassword() {
-		return newPassword.get() == null || newPassword.get().length() == 0;
+	public boolean isValidPassword() {
+		return newPasswordController.passwordsMatchAndSufficientProperty().get();
 	}
+
 }
diff --git a/main/ui/src/main/resources/fxml/addvault_new_password.fxml b/main/ui/src/main/resources/fxml/addvault_new_password.fxml
index 7b87bd636..4b62f9b78 100644
--- a/main/ui/src/main/resources/fxml/addvault_new_password.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_new_password.fxml
@@ -23,7 +23,7 @@
 		<Insets topRightBottomLeft="24"/>
 	</padding>
 	<children>
-		<fx:include source="/fxml/new_password.fxml"/>
+		<fx:include fx:id="newPasswordScene" source="/fxml/new_password.fxml"/>
 
 		<Region VBox.vgrow="ALWAYS"/>
 
diff --git a/main/ui/src/main/resources/fxml/changepassword.fxml b/main/ui/src/main/resources/fxml/changepassword.fxml
index 5e8727574..3f077df5d 100644
--- a/main/ui/src/main/resources/fxml/changepassword.fxml
+++ b/main/ui/src/main/resources/fxml/changepassword.fxml
@@ -25,7 +25,7 @@
 
 		<Region prefHeight="12" VBox.vgrow="NEVER"/>
 
-		<fx:include source="/fxml/new_password.fxml"/>
+		<fx:include fx:id="newPassword" source="/fxml/new_password.fxml"/>
 
 		<CheckBox fx:id="finalConfirmationCheckbox" text="%changepassword.finalConfirmation" wrapText="true"/>
 
diff --git a/main/ui/src/main/resources/fxml/recoverykey_reset_password.fxml b/main/ui/src/main/resources/fxml/recoverykey_reset_password.fxml
index 30487c330..085554965 100644
--- a/main/ui/src/main/resources/fxml/recoverykey_reset_password.fxml
+++ b/main/ui/src/main/resources/fxml/recoverykey_reset_password.fxml
@@ -17,7 +17,7 @@
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
-		<fx:include source="/fxml/new_password.fxml"/>
+		<fx:include fx:id="newPassword" source="/fxml/new_password.fxml"/>
 
 		<Region VBox.vgrow="ALWAYS"/>
 
@@ -25,7 +25,7 @@
 			<ButtonBar buttonMinWidth="120" buttonOrder="B+I">
 				<buttons>
 					<Button text="%generic.button.back" ButtonBar.buttonData="BACK_PREVIOUS" cancelButton="true" onAction="#back"/>
-					<Button text="%generic.button.done" ButtonBar.buttonData="FINISH" defaultButton="true" onAction="#done" disable="${controller.invalidNewPassword}"/>
+					<Button text="%generic.button.done" ButtonBar.buttonData="FINISH" defaultButton="true" onAction="#done" disable="${!controller.validPassword}"/>
 				</buttons>
 			</ButtonBar>
 		</VBox>

From 749e0ac02d0f3832d683ff83692e9022ef2a504b Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Mon, 17 May 2021 12:40:29 +0200
Subject: [PATCH 20/67] disable export-button as long as no batch run is
 finished

---
 .../cryptomator/ui/health/CheckListController.java   | 12 ++++++++++++
 .../src/main/resources/fxml/health_check_list.fxml   |  3 +--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
index 700230e45..2982f01a6 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
@@ -19,12 +19,14 @@ import javafx.fxml.FXML;
 import javafx.scene.control.ListView;
 import java.io.IOException;
 import java.util.Collection;
+import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
 @HealthCheckScoped
 public class CheckListController implements FxController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(CheckListController.class);
+	private static final Set<Worker.State> endStates = Set.of(Worker.State.FAILED, Worker.State.CANCELLED, Worker.State.SUCCEEDED);
 
 	private final ObservableList<HealthCheckTask> tasks;
 	private final ReportWriter reportWriter;
@@ -32,6 +34,7 @@ public class CheckListController implements FxController {
 	private final ObjectProperty<HealthCheckTask> selectedTask;
 	private final SimpleObjectProperty<Worker<?>> runningTask;
 	private final Binding<Boolean> running;
+	private final Binding<Boolean> finished;
 	private final BooleanBinding anyCheckSelected;
 	private final BooleanBinding readyToRun;
 
@@ -47,6 +50,7 @@ public class CheckListController implements FxController {
 		this.selectedTask = selectedTask;
 		this.runningTask = new SimpleObjectProperty<>();
 		this.running = EasyBind.wrapNullable(runningTask).mapObservable(Worker::runningProperty).orElse(false);
+		this.finished = EasyBind.wrapNullable(runningTask).mapObservable(Worker::stateProperty).map(endStates::contains).orElse(false);
 		this.anyCheckSelected = selectedTask.isNotNull();
 		this.readyToRun = runningTask.isNull();
 	}
@@ -109,6 +113,14 @@ public class CheckListController implements FxController {
 		return running;
 	}
 
+	public boolean isFinished() {
+		return finished.getValue();
+	}
+
+	public Binding<Boolean> finishedProperty() {
+		return finished;
+	}
+
 	public boolean isAnyCheckSelected() {
 		return anyCheckSelected.get();
 	}
diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
index 377b93724..93ceaaae7 100644
--- a/main/ui/src/main/resources/fxml/health_check_list.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -31,8 +31,7 @@
 		</HBox>
 		<ButtonBar buttonMinWidth="120" buttonOrder="+X">
 			<buttons>
-				<!-- TODO: hide/disable if no results yet -->
-				<Button text="TODO Export Results" ButtonBar.buttonData="NEXT_FORWARD" disable="${controller.running}" onAction="#exportResults"/>
+				<Button text="TODO Export Results" ButtonBar.buttonData="NEXT_FORWARD" disable="${!controller.finished}" onAction="#exportResults"/>
 			</buttons>
 		</ButtonBar>
 	</children>

From 8e1be4c67b66ece248008a011262c437f1f30393 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Mon, 17 May 2021 12:49:08 +0200
Subject: [PATCH 21/67] remove redundant property, fix logic error

---
 .../org/cryptomator/ui/health/CheckListController.java     | 7 +++----
 main/ui/src/main/resources/fxml/health_check_list.fxml     | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
index 2982f01a6..fdad919cc 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
@@ -35,7 +35,6 @@ public class CheckListController implements FxController {
 	private final SimpleObjectProperty<Worker<?>> runningTask;
 	private final Binding<Boolean> running;
 	private final Binding<Boolean> finished;
-	private final BooleanBinding anyCheckSelected;
 	private final BooleanBinding readyToRun;
 
 	/* FXML */
@@ -51,7 +50,6 @@ public class CheckListController implements FxController {
 		this.runningTask = new SimpleObjectProperty<>();
 		this.running = EasyBind.wrapNullable(runningTask).mapObservable(Worker::runningProperty).orElse(false);
 		this.finished = EasyBind.wrapNullable(runningTask).mapObservable(Worker::stateProperty).map(endStates::contains).orElse(false);
-		this.anyCheckSelected = selectedTask.isNotNull();
 		this.readyToRun = runningTask.isNull();
 	}
 
@@ -91,6 +89,7 @@ public class CheckListController implements FxController {
 		try {
 			reportWriter.writeReport(tasks);
 		} catch (IOException e) {
+			//TODO: better error handling
 			LOG.error("Failed to write health check report.", e);
 		}
 	}
@@ -122,10 +121,10 @@ public class CheckListController implements FxController {
 	}
 
 	public boolean isAnyCheckSelected() {
-		return anyCheckSelected.get();
+		return anyCheckSelectedProperty().get();
 	}
 
 	public BooleanBinding anyCheckSelectedProperty() {
-		return anyCheckSelected;
+		return selectedTask.isNotNull();
 	}
 }
diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
index 93ceaaae7..b7520a08a 100644
--- a/main/ui/src/main/resources/fxml/health_check_list.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -23,7 +23,7 @@
 				<Label fx:id="listHeading" text="Health checks"/>
 				<ListView fx:id="checksListView"/>
 				<!-- TODO: clean up button states: -->
-				<Button text="TODO: run selected" onAction="#runSelectedChecks" disable="${controller.anyCheckSelected}" visible="${controller.readyToRun}" managed="${controller.readyToRun}" maxWidth="Infinity"/>
+				<Button text="TODO: run selected" onAction="#runSelectedChecks" disable="${!controller.anyCheckSelected}" visible="${controller.readyToRun}" managed="${controller.readyToRun}" maxWidth="Infinity"/>
 				<Button text="TODO: run all" onAction="#runAllChecks" visible="${controller.readyToRun}" managed="${controller.readyToRun}" maxWidth="Infinity"/>
 				<Button text="%generic.button.cancel" onAction="#cancelCheck" visible="${controller.running}" managed="${controller.running}" maxWidth="Infinity"/>
 			</VBox>

From d2680b98575f42905c72399bcf3149a92612d8d3 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Mon, 17 May 2021 13:06:28 +0200
Subject: [PATCH 22/67] Rename controller and fxml file which represents the
 whole health check screen

---
 .../src/main/java/org/cryptomator/ui/common/FxmlFile.java   | 2 +-
 .../{CheckListController.java => CheckController.java}      | 6 +++---
 .../java/org/cryptomator/ui/health/HealthCheckModule.java   | 5 ++---
 .../fxml/{health_check_list.fxml => health_check.fxml}      | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)
 rename main/ui/src/main/java/org/cryptomator/ui/health/{CheckListController.java => CheckController.java} (93%)
 rename main/ui/src/main/resources/fxml/{health_check_list.fxml => health_check.fxml} (96%)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
index 32c142762..a1773d7af 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
@@ -12,7 +12,7 @@ public enum FxmlFile {
 	ERROR("/fxml/error.fxml"), //
 	FORGET_PASSWORD("/fxml/forget_password.fxml"), //
 	HEALTH_START("/fxml/health_start.fxml"), //
-	HEALTH_CHECK("/fxml/health_check_list.fxml"), //
+	HEALTH_CHECK("/fxml/health_check.fxml"), //
 	LOCK_FORCED("/fxml/lock_forced.fxml"), //
 	LOCK_FAILED("/fxml/lock_failed.fxml"), //
 	MAIN_WINDOW("/fxml/main_window.fxml"), //
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
similarity index 93%
rename from main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
rename to main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
index fdad919cc..b301982ad 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
@@ -23,9 +23,9 @@ import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
 @HealthCheckScoped
-public class CheckListController implements FxController {
+public class CheckController implements FxController {
 
-	private static final Logger LOG = LoggerFactory.getLogger(CheckListController.class);
+	private static final Logger LOG = LoggerFactory.getLogger(CheckController.class);
 	private static final Set<Worker.State> endStates = Set.of(Worker.State.FAILED, Worker.State.CANCELLED, Worker.State.SUCCEEDED);
 
 	private final ObservableList<HealthCheckTask> tasks;
@@ -42,7 +42,7 @@ public class CheckListController implements FxController {
 
 
 	@Inject
-	public CheckListController(Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService) {
+	public CheckController(Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService) {
 		this.tasks = FXCollections.observableArrayList(tasks.get());
 		this.reportWriter = reportWriteTask;
 		this.executorService = executorService;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
index aafb5cb22..a410d3f13 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
@@ -27,7 +27,6 @@ import javafx.scene.Scene;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import java.security.SecureRandom;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
@@ -126,8 +125,8 @@ abstract class HealthCheckModule {
 
 	@Binds
 	@IntoMap
-	@FxControllerKey(CheckListController.class)
-	abstract FxController bindCheckController(CheckListController controller);
+	@FxControllerKey(CheckController.class)
+	abstract FxController bindChecksController(CheckController controller);
 
 	@Binds
 	@IntoMap
diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check.fxml
similarity index 96%
rename from main/ui/src/main/resources/fxml/health_check_list.fxml
rename to main/ui/src/main/resources/fxml/health_check.fxml
index b7520a08a..84c7d66c4 100644
--- a/main/ui/src/main/resources/fxml/health_check_list.fxml
+++ b/main/ui/src/main/resources/fxml/health_check.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.VBox?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
-	  fx:controller="org.cryptomator.ui.health.CheckListController"
+	  fx:controller="org.cryptomator.ui.health.CheckController"
 	  minWidth="400"
 	  maxWidth="400"
 	  minHeight="145"

From dfbe01731688a62a656665650ebd2fbf726de9b2 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 18 May 2021 08:47:40 +0200
Subject: [PATCH 23/67] Partially revert 8e1be4c

---
 .../java/org/cryptomator/ui/health/CheckController.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
index b301982ad..cd5c44a40 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
@@ -35,6 +35,7 @@ public class CheckController implements FxController {
 	private final SimpleObjectProperty<Worker<?>> runningTask;
 	private final Binding<Boolean> running;
 	private final Binding<Boolean> finished;
+	private final BooleanBinding anyCheckSelected;
 	private final BooleanBinding readyToRun;
 
 	/* FXML */
@@ -51,6 +52,7 @@ public class CheckController implements FxController {
 		this.running = EasyBind.wrapNullable(runningTask).mapObservable(Worker::runningProperty).orElse(false);
 		this.finished = EasyBind.wrapNullable(runningTask).mapObservable(Worker::stateProperty).map(endStates::contains).orElse(false);
 		this.readyToRun = runningTask.isNull();
+		this.anyCheckSelected = selectedTask.isNotNull();
 	}
 
 	@FXML
@@ -121,10 +123,11 @@ public class CheckController implements FxController {
 	}
 
 	public boolean isAnyCheckSelected() {
-		return anyCheckSelectedProperty().get();
+		return anyCheckSelected.get();
 	}
 
 	public BooleanBinding anyCheckSelectedProperty() {
-		return selectedTask.isNotNull();
+		return anyCheckSelected;
 	}
+
 }

From 9d89efc98c79547c9e2705937865494c6e552b9a Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 18 May 2021 09:09:53 +0200
Subject: [PATCH 24/67] Unify interface: * move all buttons to one button bar *
 switch between runAll and runSelected, depending on list selection * add a
 little localization

---
 .../ui/health/CheckController.java            | 37 ++++++++++++++-----
 .../src/main/resources/fxml/health_check.fxml | 22 ++++++-----
 .../main/resources/i18n/strings.properties    |  2 +
 3 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
index cd5c44a40..b7115e2d5 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
@@ -12,6 +12,9 @@ import javafx.beans.binding.Binding;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.concurrent.Worker;
@@ -19,6 +22,7 @@ import javafx.fxml.FXML;
 import javafx.scene.control.ListView;
 import java.io.IOException;
 import java.util.Collection;
+import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
@@ -32,27 +36,31 @@ public class CheckController implements FxController {
 	private final ReportWriter reportWriter;
 	private final ExecutorService executorService;
 	private final ObjectProperty<HealthCheckTask> selectedTask;
+	private final ResourceBundle resourceBundle;
 	private final SimpleObjectProperty<Worker<?>> runningTask;
 	private final Binding<Boolean> running;
 	private final Binding<Boolean> finished;
 	private final BooleanBinding anyCheckSelected;
 	private final BooleanBinding readyToRun;
+	private final StringProperty runButtonDescription;
 
 	/* FXML */
 	public ListView<HealthCheckTask> checksListView;
 
 
 	@Inject
-	public CheckController(Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService) {
+	public CheckController(Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService, ResourceBundle resourceBundle) {
 		this.tasks = FXCollections.observableArrayList(tasks.get());
 		this.reportWriter = reportWriteTask;
 		this.executorService = executorService;
 		this.selectedTask = selectedTask;
+		this.resourceBundle = resourceBundle;
 		this.runningTask = new SimpleObjectProperty<>();
 		this.running = EasyBind.wrapNullable(runningTask).mapObservable(Worker::runningProperty).orElse(false);
 		this.finished = EasyBind.wrapNullable(runningTask).mapObservable(Worker::stateProperty).map(endStates::contains).orElse(false);
 		this.readyToRun = runningTask.isNull();
 		this.anyCheckSelected = selectedTask.isNotNull();
+		this.runButtonDescription = new SimpleStringProperty(resourceBundle.getString("health.check.runAllButton"));
 	}
 
 	@FXML
@@ -60,24 +68,33 @@ public class CheckController implements FxController {
 		checksListView.setItems(tasks);
 		checksListView.setCellFactory(ignored -> new CheckListCell());
 		selectedTask.bind(checksListView.getSelectionModel().selectedItemProperty());
+		selectedTask.addListener(this::updateRunButtonDescription);
+	}
+
+	private void updateRunButtonDescription(ObservableValue<? extends HealthCheckTask> observable, HealthCheckTask oldTask, HealthCheckTask newTask) {
+		if (newTask == null) {
+			runButtonDescription.set(resourceBundle.getString("health.check.runSingleButton"));
+		} else if (oldTask == null && newTask != null) {
+			runButtonDescription.set(resourceBundle.getString("health.check.runAllButton"));
+		}
 	}
 
 	@FXML
 	public synchronized void runSelectedChecks() {
-		Preconditions.checkState(runningTask.get() == null);
-		var batch = new BatchService(checksListView.getSelectionModel().getSelectedItems());
-		batch.setExecutor(executorService);
-		batch.start();
-		runningTask.set(batch);
+		startBatch(checksListView.getSelectionModel().getSelectedItems());
 	}
 
 	@FXML
 	public synchronized void runAllChecks() {
+		startBatch(checksListView.getItems());
+	}
+
+	private void startBatch(Iterable<HealthCheckTask> batch) {
 		Preconditions.checkState(runningTask.get() == null);
-		var batch = new BatchService(checksListView.getItems());
-		batch.setExecutor(executorService);
-		batch.start();
-		runningTask.set(batch);
+		var batchService = new BatchService(batch);
+		batchService.setExecutor(executorService);
+		batchService.start();
+		runningTask.set(batchService);
 	}
 
 	@FXML
diff --git a/main/ui/src/main/resources/fxml/health_check.fxml b/main/ui/src/main/resources/fxml/health_check.fxml
index 84c7d66c4..75efd0465 100644
--- a/main/ui/src/main/resources/fxml/health_check.fxml
+++ b/main/ui/src/main/resources/fxml/health_check.fxml
@@ -18,20 +18,24 @@
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
-		<HBox>
-			<VBox minWidth="80">
+		<HBox spacing="12">
+			<VBox minWidth="80" spacing="6">
 				<Label fx:id="listHeading" text="Health checks"/>
 				<ListView fx:id="checksListView"/>
-				<!-- TODO: clean up button states: -->
-				<Button text="TODO: run selected" onAction="#runSelectedChecks" disable="${!controller.anyCheckSelected}" visible="${controller.readyToRun}" managed="${controller.readyToRun}" maxWidth="Infinity"/>
-				<Button text="TODO: run all" onAction="#runAllChecks" visible="${controller.readyToRun}" managed="${controller.readyToRun}" maxWidth="Infinity"/>
-				<Button text="%generic.button.cancel" onAction="#cancelCheck" visible="${controller.running}" managed="${controller.running}" maxWidth="Infinity"/>
 			</VBox>
-			<fx:include source="/fxml/health_check_details.fxml" visible="${controller.anyCheckSelected}" managed="${controller.anyCheckSelected}"/>
+			<!-- Maybe use class Seperator ?-->
+			<fx:include  source="/fxml/health_check_details.fxml" visible="${controller.anyCheckSelected}" managed="${controller.anyCheckSelected}"/>
+			<VBox alignment="CENTER" >
+				<Label text="TODO: Select a Check from the left list to get more info." wrapText="true" alignment="CENTER" visible="${!controller.anyCheckSelected}" managed="${!controller.anyCheckSelected}" />
+			</VBox>
 		</HBox>
-		<ButtonBar buttonMinWidth="120" buttonOrder="+X">
+		<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
 			<buttons>
-				<Button text="TODO Export Results" ButtonBar.buttonData="NEXT_FORWARD" disable="${!controller.finished}" onAction="#exportResults"/>
+				<!-- Buttons have a prefWidth to prevent uneven interface -->
+				<Button prefWidth="20" text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" onAction="#cancelCheck" visible="${controller.running}" managed="${controller.running}" />
+				<Button prefWidth="20" text="TODO: run all" ButtonBar.buttonData="NEXT_FORWARD" onAction="#runAllChecks" visible="${controller.readyToRun &amp;&amp; !controller.anyCheckSelected}" managed="${controller.readyToRun &amp;&amp; !controller.anyCheckSelected}" />
+				<Button prefWidth="20" text="TODO: run selected" ButtonBar.buttonData="NEXT_FORWARD" onAction="#runSelectedChecks" visible="${controller.readyToRun &amp;&amp; controller.anyCheckSelected}" managed="${controller.readyToRun &amp;&amp; controller.anyCheckSelected}" />
+				<Button text="TODO Export Results" ButtonBar.buttonData="NEXT_FORWARD" disable="${!controller.finished}" visible="${!controller.readyToRun}" managed="${!controller.readyToRun}" onAction="#exportResults"/>
 			</buttons>
 		</ButtonBar>
 	</children>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index ce9c69eea..dec159f7d 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -148,6 +148,8 @@ migration.impossible.moreInfo=The vault can still be opened with an older versio
 
 # Health Check
 health.title=Vault Check
+health.check.runSingleButton=Run selected Check
+health.check.runAllButton=Run all Checks
 
 # Preferences
 preferences.title=Preferences

From 66a8dc98119174a7b256c17451ba3fb16f4f3a58 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 18 May 2021 13:36:00 +0200
Subject: [PATCH 25/67] Revert d2680b98575f42905c72399bcf3149a92612d8d3

---
 .../src/main/java/org/cryptomator/ui/common/FxmlFile.java   | 2 +-
 .../{CheckController.java => CheckListController.java}      | 6 +++---
 .../java/org/cryptomator/ui/health/HealthCheckModule.java   | 5 +++--
 .../fxml/{health_check.fxml => health_check_list.fxml}      | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)
 rename main/ui/src/main/java/org/cryptomator/ui/health/{CheckController.java => CheckListController.java} (93%)
 rename main/ui/src/main/resources/fxml/{health_check.fxml => health_check_list.fxml} (97%)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
index a1773d7af..32c142762 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
@@ -12,7 +12,7 @@ public enum FxmlFile {
 	ERROR("/fxml/error.fxml"), //
 	FORGET_PASSWORD("/fxml/forget_password.fxml"), //
 	HEALTH_START("/fxml/health_start.fxml"), //
-	HEALTH_CHECK("/fxml/health_check.fxml"), //
+	HEALTH_CHECK("/fxml/health_check_list.fxml"), //
 	LOCK_FORCED("/fxml/lock_forced.fxml"), //
 	LOCK_FAILED("/fxml/lock_failed.fxml"), //
 	MAIN_WINDOW("/fxml/main_window.fxml"), //
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
similarity index 93%
rename from main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
rename to main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
index b7115e2d5..cf73e1127 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
@@ -27,9 +27,9 @@ import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
 @HealthCheckScoped
-public class CheckController implements FxController {
+public class CheckListController implements FxController {
 
-	private static final Logger LOG = LoggerFactory.getLogger(CheckController.class);
+	private static final Logger LOG = LoggerFactory.getLogger(CheckListController.class);
 	private static final Set<Worker.State> endStates = Set.of(Worker.State.FAILED, Worker.State.CANCELLED, Worker.State.SUCCEEDED);
 
 	private final ObservableList<HealthCheckTask> tasks;
@@ -49,7 +49,7 @@ public class CheckController implements FxController {
 
 
 	@Inject
-	public CheckController(Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService, ResourceBundle resourceBundle) {
+	public CheckListController(Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService, ResourceBundle resourceBundle) {
 		this.tasks = FXCollections.observableArrayList(tasks.get());
 		this.reportWriter = reportWriteTask;
 		this.executorService = executorService;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
index a410d3f13..aafb5cb22 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
@@ -27,6 +27,7 @@ import javafx.scene.Scene;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import java.security.SecureRandom;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
@@ -125,8 +126,8 @@ abstract class HealthCheckModule {
 
 	@Binds
 	@IntoMap
-	@FxControllerKey(CheckController.class)
-	abstract FxController bindChecksController(CheckController controller);
+	@FxControllerKey(CheckListController.class)
+	abstract FxController bindCheckController(CheckListController controller);
 
 	@Binds
 	@IntoMap
diff --git a/main/ui/src/main/resources/fxml/health_check.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
similarity index 97%
rename from main/ui/src/main/resources/fxml/health_check.fxml
rename to main/ui/src/main/resources/fxml/health_check_list.fxml
index 75efd0465..67f770304 100644
--- a/main/ui/src/main/resources/fxml/health_check.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.VBox?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
-	  fx:controller="org.cryptomator.ui.health.CheckController"
+	  fx:controller="org.cryptomator.ui.health.CheckListController"
 	  minWidth="400"
 	  maxWidth="400"
 	  minHeight="145"

From 20f88e203a0ab341c587be7d4ee40b1ae1931376 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 18 May 2021 13:40:56 +0200
Subject: [PATCH 26/67] simplification and cleanup

---
 .../ui/health/CheckListController.java        | 23 +++----------------
 .../resources/fxml/health_check_list.fxml     |  4 ++--
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
index cf73e1127..48e846f60 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
@@ -12,9 +12,6 @@ import javafx.beans.binding.Binding;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.concurrent.Worker;
@@ -22,7 +19,6 @@ import javafx.fxml.FXML;
 import javafx.scene.control.ListView;
 import java.io.IOException;
 import java.util.Collection;
-import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
@@ -30,37 +26,33 @@ import java.util.concurrent.ExecutorService;
 public class CheckListController implements FxController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(CheckListController.class);
-	private static final Set<Worker.State> endStates = Set.of(Worker.State.FAILED, Worker.State.CANCELLED, Worker.State.SUCCEEDED);
+	private static final Set<Worker.State> END_STATES = Set.of(Worker.State.FAILED, Worker.State.CANCELLED, Worker.State.SUCCEEDED);
 
 	private final ObservableList<HealthCheckTask> tasks;
 	private final ReportWriter reportWriter;
 	private final ExecutorService executorService;
 	private final ObjectProperty<HealthCheckTask> selectedTask;
-	private final ResourceBundle resourceBundle;
 	private final SimpleObjectProperty<Worker<?>> runningTask;
 	private final Binding<Boolean> running;
 	private final Binding<Boolean> finished;
 	private final BooleanBinding anyCheckSelected;
 	private final BooleanBinding readyToRun;
-	private final StringProperty runButtonDescription;
 
 	/* FXML */
 	public ListView<HealthCheckTask> checksListView;
 
 
 	@Inject
-	public CheckListController(Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService, ResourceBundle resourceBundle) {
+	public CheckListController(Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService) {
 		this.tasks = FXCollections.observableArrayList(tasks.get());
 		this.reportWriter = reportWriteTask;
 		this.executorService = executorService;
 		this.selectedTask = selectedTask;
-		this.resourceBundle = resourceBundle;
 		this.runningTask = new SimpleObjectProperty<>();
 		this.running = EasyBind.wrapNullable(runningTask).mapObservable(Worker::runningProperty).orElse(false);
-		this.finished = EasyBind.wrapNullable(runningTask).mapObservable(Worker::stateProperty).map(endStates::contains).orElse(false);
+		this.finished = EasyBind.wrapNullable(runningTask).mapObservable(Worker::stateProperty).map(END_STATES::contains).orElse(false);
 		this.readyToRun = runningTask.isNull();
 		this.anyCheckSelected = selectedTask.isNotNull();
-		this.runButtonDescription = new SimpleStringProperty(resourceBundle.getString("health.check.runAllButton"));
 	}
 
 	@FXML
@@ -68,15 +60,6 @@ public class CheckListController implements FxController {
 		checksListView.setItems(tasks);
 		checksListView.setCellFactory(ignored -> new CheckListCell());
 		selectedTask.bind(checksListView.getSelectionModel().selectedItemProperty());
-		selectedTask.addListener(this::updateRunButtonDescription);
-	}
-
-	private void updateRunButtonDescription(ObservableValue<? extends HealthCheckTask> observable, HealthCheckTask oldTask, HealthCheckTask newTask) {
-		if (newTask == null) {
-			runButtonDescription.set(resourceBundle.getString("health.check.runSingleButton"));
-		} else if (oldTask == null && newTask != null) {
-			runButtonDescription.set(resourceBundle.getString("health.check.runAllButton"));
-		}
 	}
 
 	@FXML
diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
index 67f770304..7df32221b 100644
--- a/main/ui/src/main/resources/fxml/health_check_list.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -33,8 +33,8 @@
 			<buttons>
 				<!-- Buttons have a prefWidth to prevent uneven interface -->
 				<Button prefWidth="20" text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" onAction="#cancelCheck" visible="${controller.running}" managed="${controller.running}" />
-				<Button prefWidth="20" text="TODO: run all" ButtonBar.buttonData="NEXT_FORWARD" onAction="#runAllChecks" visible="${controller.readyToRun &amp;&amp; !controller.anyCheckSelected}" managed="${controller.readyToRun &amp;&amp; !controller.anyCheckSelected}" />
-				<Button prefWidth="20" text="TODO: run selected" ButtonBar.buttonData="NEXT_FORWARD" onAction="#runSelectedChecks" visible="${controller.readyToRun &amp;&amp; controller.anyCheckSelected}" managed="${controller.readyToRun &amp;&amp; controller.anyCheckSelected}" />
+				<Button prefWidth="20" text="%health.check.runAllButton" ButtonBar.buttonData="NEXT_FORWARD" onAction="#runAllChecks" visible="${controller.readyToRun &amp;&amp; !controller.anyCheckSelected}" managed="${controller.readyToRun &amp;&amp; !controller.anyCheckSelected}" />
+				<Button prefWidth="20" text="%health.check.runSingleButton" ButtonBar.buttonData="NEXT_FORWARD" onAction="#runSelectedChecks" visible="${controller.readyToRun &amp;&amp; controller.anyCheckSelected}" managed="${controller.readyToRun &amp;&amp; controller.anyCheckSelected}" />
 				<Button text="TODO Export Results" ButtonBar.buttonData="NEXT_FORWARD" disable="${!controller.finished}" visible="${!controller.readyToRun}" managed="${!controller.readyToRun}" onAction="#exportResults"/>
 			</buttons>
 		</ButtonBar>

From 66e3625a0b613af66fd30637d95dace41f43ad9f Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 18 May 2021 16:49:39 +0200
Subject: [PATCH 27/67] Wrap diagnostic result in object to prepare it for
 possible fix action

---
 .../ui/health/CheckDetailController.java      | 13 +++--
 .../ui/health/DiagnosticResultAction.java     | 47 +++++++++++++++++++
 .../ui/health/HealthCheckTask.java            |  6 +--
 .../cryptomator/ui/health/ReportWriter.java   |  2 +-
 4 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/DiagnosticResultAction.java

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
index 60bb0522f..a7212681a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
@@ -2,7 +2,6 @@ package org.cryptomator.ui.health;
 
 import com.tobiasdiez.easybind.EasyBind;
 import com.tobiasdiez.easybind.optional.OptionalBinding;
-import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
@@ -19,15 +18,15 @@ import javafx.scene.control.TableView;
 
 public class CheckDetailController implements FxController {
 
-	private final Binding<ObservableList<DiagnosticResult>> results;
+	private final Binding<ObservableList<DiagnosticResultAction>> results;
 	private final OptionalBinding<Worker.State> taskState;
 	private final Binding<String> taskName;
 	private final Binding<String> taskDescription;
 	private final BooleanBinding producingResults;
 
-	public TableView<DiagnosticResult> resultsTableView;
-	public TableColumn<DiagnosticResult, String> resultDescriptionColumn;
-	public TableColumn<DiagnosticResult, String> resultSeverityColumn;
+	public TableView<DiagnosticResultAction> resultsTableView;
+	public TableColumn<DiagnosticResultAction, String> resultDescriptionColumn;
+	public TableColumn<DiagnosticResultAction, String> resultSeverityColumn;
 
 	@Inject
 	public CheckDetailController(ObjectProperty<HealthCheckTask> selectedTask) {
@@ -48,8 +47,8 @@ public class CheckDetailController implements FxController {
 	@FXML
 	public void initialize() {
 		resultsTableView.itemsProperty().bind(results);
-		resultDescriptionColumn.setCellValueFactory(cellFeatures -> new SimpleStringProperty(cellFeatures.getValue().toString()));
-		resultSeverityColumn.setCellValueFactory(cellFeatures -> new SimpleStringProperty(cellFeatures.getValue().getServerity().name()));
+		resultDescriptionColumn.setCellValueFactory(cellFeatures -> new SimpleStringProperty(cellFeatures.getValue().getDescription()));
+		resultSeverityColumn.setCellValueFactory(cellFeatures -> new SimpleStringProperty(cellFeatures.getValue().getSeverity().name()));
 	}
 	/* Getter/Setter */
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/DiagnosticResultAction.java b/main/ui/src/main/java/org/cryptomator/ui/health/DiagnosticResultAction.java
new file mode 100644
index 000000000..057acbb13
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/DiagnosticResultAction.java
@@ -0,0 +1,47 @@
+package org.cryptomator.ui.health;
+
+import org.cryptomator.cryptofs.VaultConfig;
+import org.cryptomator.cryptofs.health.api.DiagnosticResult;
+import org.cryptomator.cryptolib.api.Masterkey;
+
+import javafx.scene.control.Alert;
+import java.nio.file.Path;
+import java.security.SecureRandom;
+
+class DiagnosticResultAction implements Runnable {
+
+	private final DiagnosticResult result;
+	private final Path vaultPath;
+	private final VaultConfig vaultConfig;
+	private final Masterkey masterkey;
+	private final SecureRandom csprng;
+
+	DiagnosticResultAction(DiagnosticResult result, Path vaultPath, VaultConfig vaultConfig, Masterkey masterkey, SecureRandom csprng) {
+		this.result = result;
+		this.vaultPath = vaultPath;
+		this.vaultConfig = vaultConfig;
+		this.masterkey = masterkey;
+		this.csprng = csprng;
+	}
+
+	public void run() {
+		try (var masterkeyClone = masterkey.clone(); //
+			 var cryptor = vaultConfig.getCipherCombo().getCryptorProvider(csprng).withKey(masterkeyClone)) {
+			result.fix(vaultPath, vaultConfig, masterkeyClone, cryptor);
+		} catch (Exception e) {
+			e.printStackTrace();
+			Alert alert = new Alert(Alert.AlertType.ERROR, e.getMessage());
+			alert.showAndWait();
+			//TODO: real error/not supported handling
+		}
+	}
+
+	public DiagnosticResult.Severity getSeverity() {
+		return result.getServerity(); //TODO: fix spelling with updated cryptofs release
+	}
+
+	public String getDescription() {
+		return result.toString();
+	}
+
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
index 7636ab8d9..b7bbc321e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
@@ -25,7 +25,7 @@ class HealthCheckTask extends Task<Void> {
 	private final Masterkey masterkey;
 	private final SecureRandom csprng;
 	private final HealthCheck check;
-	private final ObservableList<DiagnosticResult> results;
+	private final ObservableList<DiagnosticResultAction> results;
 
 	public HealthCheckTask(Path vaultPath, VaultConfig vaultConfig, Masterkey masterkey, SecureRandom csprng, HealthCheck check) {
 		this.vaultPath = Objects.requireNonNull(vaultPath);
@@ -58,7 +58,7 @@ class HealthCheckTask extends Task<Void> {
 						throw new RuntimeException(e);
 					}
 				}
-				Platform.runLater(() -> results.add(result));
+				Platform.runLater(() -> results.add(new DiagnosticResultAction(result,vaultPath,vaultConfig, masterkey,csprng))); //FIXME: there can be a lotta results, each with a reference to the master key -> differentiate with severity!
 			});
 		}
 		return null;
@@ -76,7 +76,7 @@ class HealthCheckTask extends Task<Void> {
 
 	/* Getter */
 
-	public ObservableList<DiagnosticResult> results() {
+	public ObservableList<DiagnosticResultAction> results() {
 		return results;
 	}
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java b/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
index 4e03500be..ac571d18e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
@@ -67,7 +67,7 @@ public class ReportWriter {
 					case SUCCEEDED -> {
 						writer.write("STATUS: SUCCESS\nRESULTS:\n");
 						for (var result : task.results()) {
-							writer.write(REPORT_CHECK_RESULT.formatted(result.getServerity(), result));
+							writer.write(REPORT_CHECK_RESULT.formatted(result.getSeverity(), result));
 						}
 					}
 					case CANCELLED -> writer.write("STATUS: CANCELED\n");

From 2b332c3831898c625408d3c3f86fb265fbf4d6b2 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 18 May 2021 16:53:48 +0200
Subject: [PATCH 28/67] Add column with action button

---
 .../ui/health/CheckDetailController.java      |  4 +++
 .../ui/health/ResultActionTableCell.java      | 30 +++++++++++++++++++
 .../resources/fxml/health_check_details.fxml  |  6 ++--
 3 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/ResultActionTableCell.java

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
index a7212681a..c4943d9c8 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
@@ -8,6 +8,7 @@ import javax.inject.Inject;
 import javafx.beans.binding.Binding;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -27,6 +28,7 @@ public class CheckDetailController implements FxController {
 	public TableView<DiagnosticResultAction> resultsTableView;
 	public TableColumn<DiagnosticResultAction, String> resultDescriptionColumn;
 	public TableColumn<DiagnosticResultAction, String> resultSeverityColumn;
+	public TableColumn<DiagnosticResultAction, Runnable> resultActionColumn;
 
 	@Inject
 	public CheckDetailController(ObjectProperty<HealthCheckTask> selectedTask) {
@@ -49,6 +51,8 @@ public class CheckDetailController implements FxController {
 		resultsTableView.itemsProperty().bind(results);
 		resultDescriptionColumn.setCellValueFactory(cellFeatures -> new SimpleStringProperty(cellFeatures.getValue().getDescription()));
 		resultSeverityColumn.setCellValueFactory(cellFeatures -> new SimpleStringProperty(cellFeatures.getValue().getSeverity().name()));
+		resultActionColumn.setCellValueFactory(cellFeatures -> new SimpleObjectProperty<>(cellFeatures.getValue()));
+		resultActionColumn.setCellFactory(column -> new ResultActionTableCell());
 	}
 	/* Getter/Setter */
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ResultActionTableCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/ResultActionTableCell.java
new file mode 100644
index 000000000..5781e514b
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ResultActionTableCell.java
@@ -0,0 +1,30 @@
+package org.cryptomator.ui.health;
+
+import javafx.geometry.Pos;
+import javafx.scene.control.Button;
+import javafx.scene.control.TableCell;
+
+class ResultActionTableCell extends TableCell<DiagnosticResultAction, Runnable> {
+
+	private Button button;
+
+	ResultActionTableCell() {
+		button = new Button();
+		setGraphic(null);
+	}
+
+	@Override
+	protected void updateItem(Runnable item, boolean empty) {
+		super.updateItem(item, empty);
+		if (empty || item == null) {
+			setText(null);
+			setGraphic(null);
+		} else {
+			setGraphic(button);
+			button.setOnAction(event -> item.run());
+			button.setText("FIXME"); //FIXME
+			button.setAlignment(Pos.CENTER);
+		}
+	}
+
+}
diff --git a/main/ui/src/main/resources/fxml/health_check_details.fxml b/main/ui/src/main/resources/fxml/health_check_details.fxml
index bf884f6dc..1cff49dd8 100644
--- a/main/ui/src/main/resources/fxml/health_check_details.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_details.fxml
@@ -13,9 +13,9 @@
 	<Text fx:id="checkDescription" styleClass="label" text="${controller.taskDescription}"/>
 	<TableView fx:id="resultsTableView" visible="${controller.producingResults}" managed="${controller.producingResults}">
 		<columns>
-			<TableColumn fx:id="resultDescriptionColumn" text="Info" editable="false"/>
-			<TableColumn fx:id="resultSeverityColumn" text="Severity" editable="false"/>
-			<!--TableColumn fx:id="resultAction" text="Action" /-->
+			<TableColumn fx:id="resultDescriptionColumn" text="Info" editable="false" maxWidth="Infinity"/>
+			<TableColumn fx:id="resultSeverityColumn" text="Severity" editable="false" />
+			<TableColumn fx:id="resultActionColumn" text="Action" editable="false"/>
 		</columns>
 	</TableView>
 </VBox>
\ No newline at end of file

From 168f9b9fb9fa63e8fa2ac8d8f5fc02d0337ef782 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 18 May 2021 16:57:25 +0200
Subject: [PATCH 29/67] fix report writer

---
 .../src/main/java/org/cryptomator/ui/health/ReportWriter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java b/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
index ac571d18e..61f1cf55d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
@@ -41,7 +41,7 @@ public class ReportWriter {
 			Check %s
 			------------------------------
 			""";
-	private static final String REPORT_CHECK_RESULT = "%8s - %s";
+	private static final String REPORT_CHECK_RESULT = "%8s - %s\n";
 	private static final DateTimeFormatter TIME_STAMP = DateTimeFormatter.ofPattern("yyyyMMdd-HHmmss").withZone(ZoneId.systemDefault());
 
 	private final Vault vault;
@@ -67,7 +67,7 @@ public class ReportWriter {
 					case SUCCEEDED -> {
 						writer.write("STATUS: SUCCESS\nRESULTS:\n");
 						for (var result : task.results()) {
-							writer.write(REPORT_CHECK_RESULT.formatted(result.getSeverity(), result));
+							writer.write(REPORT_CHECK_RESULT.formatted(result.getSeverity(), result.getDescription()));
 						}
 					}
 					case CANCELLED -> writer.write("STATUS: CANCELED\n");

From a7133dbebe775244dd95fab298bd690a426d6760 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 18 May 2021 17:12:37 +0200
Subject: [PATCH 30/67] Add icon to severity column

---
 .../ui/health/CheckDetailController.java      |  6 ++--
 .../ui/health/ResultSeverityTableCell.java    | 34 +++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/ResultSeverityTableCell.java

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
index c4943d9c8..404268f8e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
@@ -2,6 +2,7 @@ package org.cryptomator.ui.health;
 
 import com.tobiasdiez.easybind.EasyBind;
 import com.tobiasdiez.easybind.optional.OptionalBinding;
+import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
@@ -27,7 +28,7 @@ public class CheckDetailController implements FxController {
 
 	public TableView<DiagnosticResultAction> resultsTableView;
 	public TableColumn<DiagnosticResultAction, String> resultDescriptionColumn;
-	public TableColumn<DiagnosticResultAction, String> resultSeverityColumn;
+	public TableColumn<DiagnosticResultAction, DiagnosticResult.Severity> resultSeverityColumn;
 	public TableColumn<DiagnosticResultAction, Runnable> resultActionColumn;
 
 	@Inject
@@ -50,7 +51,8 @@ public class CheckDetailController implements FxController {
 	public void initialize() {
 		resultsTableView.itemsProperty().bind(results);
 		resultDescriptionColumn.setCellValueFactory(cellFeatures -> new SimpleStringProperty(cellFeatures.getValue().getDescription()));
-		resultSeverityColumn.setCellValueFactory(cellFeatures -> new SimpleStringProperty(cellFeatures.getValue().getSeverity().name()));
+		resultSeverityColumn.setCellValueFactory(cellFeatures -> new SimpleObjectProperty<>(cellFeatures.getValue().getSeverity()));
+		resultSeverityColumn.setCellFactory(column -> new ResultSeverityTableCell());
 		resultActionColumn.setCellValueFactory(cellFeatures -> new SimpleObjectProperty<>(cellFeatures.getValue()));
 		resultActionColumn.setCellFactory(column -> new ResultActionTableCell());
 	}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ResultSeverityTableCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/ResultSeverityTableCell.java
new file mode 100644
index 000000000..34caa558d
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ResultSeverityTableCell.java
@@ -0,0 +1,34 @@
+package org.cryptomator.ui.health;
+
+import org.cryptomator.cryptofs.health.api.DiagnosticResult;
+import org.cryptomator.ui.controls.FontAwesome5Icon;
+import org.cryptomator.ui.controls.FontAwesome5IconView;
+
+import javafx.scene.control.TableCell;
+
+public class ResultSeverityTableCell extends TableCell<DiagnosticResultAction, DiagnosticResult.Severity> {
+
+	private FontAwesome5IconView iconView;
+
+	ResultSeverityTableCell() {
+		iconView = new FontAwesome5IconView();
+	}
+
+	@Override
+	protected void updateItem(DiagnosticResult.Severity item, boolean empty) {
+		super.updateItem(item, empty);
+		if (empty || item == null) {
+			setText(null);
+			setGraphic(null);
+		} else {
+			iconView.glyphProperty().set(switch (item) {
+				case INFO -> FontAwesome5Icon.INFO_CIRCLE;
+				case GOOD -> FontAwesome5Icon.CHECK;
+				case WARN -> FontAwesome5Icon.EXCLAMATION_TRIANGLE;
+				case CRITICAL -> FontAwesome5Icon.TIMES;
+			});
+			setGraphic(iconView);
+			setText(item.name());
+		}
+	}
+}

From cf13311665fc54f0718765b40753991b55b58502 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Wed, 19 May 2021 09:32:55 +0200
Subject: [PATCH 31/67] add style class to used icon in result view

---
 .../ui/health/ResultSeverityTableCell.java    | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ResultSeverityTableCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/ResultSeverityTableCell.java
index 34caa558d..ee53debb8 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/ResultSeverityTableCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ResultSeverityTableCell.java
@@ -21,12 +21,24 @@ public class ResultSeverityTableCell extends TableCell<DiagnosticResultAction, D
 			setText(null);
 			setGraphic(null);
 		} else {
-			iconView.glyphProperty().set(switch (item) {
-				case INFO -> FontAwesome5Icon.INFO_CIRCLE;
-				case GOOD -> FontAwesome5Icon.CHECK;
-				case WARN -> FontAwesome5Icon.EXCLAMATION_TRIANGLE;
-				case CRITICAL -> FontAwesome5Icon.TIMES;
-			});
+			switch (item) {
+				case INFO -> {
+					iconView.setGlyph(FontAwesome5Icon.INFO_CIRCLE);
+					iconView.getStyleClass().add("glyph-icon-muted");
+				}
+				case GOOD -> {
+					iconView.setGlyph(FontAwesome5Icon.CHECK);
+					iconView.getStyleClass().add("glyph-icon-primary");
+				}
+				case WARN -> {
+					iconView.setGlyph(FontAwesome5Icon.EXCLAMATION_TRIANGLE);
+					iconView.getStyleClass().add("glyph-icon-orange");
+				}
+				case CRITICAL -> {
+					iconView.setGlyph(FontAwesome5Icon.TIMES);
+					iconView.getStyleClass().add("glyph-icon-red");
+				}
+			}
 			setGraphic(iconView);
 			setText(item.name());
 		}

From c7ef0056f933383ff392e67376eb294746a6e0e9 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Wed, 19 May 2021 09:47:38 +0200
Subject: [PATCH 32/67] let UI take space if window size is increased

---
 .../resources/fxml/health_check_list.fxml     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
index 7df32221b..9e2c0e5f1 100644
--- a/main/ui/src/main/resources/fxml/health_check_list.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -7,27 +7,30 @@
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.layout.StackPane?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.health.CheckListController"
 	  minWidth="400"
-	  maxWidth="400"
+	  prefWidth="400"
 	  minHeight="145"
 	  spacing="12">
 	<padding>
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
-		<HBox spacing="12">
-			<VBox minWidth="80" spacing="6">
+		<HBox spacing="12" VBox.vgrow="ALWAYS">
+			<VBox minWidth="80" spacing="6" >
 				<Label fx:id="listHeading" text="Health checks"/>
-				<ListView fx:id="checksListView"/>
+				<ListView fx:id="checksListView" VBox.vgrow="ALWAYS"/>
 			</VBox>
 			<!-- Maybe use class Seperator ?-->
-			<fx:include  source="/fxml/health_check_details.fxml" visible="${controller.anyCheckSelected}" managed="${controller.anyCheckSelected}"/>
-			<VBox alignment="CENTER" >
-				<Label text="TODO: Select a Check from the left list to get more info." wrapText="true" alignment="CENTER" visible="${!controller.anyCheckSelected}" managed="${!controller.anyCheckSelected}" />
-			</VBox>
+			<StackPane HBox.hgrow="ALWAYS">
+				<VBox minWidth="300" alignment="CENTER">
+					<Label text="TODO: Select a Check from the left list to get more info." wrapText="true" alignment="CENTER" visible="${!controller.anyCheckSelected}" />
+				</VBox>
+				<fx:include  source="/fxml/health_check_details.fxml" visible="${controller.anyCheckSelected}" />
+			</StackPane>
 		</HBox>
 		<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
 			<buttons>

From ca0402aaf0a573ebd2bf45e31efc26b2ceab0eab Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Wed, 19 May 2021 12:38:04 +0200
Subject: [PATCH 33/67] clear styleclass of icon view when content of
 ResultSeverityCell changes.

---
 .../java/org/cryptomator/ui/health/ResultSeverityTableCell.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ResultSeverityTableCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/ResultSeverityTableCell.java
index ee53debb8..a5a7b04b2 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/ResultSeverityTableCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ResultSeverityTableCell.java
@@ -17,6 +17,7 @@ public class ResultSeverityTableCell extends TableCell<DiagnosticResultAction, D
 	@Override
 	protected void updateItem(DiagnosticResult.Severity item, boolean empty) {
 		super.updateItem(item, empty);
+		iconView.getStyleClass().clear();
 		if (empty || item == null) {
 			setText(null);
 			setGraphic(null);

From 432be6dd802d8d40194d142c1f98bd4eb549ee34 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Wed, 19 May 2021 13:18:54 +0200
Subject: [PATCH 34/67] more ui alignments

---
 .../src/main/resources/fxml/health_check_details.fxml  |  4 ++--
 main/ui/src/main/resources/fxml/health_check_list.fxml | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/main/ui/src/main/resources/fxml/health_check_details.fxml b/main/ui/src/main/resources/fxml/health_check_details.fxml
index 1cff49dd8..6a539e4f2 100644
--- a/main/ui/src/main/resources/fxml/health_check_details.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_details.fxml
@@ -11,9 +11,9 @@
 	  spacing="6">
 	<Label fx:id="checkTitle" styleClass="label-large" text="${controller.taskName}"/>
 	<Text fx:id="checkDescription" styleClass="label" text="${controller.taskDescription}"/>
-	<TableView fx:id="resultsTableView" visible="${controller.producingResults}" managed="${controller.producingResults}">
+	<TableView fx:id="resultsTableView" visible="${controller.producingResults}" managed="${controller.producingResults}" VBox.vgrow="ALWAYS">
 		<columns>
-			<TableColumn fx:id="resultDescriptionColumn" text="Info" editable="false" maxWidth="Infinity"/>
+			<TableColumn fx:id="resultDescriptionColumn" text="Info" editable="false" maxWidth="Infinity" />
 			<TableColumn fx:id="resultSeverityColumn" text="Severity" editable="false" />
 			<TableColumn fx:id="resultActionColumn" text="Action" editable="false"/>
 		</columns>
diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
index 9e2c0e5f1..4524da92c 100644
--- a/main/ui/src/main/resources/fxml/health_check_list.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -25,12 +25,10 @@
 				<ListView fx:id="checksListView" VBox.vgrow="ALWAYS"/>
 			</VBox>
 			<!-- Maybe use class Seperator ?-->
-			<StackPane HBox.hgrow="ALWAYS">
-				<VBox minWidth="300" alignment="CENTER">
-					<Label text="TODO: Select a Check from the left list to get more info." wrapText="true" alignment="CENTER" visible="${!controller.anyCheckSelected}" />
-				</VBox>
-				<fx:include  source="/fxml/health_check_details.fxml" visible="${controller.anyCheckSelected}" />
-			</StackPane>
+			<VBox minWidth="300" alignment="CENTER" HBox.hgrow="ALWAYS" visible="${!controller.anyCheckSelected}" managed="${!controller.anyCheckSelected}" >
+				<Label text="TODO: Select a Check from the left list to get more info." wrapText="true" alignment="CENTER" />
+			</VBox>
+			<fx:include  source="/fxml/health_check_details.fxml" visible="${controller.anyCheckSelected}" managed="${controller.anyCheckSelected}" HBox.hgrow="ALWAYS" />
 		</HBox>
 		<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
 			<buttons>

From 85ff7542f1b0a2361b52255ee874be895c1bbd19 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 20 May 2021 16:33:37 +0200
Subject: [PATCH 35/67] rework gui to be more wizard like: * show first only
 checkbox list of checks and single run button * then show list of check run
 status with results

---
 .../ui/controls/FontAwesome5Icon.java         |  1 +
 .../cryptomator/ui/health/CheckListCell.java  |  7 +-
 .../ui/health/CheckListController.java        | 65 ++++++++++++-------
 .../resources/fxml/health_check_list.fxml     | 24 ++++---
 .../main/resources/i18n/strings.properties    |  5 +-
 5 files changed, 66 insertions(+), 36 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
index e48818c1e..13c583c0e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
@@ -9,6 +9,7 @@ public enum FontAwesome5Icon {
 	BAN("\uF05E"), //
 	BUG("\uF188"), //
 	CHECK("\uF00C"), //
+	CLOCK("\uF017"), //
 	COG("\uF013"), //
 	COGS("\uF085"), //
 	COPY("\uF0C5"), //
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
index d3f6712a4..d4270c40c 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
@@ -20,6 +20,9 @@ class CheckListCell extends ListCell<HealthCheckTask> {
 			item.stateProperty().addListener(this::stateChanged);
 			setGraphic(stateIcon);
 			stateIcon.setGlyph(glyphForState(item.getState()));
+			if (item.getState() == Worker.State.READY) {
+				stateIcon.setVisible(false);
+			}
 			setContentDisplay(ContentDisplay.LEFT);
 		} else {
 			setText(null);
@@ -29,12 +32,14 @@ class CheckListCell extends ListCell<HealthCheckTask> {
 
 	private void stateChanged(ObservableValue<? extends Worker.State> observable, Worker.State oldState, Worker.State newState) {
 		stateIcon.setGlyph(glyphForState(newState));
+		stateIcon.setVisible(true);
 	}
 
 	private FontAwesome5Icon glyphForState(Worker.State state) {
 		// TODO choose appropriate glyphs
 		return switch (state) {
-			case READY, SCHEDULED -> FontAwesome5Icon.ANCHOR;
+			case READY -> FontAwesome5Icon.COG; //just a placeholder
+			case SCHEDULED -> FontAwesome5Icon.CLOCK;
 			case RUNNING -> FontAwesome5Icon.SPINNER;
 			case FAILED -> FontAwesome5Icon.EXCLAMATION_TRIANGLE;
 			case CANCELLED -> FontAwesome5Icon.BAN;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
index 48e846f60..600549237 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
@@ -10,15 +10,22 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import javafx.beans.binding.Binding;
 import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.concurrent.Worker;
 import javafx.fxml.FXML;
 import javafx.scene.control.ListView;
+import javafx.scene.control.cell.CheckBoxListCell;
 import java.io.IOException;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
@@ -35,8 +42,10 @@ public class CheckListController implements FxController {
 	private final SimpleObjectProperty<Worker<?>> runningTask;
 	private final Binding<Boolean> running;
 	private final Binding<Boolean> finished;
+	private final Map<HealthCheckTask, BooleanProperty> listPickIndicators;
+	private final IntegerProperty numberOfPickedChecks;
 	private final BooleanBinding anyCheckSelected;
-	private final BooleanBinding readyToRun;
+	private final BooleanProperty showResultScreen;
 
 	/* FXML */
 	public ListView<HealthCheckTask> checksListView;
@@ -51,33 +60,35 @@ public class CheckListController implements FxController {
 		this.runningTask = new SimpleObjectProperty<>();
 		this.running = EasyBind.wrapNullable(runningTask).mapObservable(Worker::runningProperty).orElse(false);
 		this.finished = EasyBind.wrapNullable(runningTask).mapObservable(Worker::stateProperty).map(END_STATES::contains).orElse(false);
-		this.readyToRun = runningTask.isNull();
+		this.listPickIndicators = new HashMap<>();
+		this.numberOfPickedChecks = new SimpleIntegerProperty(0);
+		this.tasks.forEach(task -> {
+			var entrySelectedProp = new SimpleBooleanProperty(false);
+			entrySelectedProp.addListener((observable, oldValue, newValue) -> numberOfPickedChecks.set(numberOfPickedChecks.get() + (newValue ? 1 : -1)));
+			listPickIndicators.put(task, entrySelectedProp);
+		});
 		this.anyCheckSelected = selectedTask.isNotNull();
+		this.showResultScreen = new SimpleBooleanProperty(false);
 	}
 
 	@FXML
 	public void initialize() {
 		checksListView.setItems(tasks);
-		checksListView.setCellFactory(ignored -> new CheckListCell());
+		checksListView.setCellFactory(CheckBoxListCell.forListView(listPickIndicators::get));
 		selectedTask.bind(checksListView.getSelectionModel().selectedItemProperty());
 	}
 
 	@FXML
-	public synchronized void runSelectedChecks() {
-		startBatch(checksListView.getSelectionModel().getSelectedItems());
-	}
-
-	@FXML
-	public synchronized void runAllChecks() {
-		startBatch(checksListView.getItems());
-	}
-
-	private void startBatch(Iterable<HealthCheckTask> batch) {
+	public void runSelectedChecks() {
 		Preconditions.checkState(runningTask.get() == null);
+		var batch = checksListView.getItems().filtered(item -> listPickIndicators.get(item).get());
 		var batchService = new BatchService(batch);
 		batchService.setExecutor(executorService);
 		batchService.start();
 		runningTask.set(batchService);
+		checksListView.setCellFactory(view -> new CheckListCell());
+		showResultScreen.set(true);
+		checksListView.getSelectionModel().select(batch.getViewIndex(0));
 	}
 
 	@FXML
@@ -95,17 +106,8 @@ public class CheckListController implements FxController {
 			LOG.error("Failed to write health check report.", e);
 		}
 	}
+
 	/* Getter/Setter */
-
-
-	public boolean isReadyToRun() {
-		return readyToRun.get();
-	}
-
-	public BooleanBinding readyToRunProperty() {
-		return readyToRun;
-	}
-
 	public boolean isRunning() {
 		return running.getValue();
 	}
@@ -130,4 +132,21 @@ public class CheckListController implements FxController {
 		return anyCheckSelected;
 	}
 
+	public boolean getShowResultScreen() {
+		return showResultScreen.get();
+	}
+
+	public BooleanProperty showResultScreenProperty() {
+		return showResultScreen;
+	}
+
+	public int getNumberOfPickedChecks() {
+		return numberOfPickedChecks.get();
+	}
+
+	public IntegerProperty numberOfPickedChecksProperty() {
+		return numberOfPickedChecks;
+	}
+
+
 }
diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
index 4524da92c..ba2778476 100644
--- a/main/ui/src/main/resources/fxml/health_check_list.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -7,6 +7,7 @@
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+<?import java.lang.Integer?>
 <?import javafx.scene.layout.StackPane?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
@@ -18,25 +19,28 @@
 	<padding>
 		<Insets topRightBottomLeft="12"/>
 	</padding>
+	<fx:define>
+		<Integer fx:id="ZERO" fx:value="0"/>
+	</fx:define>
 	<children>
 		<HBox spacing="12" VBox.vgrow="ALWAYS">
 			<VBox minWidth="80" spacing="6" >
 				<Label fx:id="listHeading" text="Health checks"/>
+				<!-- TODO:HEADER with select all checkbox -->
 				<ListView fx:id="checksListView" VBox.vgrow="ALWAYS"/>
 			</VBox>
-			<!-- Maybe use class Seperator ?-->
-			<VBox minWidth="300" alignment="CENTER" HBox.hgrow="ALWAYS" visible="${!controller.anyCheckSelected}" managed="${!controller.anyCheckSelected}" >
-				<Label text="TODO: Select a Check from the left list to get more info." wrapText="true" alignment="CENTER" />
-			</VBox>
-			<fx:include  source="/fxml/health_check_details.fxml" visible="${controller.anyCheckSelected}" managed="${controller.anyCheckSelected}" HBox.hgrow="ALWAYS" />
+			<StackPane visible="${controller.showResultScreen}" managed="${controller.showResultScreen}" HBox.hgrow="ALWAYS" >
+				<VBox minWidth="300" alignment="CENTER" visible="${!controller.anyCheckSelected}" managed="${!controller.anyCheckSelected}" >
+					<Label text="%health.check.result.noSelectedCheck" wrapText="true" alignment="CENTER" />
+				</VBox>
+				<fx:include  source="/fxml/health_check_details.fxml" visible="${controller.anyCheckSelected}" managed="${controller.anyCheckSelected}" />
+			</StackPane>
 		</HBox>
 		<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
 			<buttons>
-				<!-- Buttons have a prefWidth to prevent uneven interface -->
-				<Button prefWidth="20" text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" onAction="#cancelCheck" visible="${controller.running}" managed="${controller.running}" />
-				<Button prefWidth="20" text="%health.check.runAllButton" ButtonBar.buttonData="NEXT_FORWARD" onAction="#runAllChecks" visible="${controller.readyToRun &amp;&amp; !controller.anyCheckSelected}" managed="${controller.readyToRun &amp;&amp; !controller.anyCheckSelected}" />
-				<Button prefWidth="20" text="%health.check.runSingleButton" ButtonBar.buttonData="NEXT_FORWARD" onAction="#runSelectedChecks" visible="${controller.readyToRun &amp;&amp; controller.anyCheckSelected}" managed="${controller.readyToRun &amp;&amp; controller.anyCheckSelected}" />
-				<Button text="TODO Export Results" ButtonBar.buttonData="NEXT_FORWARD" disable="${!controller.finished}" visible="${!controller.readyToRun}" managed="${!controller.readyToRun}" onAction="#exportResults"/>
+				<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" onAction="#cancelCheck" disable="${!controller.running}" visible="${controller.showResultScreen}" managed="${controller.showResultScreen}" />
+				<Button text="%health.check.export" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" disable="${!controller.finished}" visible="${controller.showResultScreen}" managed="${controller.showResultScreen}" onAction="#exportResults"/>
+				<Button text="%health.check.runBatchButton" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#runSelectedChecks" disable="${controller.numberOfPickedChecks == ZERO}" visible="${!controller.showResultScreen}" managed="${!controller.showResultScreen}"/>
 			</buttons>
 		</ButtonBar>
 	</children>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index dec159f7d..9c6221a22 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -148,8 +148,9 @@ migration.impossible.moreInfo=The vault can still be opened with an older versio
 
 # Health Check
 health.title=Vault Check
-health.check.runSingleButton=Run selected Check
-health.check.runAllButton=Run all Checks
+health.check.runBatchButton=Run selected Checks
+health.check.result.noSelectedCheck=For results select a finished check in the left list.
+health.check.export=Export Report
 
 # Preferences
 preferences.title=Preferences

From 13c95868fad8a49a4c7794c9c74403a89b2f1ef5 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 20 May 2021 16:46:34 +0200
Subject: [PATCH 36/67] fix report writer. Ignore not run tests

---
 .../java/org/cryptomator/ui/health/ReportWriter.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java b/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
index 61f1cf55d..ae5dd70cf 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
@@ -1,15 +1,16 @@
 package org.cryptomator.ui.health;
 
-import dagger.Lazy;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.Volume;
 import org.cryptomator.cryptofs.VaultConfig;
 import org.cryptomator.ui.common.HostServiceRevealer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
-import javafx.concurrent.Task;
+import javafx.concurrent.Worker;
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -28,6 +29,7 @@ import java.util.stream.Collectors;
 @HealthCheckScoped
 public class ReportWriter {
 
+	private static final Logger LOG = LoggerFactory.getLogger(ReportWriter.class);
 	private static final String REPORT_HEADER = """
 			**************************************
 			*   Cryptomator Vault Health Report  *
@@ -62,6 +64,10 @@ public class ReportWriter {
 			 var writer = new BufferedWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8))) {
 			writer.write(REPORT_HEADER.formatted(vaultConfig.getId(), vault.getDisplayName(), vault.getPath()));
 			for (var task : tasks) {
+				if (task.getState() == Worker.State.READY) {
+					LOG.debug("Skipping not performed check {}.",task.getCheck().identifier());
+					continue;
+				}
 				writer.write(REPORT_CHECK_HEADER.formatted(task.getCheck().identifier()));
 				switch (task.getState()) {
 					case SUCCEEDED -> {
@@ -75,7 +81,7 @@ public class ReportWriter {
 						writer.write("STATUS: FAILED\nREASON:\n" + task.getCheck().identifier());
 						writer.write(prepareFailureMsg(task));
 					}
-					case READY, RUNNING, SCHEDULED -> throw new IllegalStateException("Cannot export unfinished task");
+					case RUNNING, SCHEDULED -> throw new IllegalStateException("Checks are still running.");
 				}
 			}
 		}

From a8364a8c1aed7673574c51cbc0c9e6f918502d0e Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 20 May 2021 16:52:28 +0200
Subject: [PATCH 37/67] show directory containing exported health report

---
 .../cryptomator/ui/health/ReportWriter.java   | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java b/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
index ae5dd70cf..9590626cd 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
@@ -3,13 +3,12 @@ package org.cryptomator.ui.health;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.common.vaults.Volume;
 import org.cryptomator.cryptofs.VaultConfig;
-import org.cryptomator.ui.common.HostServiceRevealer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import javafx.application.Application;
 import javafx.concurrent.Worker;
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -48,24 +47,24 @@ public class ReportWriter {
 
 	private final Vault vault;
 	private final VaultConfig vaultConfig;
-	private final Path path;
-	private final HostServiceRevealer revealer;
+	private final Application application;
+	private final Path exportDestination;
 
 	@Inject
-	public ReportWriter(@HealthCheckWindow Vault vault, AtomicReference<VaultConfig> vaultConfigRef, Environment env, HostServiceRevealer revealer) {
+	public ReportWriter(@HealthCheckWindow Vault vault, AtomicReference<VaultConfig> vaultConfigRef, Application application, Environment env) {
 		this.vault = vault;
 		this.vaultConfig = Objects.requireNonNull(vaultConfigRef.get());
-		this.revealer = revealer;
-		this.path = env.getLogDir().orElse(Path.of(System.getProperty("user.home"))).resolve("healthReport_" + vault.getDisplayName() + "_" + TIME_STAMP.format(Instant.now()) + ".log");
+		this.application = application;
+		this.exportDestination = env.getLogDir().orElse(Path.of(System.getProperty("user.home"))).resolve("healthReport_" + vault.getDisplayName() + "_" + TIME_STAMP.format(Instant.now()) + ".log");
 	}
 
 	protected void writeReport(Collection<HealthCheckTask> tasks) throws IOException {
-		try (var out = Files.newOutputStream(path, StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING); //
+		try (var out = Files.newOutputStream(exportDestination, StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING); //
 			 var writer = new BufferedWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8))) {
 			writer.write(REPORT_HEADER.formatted(vaultConfig.getId(), vault.getDisplayName(), vault.getPath()));
 			for (var task : tasks) {
 				if (task.getState() == Worker.State.READY) {
-					LOG.debug("Skipping not performed check {}.",task.getCheck().identifier());
+					LOG.debug("Skipping not performed check {}.", task.getCheck().identifier());
 					continue;
 				}
 				writer.write(REPORT_CHECK_HEADER.formatted(task.getCheck().identifier()));
@@ -100,11 +99,7 @@ public class ReportWriter {
 	}
 
 	private void reveal() {
-		try {
-			revealer.reveal(path);
-		} catch (Volume.VolumeException e) {
-			//should not happen
-		}
+		application.getHostServices().showDocument(exportDestination.getParent().toUri().toString());
 	}
 
 }

From 1abf0e1bfa2b22d15537ad569f714dfd78155746 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 21 May 2021 12:00:46 +0200
Subject: [PATCH 38/67] Replace result table by result list

---
 .../ui/health/CheckDetailController.java      | 23 ++---
 .../ui/health/HealthCheckModule.java          |  4 +
 .../ui/health/ResultActionTableCell.java      | 30 ------
 .../cryptomator/ui/health/ResultListCell.java | 19 ----
 .../ui/health/ResultListCellController.java   | 93 +++++++++++++++++++
 .../ui/health/ResultListCellFactory.java      | 58 ++++++++++++
 .../ui/health/ResultSeverityTableCell.java    | 47 ----------
 .../resources/fxml/health_check_details.fxml  | 13 +--
 .../fxml/health_result_listcell.fxml          | 26 ++++++
 9 files changed, 191 insertions(+), 122 deletions(-)
 delete mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/ResultActionTableCell.java
 delete mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/ResultListCell.java
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellFactory.java
 delete mode 100644 main/ui/src/main/java/org/cryptomator/ui/health/ResultSeverityTableCell.java
 create mode 100644 main/ui/src/main/resources/fxml/health_result_listcell.fxml

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
index 404268f8e..a285d3400 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
@@ -2,21 +2,17 @@ package org.cryptomator.ui.health;
 
 import com.tobiasdiez.easybind.EasyBind;
 import com.tobiasdiez.easybind.optional.OptionalBinding;
-import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
 import javafx.beans.binding.Binding;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.concurrent.Worker;
 import javafx.fxml.FXML;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableView;
+import javafx.scene.control.ListView;
 
 public class CheckDetailController implements FxController {
 
@@ -24,19 +20,18 @@ public class CheckDetailController implements FxController {
 	private final OptionalBinding<Worker.State> taskState;
 	private final Binding<String> taskName;
 	private final Binding<String> taskDescription;
+	private final ResultListCellFactory resultListCellFactory;
 	private final BooleanBinding producingResults;
 
-	public TableView<DiagnosticResultAction> resultsTableView;
-	public TableColumn<DiagnosticResultAction, String> resultDescriptionColumn;
-	public TableColumn<DiagnosticResultAction, DiagnosticResult.Severity> resultSeverityColumn;
-	public TableColumn<DiagnosticResultAction, Runnable> resultActionColumn;
+	public ListView<DiagnosticResultAction> resultsListView;
 
 	@Inject
-	public CheckDetailController(ObjectProperty<HealthCheckTask> selectedTask) {
+	public CheckDetailController(ObjectProperty<HealthCheckTask> selectedTask, ResultListCellFactory resultListCellFactory) {
 		this.results = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::results).orElse(FXCollections.emptyObservableList());
 		this.taskState = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::stateProperty);
 		this.taskName = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::getTitle).orElse("");
 		this.taskDescription = EasyBind.wrapNullable(selectedTask).map(task -> task.getCheck().toString()).orElse("");
+		this.resultListCellFactory = resultListCellFactory;
 		this.producingResults = taskState.filter(this::producesResults).isPresent();
 	}
 
@@ -49,12 +44,8 @@ public class CheckDetailController implements FxController {
 
 	@FXML
 	public void initialize() {
-		resultsTableView.itemsProperty().bind(results);
-		resultDescriptionColumn.setCellValueFactory(cellFeatures -> new SimpleStringProperty(cellFeatures.getValue().getDescription()));
-		resultSeverityColumn.setCellValueFactory(cellFeatures -> new SimpleObjectProperty<>(cellFeatures.getValue().getSeverity()));
-		resultSeverityColumn.setCellFactory(column -> new ResultSeverityTableCell());
-		resultActionColumn.setCellValueFactory(cellFeatures -> new SimpleObjectProperty<>(cellFeatures.getValue()));
-		resultActionColumn.setCellFactory(column -> new ResultActionTableCell());
+		resultsListView.itemsProperty().bind(results);
+		resultsListView.setCellFactory(resultListCellFactory);
 	}
 	/* Getter/Setter */
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
index aafb5cb22..7ca3cbd05 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
@@ -134,5 +134,9 @@ abstract class HealthCheckModule {
 	@FxControllerKey(CheckDetailController.class)
 	abstract FxController bindCheckDetailController(CheckDetailController controller);
 
+	@Binds
+	@IntoMap
+	@FxControllerKey(ResultListCellController.class)
+	abstract FxController bindResultListCellController(ResultListCellController controller);
 
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ResultActionTableCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/ResultActionTableCell.java
deleted file mode 100644
index 5781e514b..000000000
--- a/main/ui/src/main/java/org/cryptomator/ui/health/ResultActionTableCell.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.cryptomator.ui.health;
-
-import javafx.geometry.Pos;
-import javafx.scene.control.Button;
-import javafx.scene.control.TableCell;
-
-class ResultActionTableCell extends TableCell<DiagnosticResultAction, Runnable> {
-
-	private Button button;
-
-	ResultActionTableCell() {
-		button = new Button();
-		setGraphic(null);
-	}
-
-	@Override
-	protected void updateItem(Runnable item, boolean empty) {
-		super.updateItem(item, empty);
-		if (empty || item == null) {
-			setText(null);
-			setGraphic(null);
-		} else {
-			setGraphic(button);
-			button.setOnAction(event -> item.run());
-			button.setText("FIXME"); //FIXME
-			button.setAlignment(Pos.CENTER);
-		}
-	}
-
-}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCell.java
deleted file mode 100644
index 6458b4ff4..000000000
--- a/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCell.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.cryptomator.ui.health;
-
-import org.cryptomator.cryptofs.health.api.DiagnosticResult;
-import org.cryptomator.cryptofs.health.api.HealthCheck;
-
-import javafx.scene.control.ListCell;
-
-class ResultListCell extends ListCell<DiagnosticResult> {
-
-	@Override
-	protected void updateItem(DiagnosticResult item, boolean empty) {
-		super.updateItem(item, empty);
-		if (item != null) {
-			setText(item.toString());
-		} else {
-			setText(null);
-		}
-	}
-}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
new file mode 100644
index 000000000..03704824f
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
@@ -0,0 +1,93 @@
+package org.cryptomator.ui.health;
+
+import com.tobiasdiez.easybind.EasyBind;
+import org.cryptomator.cryptofs.health.api.DiagnosticResult;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.controls.FontAwesome5Icon;
+import org.cryptomator.ui.controls.FontAwesome5IconView;
+
+import javax.inject.Inject;
+import javafx.beans.binding.Binding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.value.ObservableValue;
+import javafx.fxml.FXML;
+
+public class ResultListCellController implements FxController {
+
+	private final ObjectProperty<DiagnosticResultAction> result;
+	private final Binding<Boolean> fixButtonVisible;
+	private final Binding<String> description;
+
+	@FXML
+	public FontAwesome5IconView iconView;
+
+	@Inject
+	public ResultListCellController() {
+		this.result = new SimpleObjectProperty<>(null);
+		this.fixButtonVisible = EasyBind.wrapNullable(result) //
+				.map(val -> val.getSeverity() == DiagnosticResult.Severity.WARN).orElse(true); //
+		this.description = EasyBind.wrapNullable(result).map(DiagnosticResultAction::getDescription).orElse("");
+		result.addListener(this::getGlyphForSeverity);
+	}
+
+	private void getGlyphForSeverity(ObservableValue<? extends DiagnosticResultAction> observable, DiagnosticResultAction oldVal, DiagnosticResultAction newVal) {
+		iconView.getStyleClass().clear();
+		switch (newVal.getSeverity()) {
+			case INFO -> {
+				iconView.setGlyph(FontAwesome5Icon.INFO_CIRCLE);
+				iconView.getStyleClass().add("glyph-icon-muted");
+			}
+			case GOOD -> {
+				iconView.setGlyph(FontAwesome5Icon.CHECK);
+				iconView.getStyleClass().add("glyph-icon-primary");
+			}
+			case WARN -> {
+				iconView.setGlyph(FontAwesome5Icon.EXCLAMATION_TRIANGLE);
+				iconView.getStyleClass().add("glyph-icon-orange");
+			}
+			case CRITICAL -> {
+				iconView.setGlyph(FontAwesome5Icon.TIMES);
+				iconView.getStyleClass().add("glyph-icon-red");
+			}
+		}
+	}
+
+	@FXML
+	public void runResultAction() {
+		final var realResult = result.get();
+		if (realResult != null) {
+			realResult.run(); //TODO: this hogs currently the JAVAFX thread
+		}
+	}
+
+	/* Getter & Setter */
+
+	public DiagnosticResultAction getResult() {
+		return result.get();
+	}
+
+	public void setResult(DiagnosticResultAction result) {
+		this.result.set(result);
+	}
+
+	public ObjectProperty<DiagnosticResultAction> resultProperty() {
+		return result;
+	}
+
+	public boolean isFixButtonVisibile() {
+		return fixButtonVisible.getValue();
+	}
+
+	public Binding<Boolean> fixButtonVisibleProperty() {
+		return fixButtonVisible;
+	}
+
+	public String getDescription() {
+		return description.getValue();
+	}
+
+	public Binding<String> descriptionProperty() {
+		return description;
+	}
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellFactory.java b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellFactory.java
new file mode 100644
index 000000000..11f0e0f6b
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellFactory.java
@@ -0,0 +1,58 @@
+package org.cryptomator.ui.health;
+
+
+import org.cryptomator.ui.common.FxmlLoaderFactory;
+
+import javax.inject.Inject;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.control.ContentDisplay;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.util.Callback;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+
+public class ResultListCellFactory implements Callback<ListView<DiagnosticResultAction>, ListCell<DiagnosticResultAction>> {
+
+	private final FxmlLoaderFactory fxmlLoaders;
+
+	@Inject
+	ResultListCellFactory(@HealthCheckWindow FxmlLoaderFactory fxmlLoaders) {
+		this.fxmlLoaders = fxmlLoaders;
+	}
+
+	@Override
+	public ListCell<DiagnosticResultAction> call(ListView<DiagnosticResultAction> param) {
+		try {
+			FXMLLoader fxmlLoader = fxmlLoaders.load("/fxml/health_result_listcell.fxml");
+			return new ResultListCellFactory.Cell(fxmlLoader.getRoot(), fxmlLoader.getController());
+		} catch (IOException e) {
+			throw new UncheckedIOException("Failed to load /fxml/health_result_listcell.fxml.", e);
+		}
+	}
+
+	private static class Cell extends ListCell<DiagnosticResultAction> {
+
+		private final Parent node;
+		private final ResultListCellController controller;
+
+		public Cell(Parent node, ResultListCellController controller) {
+			this.node = node;
+			this.controller = controller;
+		}
+
+		@Override
+		protected void updateItem(DiagnosticResultAction item, boolean empty) {
+			super.updateItem(item, empty);
+			if (item == null || empty) {
+				setText(null);
+				setGraphic(null);
+			} else {
+				controller.setResult(item);
+				setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+				setGraphic(node);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ResultSeverityTableCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/ResultSeverityTableCell.java
deleted file mode 100644
index a5a7b04b2..000000000
--- a/main/ui/src/main/java/org/cryptomator/ui/health/ResultSeverityTableCell.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.cryptomator.ui.health;
-
-import org.cryptomator.cryptofs.health.api.DiagnosticResult;
-import org.cryptomator.ui.controls.FontAwesome5Icon;
-import org.cryptomator.ui.controls.FontAwesome5IconView;
-
-import javafx.scene.control.TableCell;
-
-public class ResultSeverityTableCell extends TableCell<DiagnosticResultAction, DiagnosticResult.Severity> {
-
-	private FontAwesome5IconView iconView;
-
-	ResultSeverityTableCell() {
-		iconView = new FontAwesome5IconView();
-	}
-
-	@Override
-	protected void updateItem(DiagnosticResult.Severity item, boolean empty) {
-		super.updateItem(item, empty);
-		iconView.getStyleClass().clear();
-		if (empty || item == null) {
-			setText(null);
-			setGraphic(null);
-		} else {
-			switch (item) {
-				case INFO -> {
-					iconView.setGlyph(FontAwesome5Icon.INFO_CIRCLE);
-					iconView.getStyleClass().add("glyph-icon-muted");
-				}
-				case GOOD -> {
-					iconView.setGlyph(FontAwesome5Icon.CHECK);
-					iconView.getStyleClass().add("glyph-icon-primary");
-				}
-				case WARN -> {
-					iconView.setGlyph(FontAwesome5Icon.EXCLAMATION_TRIANGLE);
-					iconView.getStyleClass().add("glyph-icon-orange");
-				}
-				case CRITICAL -> {
-					iconView.setGlyph(FontAwesome5Icon.TIMES);
-					iconView.getStyleClass().add("glyph-icon-red");
-				}
-			}
-			setGraphic(iconView);
-			setText(item.name());
-		}
-	}
-}
diff --git a/main/ui/src/main/resources/fxml/health_check_details.fxml b/main/ui/src/main/resources/fxml/health_check_details.fxml
index 6a539e4f2..7e553d7a4 100644
--- a/main/ui/src/main/resources/fxml/health_check_details.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_details.fxml
@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Text?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.health.CheckDetailController"
 	  spacing="6">
-	<Label fx:id="checkTitle" styleClass="label-large" text="${controller.taskName}"/>
+	<Label fx:id="checkTitle" styleClass="label-large" text="${controller.taskName}"/> <!-- use formatted label and let the text be "Results of [TASKNAME] -->
 	<Text fx:id="checkDescription" styleClass="label" text="${controller.taskDescription}"/>
-	<TableView fx:id="resultsTableView" visible="${controller.producingResults}" managed="${controller.producingResults}" VBox.vgrow="ALWAYS">
-		<columns>
-			<TableColumn fx:id="resultDescriptionColumn" text="Info" editable="false" maxWidth="Infinity" />
-			<TableColumn fx:id="resultSeverityColumn" text="Severity" editable="false" />
-			<TableColumn fx:id="resultActionColumn" text="Action" editable="false"/>
-		</columns>
-	</TableView>
+	<ListView fx:id="resultsListView"/>
 </VBox>
\ No newline at end of file
diff --git a/main/ui/src/main/resources/fxml/health_result_listcell.fxml b/main/ui/src/main/resources/fxml/health_result_listcell.fxml
new file mode 100644
index 000000000..22e6569f3
--- /dev/null
+++ b/main/ui/src/main/resources/fxml/health_result_listcell.fxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.layout.Region?>
+<HBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
+	  fx:controller="org.cryptomator.ui.health.ResultListCellController"
+	  prefHeight="25"
+	  prefWidth="200"
+	  spacing="6"
+	  alignment="CENTER_LEFT">
+	<!-- Remark Check the containing list view for a fixed cell size before editing height properties -->
+	<padding>
+		<Insets topRightBottomLeft="6"/>
+	</padding>
+	<children>
+		<FontAwesome5IconView fx:id="iconView" HBox.hgrow="NEVER" glyphSize="16"/>
+		<Label text="${controller.description}" wrapText="true"/>
+		<Region HBox.hgrow="ALWAYS"/>
+		<Button text="YOLO" onAction="#runResultAction" alignment="CENTER_RIGHT" visible="${controller.fixButtonVisibile}"/>
+	</children>
+</HBox>

From b6f5ddaf305a1c68cd8180cadba2de53f242e42c Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 21 May 2021 12:40:44 +0200
Subject: [PATCH 39/67] Only show button when severity is WARN

---
 .../ui/health/ResultListCellController.java   | 23 ++++++++-----------
 .../fxml/health_result_listcell.fxml          |  2 +-
 .../main/resources/i18n/strings.properties    |  1 +
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
index 03704824f..61bf1366e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
@@ -1,38 +1,40 @@
 package org.cryptomator.ui.health;
 
 import com.tobiasdiez.easybind.EasyBind;
-import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.controls.FontAwesome5Icon;
 import org.cryptomator.ui.controls.FontAwesome5IconView;
 
 import javax.inject.Inject;
 import javafx.beans.binding.Binding;
+import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;
+import javafx.scene.control.Button;
 
 public class ResultListCellController implements FxController {
 
 	private final ObjectProperty<DiagnosticResultAction> result;
-	private final Binding<Boolean> fixButtonVisible;
 	private final Binding<String> description;
 
 	@FXML
 	public FontAwesome5IconView iconView;
+	@FXML
+	public Button actionButton;
 
 	@Inject
 	public ResultListCellController() {
 		this.result = new SimpleObjectProperty<>(null);
-		this.fixButtonVisible = EasyBind.wrapNullable(result) //
-				.map(val -> val.getSeverity() == DiagnosticResult.Severity.WARN).orElse(true); //
 		this.description = EasyBind.wrapNullable(result).map(DiagnosticResultAction::getDescription).orElse("");
-		result.addListener(this::getGlyphForSeverity);
+		result.addListener(this::updateCellContent);
 	}
 
-	private void getGlyphForSeverity(ObservableValue<? extends DiagnosticResultAction> observable, DiagnosticResultAction oldVal, DiagnosticResultAction newVal) {
+	private void updateCellContent(ObservableValue<? extends DiagnosticResultAction> observable, DiagnosticResultAction oldVal, DiagnosticResultAction newVal) {
 		iconView.getStyleClass().clear();
+		actionButton.setVisible(false);
 		switch (newVal.getSeverity()) {
 			case INFO -> {
 				iconView.setGlyph(FontAwesome5Icon.INFO_CIRCLE);
@@ -45,6 +47,7 @@ public class ResultListCellController implements FxController {
 			case WARN -> {
 				iconView.setGlyph(FontAwesome5Icon.EXCLAMATION_TRIANGLE);
 				iconView.getStyleClass().add("glyph-icon-orange");
+				actionButton.setVisible(true);
 			}
 			case CRITICAL -> {
 				iconView.setGlyph(FontAwesome5Icon.TIMES);
@@ -75,14 +78,6 @@ public class ResultListCellController implements FxController {
 		return result;
 	}
 
-	public boolean isFixButtonVisibile() {
-		return fixButtonVisible.getValue();
-	}
-
-	public Binding<Boolean> fixButtonVisibleProperty() {
-		return fixButtonVisible;
-	}
-
 	public String getDescription() {
 		return description.getValue();
 	}
diff --git a/main/ui/src/main/resources/fxml/health_result_listcell.fxml b/main/ui/src/main/resources/fxml/health_result_listcell.fxml
index 22e6569f3..8aa684cc2 100644
--- a/main/ui/src/main/resources/fxml/health_result_listcell.fxml
+++ b/main/ui/src/main/resources/fxml/health_result_listcell.fxml
@@ -21,6 +21,6 @@
 		<FontAwesome5IconView fx:id="iconView" HBox.hgrow="NEVER" glyphSize="16"/>
 		<Label text="${controller.description}" wrapText="true"/>
 		<Region HBox.hgrow="ALWAYS"/>
-		<Button text="YOLO" onAction="#runResultAction" alignment="CENTER_RIGHT" visible="${controller.fixButtonVisibile}"/>
+		<Button fx:id="actionButton" text="%health.check.export" onAction="#runResultAction" alignment="CENTER_RIGHT" visible="false" />
 	</children>
 </HBox>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 9c6221a22..5efd43e11 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -151,6 +151,7 @@ health.title=Vault Check
 health.check.runBatchButton=Run selected Checks
 health.check.result.noSelectedCheck=For results select a finished check in the left list.
 health.check.export=Export Report
+health.check.fix=Fix
 
 # Preferences
 preferences.title=Preferences

From 4845984a354b2014e4f1ce545dcb3b44a1384052 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 21 May 2021 12:43:07 +0200
Subject: [PATCH 40/67] ui sugar * show correct name for health check tasks *
 some padding * resize window when run button is hit

---
 .../cryptomator/ui/health/CheckListCell.java  |  5 +++++
 .../ui/health/CheckListController.java        | 19 +++++++++++++++++--
 .../resources/fxml/health_check_list.fxml     |  6 ++----
 .../fxml/health_result_listcell.fxml          |  2 +-
 .../main/resources/i18n/strings.properties    |  1 +
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
index d4270c40c..ce01006c3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
@@ -5,6 +5,7 @@ import org.cryptomator.ui.controls.FontAwesome5IconView;
 
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Worker;
+import javafx.geometry.Insets;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.ListCell;
 
@@ -12,6 +13,10 @@ class CheckListCell extends ListCell<HealthCheckTask> {
 
 	private final FontAwesome5IconView stateIcon = new FontAwesome5IconView();
 
+	CheckListCell(){
+		paddingProperty().set(new Insets(6));
+	}
+
 	@Override
 	protected void updateItem(HealthCheckTask item, boolean empty) {
 		super.updateItem(item, empty);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
index 600549237..f7dec4ad5 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
@@ -22,6 +22,8 @@ import javafx.concurrent.Worker;
 import javafx.fxml.FXML;
 import javafx.scene.control.ListView;
 import javafx.scene.control.cell.CheckBoxListCell;
+import javafx.stage.Stage;
+import javafx.util.StringConverter;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.HashMap;
@@ -35,6 +37,7 @@ public class CheckListController implements FxController {
 	private static final Logger LOG = LoggerFactory.getLogger(CheckListController.class);
 	private static final Set<Worker.State> END_STATES = Set.of(Worker.State.FAILED, Worker.State.CANCELLED, Worker.State.SUCCEEDED);
 
+	private final Stage window;
 	private final ObservableList<HealthCheckTask> tasks;
 	private final ReportWriter reportWriter;
 	private final ExecutorService executorService;
@@ -52,7 +55,8 @@ public class CheckListController implements FxController {
 
 
 	@Inject
-	public CheckListController(Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService) {
+	public CheckListController(@HealthCheckWindow Stage window, Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService) {
+		this.window = window;
 		this.tasks = FXCollections.observableArrayList(tasks.get());
 		this.reportWriter = reportWriteTask;
 		this.executorService = executorService;
@@ -74,7 +78,17 @@ public class CheckListController implements FxController {
 	@FXML
 	public void initialize() {
 		checksListView.setItems(tasks);
-		checksListView.setCellFactory(CheckBoxListCell.forListView(listPickIndicators::get));
+		checksListView.setCellFactory(CheckBoxListCell.forListView(listPickIndicators::get, new StringConverter<HealthCheckTask>() {
+			@Override
+			public String toString(HealthCheckTask object) {
+				return object.getCheck().identifier();
+			}
+
+			@Override
+			public HealthCheckTask fromString(String string) {
+				return null;
+			}
+		}));
 		selectedTask.bind(checksListView.getSelectionModel().selectedItemProperty());
 	}
 
@@ -89,6 +103,7 @@ public class CheckListController implements FxController {
 		checksListView.setCellFactory(view -> new CheckListCell());
 		showResultScreen.set(true);
 		checksListView.getSelectionModel().select(batch.getViewIndex(0));
+		window.sizeToScene();
 	}
 
 	@FXML
diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
index ba2778476..2e2cd5ff6 100644
--- a/main/ui/src/main/resources/fxml/health_check_list.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -12,8 +12,6 @@
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.health.CheckListController"
-	  minWidth="400"
-	  prefWidth="400"
 	  minHeight="145"
 	  spacing="12">
 	<padding>
@@ -24,8 +22,8 @@
 	</fx:define>
 	<children>
 		<HBox spacing="12" VBox.vgrow="ALWAYS">
-			<VBox minWidth="80" spacing="6" >
-				<Label fx:id="listHeading" text="Health checks"/>
+			<VBox minWidth="80" spacing="6" HBox.hgrow="ALWAYS" >
+				<Label fx:id="listHeading" text="%health.check.listHeader"/>
 				<!-- TODO:HEADER with select all checkbox -->
 				<ListView fx:id="checksListView" VBox.vgrow="ALWAYS"/>
 			</VBox>
diff --git a/main/ui/src/main/resources/fxml/health_result_listcell.fxml b/main/ui/src/main/resources/fxml/health_result_listcell.fxml
index 8aa684cc2..0c6c05708 100644
--- a/main/ui/src/main/resources/fxml/health_result_listcell.fxml
+++ b/main/ui/src/main/resources/fxml/health_result_listcell.fxml
@@ -21,6 +21,6 @@
 		<FontAwesome5IconView fx:id="iconView" HBox.hgrow="NEVER" glyphSize="16"/>
 		<Label text="${controller.description}" wrapText="true"/>
 		<Region HBox.hgrow="ALWAYS"/>
-		<Button fx:id="actionButton" text="%health.check.export" onAction="#runResultAction" alignment="CENTER_RIGHT" visible="false" />
+		<Button fx:id="actionButton" text="%health.check.fix" onAction="#runResultAction" alignment="CENTER_RIGHT" visible="false" />
 	</children>
 </HBox>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 5efd43e11..3fb288d9b 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -148,6 +148,7 @@ migration.impossible.moreInfo=The vault can still be opened with an older versio
 
 # Health Check
 health.title=Vault Check
+health.check.listHeader=Available Checks
 health.check.runBatchButton=Run selected Checks
 health.check.result.noSelectedCheck=For results select a finished check in the left list.
 health.check.export=Export Report

From 21f9e72cc511c6c33aa37333f54546fd08ae6d63 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 21 May 2021 12:48:58 +0200
Subject: [PATCH 41/67] preselect correct check in check screen

---
 .../java/org/cryptomator/ui/health/CheckListController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
index f7dec4ad5..b91c4bca3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
@@ -102,7 +102,7 @@ public class CheckListController implements FxController {
 		runningTask.set(batchService);
 		checksListView.setCellFactory(view -> new CheckListCell());
 		showResultScreen.set(true);
-		checksListView.getSelectionModel().select(batch.getViewIndex(0));
+		checksListView.getSelectionModel().select(batch.get(0));
 		window.sizeToScene();
 	}
 

From b4f268f5519494672f2cedc1994516fa12d6e5dc Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 21 May 2021 13:15:51 +0200
Subject: [PATCH 42/67] more ui & clean up

---
 .../ui/health/ResultListCellController.java   |  2 -
 .../ui/src/main/resources/css/light_theme.css | 48 -------------------
 .../resources/fxml/health_check_details.fxml  |  5 +-
 .../resources/fxml/health_check_list.fxml     |  2 +-
 .../main/resources/i18n/strings.properties    |  1 +
 5 files changed, 5 insertions(+), 53 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
index 61bf1366e..0051265dd 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
@@ -7,9 +7,7 @@ import org.cryptomator.ui.controls.FontAwesome5IconView;
 
 import javax.inject.Inject;
 import javafx.beans.binding.Binding;
-import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index 34b388c3f..b0ba8ac8c 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -947,51 +947,3 @@
 	-fx-fill: linear-gradient(to bottom, PRIMARY, transparent);
 	-fx-stroke: transparent;
 }
-
-/*****
-	Sanitizer Results
-	TODO: make it pretty and copy it to dark theme
-****/
-
-.table-view{
-   -fx-background-color: transparent;
-}
-
-.table-view:focused{
-    -fx-background-color: transparent;
-}
-
-.table-view .column-header-background{
-    -fx-background-color: linear-gradient(#131313 0%, #424141 100%);
-}
-
-.table-view .column-header-background .label{
-    -fx-background-color: transparent;
-    -fx-text-fill: white;
-}
-
-.table-view .column-header {
-    -fx-background-color: transparent;
-}
-
-.table-view .table-cell{
-    -fx-text-fill: white;
-}
-
-.table-row-cell{
-    -fx-background-color: #616161;
-    -fx-background-insets: 0, 0 0 1 0;
-    -fx-padding: 0.0em;
-}
-
-.table-row-cell:odd{
-    -fx-background-color: #424242;
-    -fx-background-insets: 0, 0 0 1 0;
-    -fx-padding: 0.0em;
-}
-
-.table-row-cell:selected {
-    -fx-background-color: #005797;
-    -fx-background-insets: 0;
-    -fx-background-radius: 1;
-}
diff --git a/main/ui/src/main/resources/fxml/health_check_details.fxml b/main/ui/src/main/resources/fxml/health_check_details.fxml
index 7e553d7a4..d93b47212 100644
--- a/main/ui/src/main/resources/fxml/health_check_details.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_details.fxml
@@ -4,11 +4,12 @@
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Text?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.health.CheckDetailController"
 	  spacing="6">
-	<Label fx:id="checkTitle" styleClass="label-large" text="${controller.taskName}"/> <!-- use formatted label and let the text be "Results of [TASKNAME] -->
-	<Text fx:id="checkDescription" styleClass="label" text="${controller.taskDescription}"/>
+	<FormattedLabel fx:id="checkTitle" styleClass="label-large" format="%health.check.result.header" arg1="${controller.taskName}"/>
+	<Text fx:id="checkDescription" styleClass="label" text="FIXME: Here could be a small description."/>
 	<ListView fx:id="resultsListView"/>
 </VBox>
\ No newline at end of file
diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
index 2e2cd5ff6..c3261626c 100644
--- a/main/ui/src/main/resources/fxml/health_check_list.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -22,7 +22,7 @@
 	</fx:define>
 	<children>
 		<HBox spacing="12" VBox.vgrow="ALWAYS">
-			<VBox minWidth="80" spacing="6" HBox.hgrow="ALWAYS" >
+			<VBox minWidth="80" maxWidth="200" spacing="6" HBox.hgrow="ALWAYS" >
 				<Label fx:id="listHeading" text="%health.check.listHeader"/>
 				<!-- TODO:HEADER with select all checkbox -->
 				<ListView fx:id="checksListView" VBox.vgrow="ALWAYS"/>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 3fb288d9b..a245ab42b 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -151,6 +151,7 @@ health.title=Vault Check
 health.check.listHeader=Available Checks
 health.check.runBatchButton=Run selected Checks
 health.check.result.noSelectedCheck=For results select a finished check in the left list.
+health.check.result.header=Results of %s
 health.check.export=Export Report
 health.check.fix=Fix
 

From c01c405f203a74322a79fdb4797aadbf6579677b Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 21 May 2021 13:16:14 +0200
Subject: [PATCH 43/67] add select all checkbox

---
 .../org/cryptomator/ui/health/CheckListController.java | 10 ++++++++++
 main/ui/src/main/resources/fxml/health_check_list.fxml |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
index b91c4bca3..4ad6fd242 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
@@ -16,10 +16,12 @@ import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.concurrent.Worker;
 import javafx.fxml.FXML;
+import javafx.scene.control.CheckBox;
 import javafx.scene.control.ListView;
 import javafx.scene.control.cell.CheckBoxListCell;
 import javafx.stage.Stage;
@@ -51,6 +53,7 @@ public class CheckListController implements FxController {
 	private final BooleanProperty showResultScreen;
 
 	/* FXML */
+	public CheckBox selectAllBox;
 	public ListView<HealthCheckTask> checksListView;
 
 
@@ -90,6 +93,13 @@ public class CheckListController implements FxController {
 			}
 		}));
 		selectedTask.bind(checksListView.getSelectionModel().selectedItemProperty());
+		selectAllBox.selectedProperty().addListener(this::selectOrDeselectAll);
+		selectAllBox.visibleProperty().bind(showResultScreen.not());
+		selectAllBox.managedProperty().bind(showResultScreen.not());
+	}
+
+	public void selectOrDeselectAll(ObservableValue<? extends Boolean> observable, boolean oldValue, boolean newValue) {
+		listPickIndicators.forEach( (task, pickProperty) -> pickProperty.set(newValue));
 	}
 
 	@FXML
diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
index c3261626c..5cf3219a9 100644
--- a/main/ui/src/main/resources/fxml/health_check_list.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -9,6 +9,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import java.lang.Integer?>
 <?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.control.CheckBox?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.health.CheckListController"
@@ -25,6 +26,7 @@
 			<VBox minWidth="80" maxWidth="200" spacing="6" HBox.hgrow="ALWAYS" >
 				<Label fx:id="listHeading" text="%health.check.listHeader"/>
 				<!-- TODO:HEADER with select all checkbox -->
+				<CheckBox fx:id="selectAllBox" text="FIX: SELECT ALL" />
 				<ListView fx:id="checksListView" VBox.vgrow="ALWAYS"/>
 			</VBox>
 			<StackPane visible="${controller.showResultScreen}" managed="${controller.showResultScreen}" HBox.hgrow="ALWAYS" >

From be8dcd4dc40bc920f1c4cd22b91bec640f65bea1 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 21 May 2021 13:41:19 +0200
Subject: [PATCH 44/67] remove obsolete TODOs

---
 .../src/main/java/org/cryptomator/ui/health/CheckListCell.java  | 1 -
 .../main/java/org/cryptomator/ui/health/HealthCheckTask.java    | 2 +-
 main/ui/src/main/resources/fxml/health_check_list.fxml          | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
index ce01006c3..1b95f91f3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
@@ -41,7 +41,6 @@ class CheckListCell extends ListCell<HealthCheckTask> {
 	}
 
 	private FontAwesome5Icon glyphForState(Worker.State state) {
-		// TODO choose appropriate glyphs
 		return switch (state) {
 			case READY -> FontAwesome5Icon.COG; //just a placeholder
 			case SCHEDULED -> FontAwesome5Icon.CLOCK;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
index b7bbc321e..493ee9c23 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
@@ -43,7 +43,7 @@ class HealthCheckTask extends Task<Void> {
 	protected Void call() {
 		try (var masterkeyClone = masterkey.clone(); //
 			 var cryptor = vaultConfig.getCipherCombo().getCryptorProvider(csprng).withKey(masterkeyClone)) {
-			check.check(vaultPath, vaultConfig, masterkeyClone, cryptor, result -> { //TODO: API-question about using Masterkey _and_ cryptor
+			check.check(vaultPath, vaultConfig, masterkeyClone, cryptor, result -> {
 				if (isCancelled()) {
 					throw new CancellationException();
 				}
diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
index 5cf3219a9..ee1cdebef 100644
--- a/main/ui/src/main/resources/fxml/health_check_list.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -25,7 +25,6 @@
 		<HBox spacing="12" VBox.vgrow="ALWAYS">
 			<VBox minWidth="80" maxWidth="200" spacing="6" HBox.hgrow="ALWAYS" >
 				<Label fx:id="listHeading" text="%health.check.listHeader"/>
-				<!-- TODO:HEADER with select all checkbox -->
 				<CheckBox fx:id="selectAllBox" text="FIX: SELECT ALL" />
 				<ListView fx:id="checksListView" VBox.vgrow="ALWAYS"/>
 			</VBox>

From 85b761a9d73c87d31dd017e1f8112d86eecb870c Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 21 May 2021 15:29:14 +0200
Subject: [PATCH 45/67] show error screen when unable to write report

---
 .../org/cryptomator/ui/health/CheckListController.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
index 4ad6fd242..9a4fd299f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
@@ -3,6 +3,7 @@ package org.cryptomator.ui.health;
 import com.google.common.base.Preconditions;
 import com.tobiasdiez.easybind.EasyBind;
 import dagger.Lazy;
+import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,6 +45,7 @@ public class CheckListController implements FxController {
 	private final ReportWriter reportWriter;
 	private final ExecutorService executorService;
 	private final ObjectProperty<HealthCheckTask> selectedTask;
+	private final Lazy<ErrorComponent.Builder> errorComponenBuilder;
 	private final SimpleObjectProperty<Worker<?>> runningTask;
 	private final Binding<Boolean> running;
 	private final Binding<Boolean> finished;
@@ -58,12 +60,13 @@ public class CheckListController implements FxController {
 
 
 	@Inject
-	public CheckListController(@HealthCheckWindow Stage window, Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService) {
+	public CheckListController(@HealthCheckWindow Stage window, Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService, Lazy<ErrorComponent.Builder> errorComponenBuilder) {
 		this.window = window;
 		this.tasks = FXCollections.observableArrayList(tasks.get());
 		this.reportWriter = reportWriteTask;
 		this.executorService = executorService;
 		this.selectedTask = selectedTask;
+		this.errorComponenBuilder = errorComponenBuilder;
 		this.runningTask = new SimpleObjectProperty<>();
 		this.running = EasyBind.wrapNullable(runningTask).mapObservable(Worker::runningProperty).orElse(false);
 		this.finished = EasyBind.wrapNullable(runningTask).mapObservable(Worker::stateProperty).map(END_STATES::contains).orElse(false);
@@ -127,8 +130,8 @@ public class CheckListController implements FxController {
 		try {
 			reportWriter.writeReport(tasks);
 		} catch (IOException e) {
-			//TODO: better error handling
 			LOG.error("Failed to write health check report.", e);
+			errorComponenBuilder.get().cause(e).window(window).returnToScene(window.getScene()).build().showErrorScene();
 		}
 	}
 

From e98f92c63f576dc29e4ddee2810337827c2a4cc3 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 21 May 2021 15:56:32 +0200
Subject: [PATCH 46/67] Only use CheckTask title in UI instead of
 HealthCheck::identifier

---
 .../cryptomator/ui/health/CheckDetailController.java | 10 ----------
 .../org/cryptomator/ui/health/CheckListCell.java     |  2 +-
 .../cryptomator/ui/health/CheckListController.java   |  2 +-
 .../org/cryptomator/ui/health/HealthCheckTask.java   | 12 ++++++++++--
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
index a285d3400..64f7cd6f3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
@@ -19,7 +19,6 @@ public class CheckDetailController implements FxController {
 	private final Binding<ObservableList<DiagnosticResultAction>> results;
 	private final OptionalBinding<Worker.State> taskState;
 	private final Binding<String> taskName;
-	private final Binding<String> taskDescription;
 	private final ResultListCellFactory resultListCellFactory;
 	private final BooleanBinding producingResults;
 
@@ -30,7 +29,6 @@ public class CheckDetailController implements FxController {
 		this.results = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::results).orElse(FXCollections.emptyObservableList());
 		this.taskState = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::stateProperty);
 		this.taskName = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::getTitle).orElse("");
-		this.taskDescription = EasyBind.wrapNullable(selectedTask).map(task -> task.getCheck().toString()).orElse("");
 		this.resultListCellFactory = resultListCellFactory;
 		this.producingResults = taskState.filter(this::producesResults).isPresent();
 	}
@@ -58,14 +56,6 @@ public class CheckDetailController implements FxController {
 		return taskName;
 	}
 
-	public String getTaskDescription() {
-		return taskDescription.getValue();
-	}
-
-	public Binding<String> taskDescriptionProperty() {
-		return taskDescription;
-	}
-
 	public boolean isProducingResults() {
 		return producingResults.get();
 	}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
index 1b95f91f3..f9e1beda9 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
@@ -21,7 +21,7 @@ class CheckListCell extends ListCell<HealthCheckTask> {
 	protected void updateItem(HealthCheckTask item, boolean empty) {
 		super.updateItem(item, empty);
 		if (item != null) {
-			setText(item.getCheck().identifier());
+			setText(item.getTitle());
 			item.stateProperty().addListener(this::stateChanged);
 			setGraphic(stateIcon);
 			stateIcon.setGlyph(glyphForState(item.getState()));
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
index 9a4fd299f..bfd64dba3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
@@ -87,7 +87,7 @@ public class CheckListController implements FxController {
 		checksListView.setCellFactory(CheckBoxListCell.forListView(listPickIndicators::get, new StringConverter<HealthCheckTask>() {
 			@Override
 			public String toString(HealthCheckTask object) {
-				return object.getCheck().identifier();
+				return object.getTitle();
 			}
 
 			@Override
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
index 493ee9c23..db4fb71cb 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
@@ -3,6 +3,7 @@ package org.cryptomator.ui.health;
 import org.cryptomator.cryptofs.VaultConfig;
 import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 import org.cryptomator.cryptofs.health.api.HealthCheck;
+import org.cryptomator.cryptofs.health.dirid.DirIdCheck;
 import org.cryptomator.cryptolib.api.Masterkey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,8 +36,7 @@ class HealthCheckTask extends Task<Void> {
 		this.check = Objects.requireNonNull(check);
 		this.results = FXCollections.observableArrayList();
 
-		var tmp = check.identifier();
-		updateTitle(tmp.substring(tmp.length() - 10)); //TODO: new method with reliable logic
+		updateTitle(getDisplayNameOf(check));
 	}
 
 	@Override
@@ -83,4 +83,12 @@ class HealthCheckTask extends Task<Void> {
 	public HealthCheck getCheck() {
 		return check;
 	}
+
+	static String getDisplayNameOf(HealthCheck check) {
+		if( check instanceof DirIdCheck) { //TODO: discuss if this should be localized
+			return "DirectoryCheck";
+		} else {
+			return check.identifier();
+		}
+	}
 }

From e25dfaad35111d4ffbd2f53cc9ed1703b0751e24 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 21 May 2021 15:59:43 +0200
Subject: [PATCH 47/67] clean up

---
 .../cryptomator/ui/health/StartController.java | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
index 469503732..5d2a1a281 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
@@ -5,8 +5,6 @@ import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptofs.VaultConfig;
 import org.cryptomator.cryptofs.VaultConfigLoadException;
 import org.cryptomator.cryptofs.VaultKeyInvalidException;
-import org.cryptomator.cryptofs.health.api.HealthCheck;
-import org.cryptomator.cryptofs.health.dirid.DirIdCheck;
 import org.cryptomator.cryptolib.api.Masterkey;
 import org.cryptomator.cryptolib.api.MasterkeyLoadingFailedException;
 import org.cryptomator.ui.common.FxController;
@@ -19,22 +17,10 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javafx.application.Platform;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.scene.Scene;
-import javafx.scene.control.ListView;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.control.cell.CheckBoxListCell;
 import javafx.stage.Stage;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -49,20 +35,18 @@ public class StartController implements FxController {
 	private final ExecutorService executor;
 	private final AtomicReference<Masterkey> masterkeyRef;
 	private final AtomicReference<VaultConfig> vaultConfigRef;
-	private final Collection<HealthCheck> selectedChecks;
 	private final Lazy<Scene> checkScene;
 
 	/* FXML */
 
 	@Inject
-	public StartController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window, @HealthCheckWindow KeyLoadingStrategy keyLoadingStrategy, ExecutorService executor, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, Collection<HealthCheck> selectedChecks, @FxmlScene(FxmlFile.HEALTH_CHECK) Lazy<Scene> checkScene) {
+	public StartController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window, @HealthCheckWindow KeyLoadingStrategy keyLoadingStrategy, ExecutorService executor, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, @FxmlScene(FxmlFile.HEALTH_CHECK) Lazy<Scene> checkScene) {
 		this.window = window;
 		this.unverifiedVaultConfig = vault.getUnverifiedVaultConfig(); //TODO: prevent workflow at all, if the vault config is emtpy
 		this.keyLoadingStrategy = keyLoadingStrategy;
 		this.executor = executor;
 		this.masterkeyRef = masterkeyRef;
 		this.vaultConfigRef = vaultConfigRef;
-		this.selectedChecks = selectedChecks;
 		this.checkScene = checkScene;
 	}
 

From ea008df9f7f9bfe0157f63ea7dd9d0a54b4c3801 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 21 May 2021 16:25:37 +0200
Subject: [PATCH 48/67] Add error screen to vault check start screen

---
 .../org/cryptomator/ui/health/StartController.java    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
index 5d2a1a281..7661fff8a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
@@ -7,6 +7,7 @@ import org.cryptomator.cryptofs.VaultConfigLoadException;
 import org.cryptomator.cryptofs.VaultKeyInvalidException;
 import org.cryptomator.cryptolib.api.Masterkey;
 import org.cryptomator.cryptolib.api.MasterkeyLoadingFailedException;
+import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
@@ -36,11 +37,12 @@ public class StartController implements FxController {
 	private final AtomicReference<Masterkey> masterkeyRef;
 	private final AtomicReference<VaultConfig> vaultConfigRef;
 	private final Lazy<Scene> checkScene;
+	private final Lazy<ErrorComponent.Builder> errorComponent;
 
 	/* FXML */
 
 	@Inject
-	public StartController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window, @HealthCheckWindow KeyLoadingStrategy keyLoadingStrategy, ExecutorService executor, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, @FxmlScene(FxmlFile.HEALTH_CHECK) Lazy<Scene> checkScene) {
+	public StartController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window, @HealthCheckWindow KeyLoadingStrategy keyLoadingStrategy, ExecutorService executor, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, @FxmlScene(FxmlFile.HEALTH_CHECK) Lazy<Scene> checkScene, Lazy<ErrorComponent.Builder> errorComponent) {
 		this.window = window;
 		this.unverifiedVaultConfig = vault.getUnverifiedVaultConfig(); //TODO: prevent workflow at all, if the vault config is emtpy
 		this.keyLoadingStrategy = keyLoadingStrategy;
@@ -48,6 +50,7 @@ public class StartController implements FxController {
 		this.masterkeyRef = masterkeyRef;
 		this.vaultConfigRef = vaultConfigRef;
 		this.checkScene = checkScene;
+		this.errorComponent = errorComponent;
 	}
 
 	@FXML
@@ -97,11 +100,11 @@ public class StartController implements FxController {
 		if (e instanceof UnlockCancelledException) {
 			// ok
 		} else if (e instanceof VaultKeyInvalidException) {
-			LOG.error("Invalid key");
-			// TODO show error screen
+			LOG.error("Invalid key"); //TODO: specific error screen
+			errorComponent.get().window(window).cause(e).build().showErrorScene();
 		} else {
 			LOG.error("Failed to load key.", e);
-			// TODO show error screen
+			errorComponent.get().window(window).cause(e).build().showErrorScene();
 		}
 	}
 

From 04e5170403a86cd5be2c1f4b48e08317b460b4d2 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Fri, 21 May 2021 17:47:42 +0200
Subject: [PATCH 49/67] * Made DiagnosticResultAction a "pseudo-singleton" that
 consumes diagnostic results * renamed FxmlFile.HEALTH_CHECK to match fxml
 file name * added missing DI scopes * simplified cell layout

---
 .../org/cryptomator/ui/common/FxmlFile.java   |  2 +-
 .../ui/health/CheckDetailController.java      |  8 ++--
 .../cryptomator/ui/health/CheckListCell.java  | 24 +++++++----
 .../ui/health/HealthCheckModule.java          |  7 ++--
 .../ui/health/HealthCheckTask.java            |  9 ++---
 .../cryptomator/ui/health/ReportWriter.java   |  2 +-
 ...esultAction.java => ResultFixApplier.java} | 40 +++++++++----------
 .../ui/health/ResultListCellController.java   | 26 ++++++------
 .../ui/health/ResultListCellFactory.java      | 10 +++--
 .../ui/health/StartController.java            |  2 +-
 10 files changed, 71 insertions(+), 59 deletions(-)
 rename main/ui/src/main/java/org/cryptomator/ui/health/{DiagnosticResultAction.java => ResultFixApplier.java} (50%)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
index 32c142762..b8d5bbff0 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
@@ -12,7 +12,7 @@ public enum FxmlFile {
 	ERROR("/fxml/error.fxml"), //
 	FORGET_PASSWORD("/fxml/forget_password.fxml"), //
 	HEALTH_START("/fxml/health_start.fxml"), //
-	HEALTH_CHECK("/fxml/health_check_list.fxml"), //
+	HEALTH_CHECK_LIST("/fxml/health_check_list.fxml"), //
 	LOCK_FORCED("/fxml/lock_forced.fxml"), //
 	LOCK_FAILED("/fxml/lock_failed.fxml"), //
 	MAIN_WINDOW("/fxml/main_window.fxml"), //
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
index 64f7cd6f3..12f6338e3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
@@ -2,6 +2,7 @@ package org.cryptomator.ui.health;
 
 import com.tobiasdiez.easybind.EasyBind;
 import com.tobiasdiez.easybind.optional.OptionalBinding;
+import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
@@ -14,15 +15,16 @@ import javafx.concurrent.Worker;
 import javafx.fxml.FXML;
 import javafx.scene.control.ListView;
 
+@HealthCheckScoped
 public class CheckDetailController implements FxController {
 
-	private final Binding<ObservableList<DiagnosticResultAction>> results;
+	private final Binding<ObservableList<DiagnosticResult>> results;
 	private final OptionalBinding<Worker.State> taskState;
 	private final Binding<String> taskName;
 	private final ResultListCellFactory resultListCellFactory;
 	private final BooleanBinding producingResults;
 
-	public ListView<DiagnosticResultAction> resultsListView;
+	public ListView<DiagnosticResult> resultsListView;
 
 	@Inject
 	public CheckDetailController(ObjectProperty<HealthCheckTask> selectedTask, ResultListCellFactory resultListCellFactory) {
@@ -45,8 +47,8 @@ public class CheckDetailController implements FxController {
 		resultsListView.itemsProperty().bind(results);
 		resultsListView.setCellFactory(resultListCellFactory);
 	}
-	/* Getter/Setter */
 
+	/* Getter/Setter */
 
 	public String getTaskName() {
 		return taskName.getValue();
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
index f9e1beda9..19dd40051 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
@@ -6,6 +6,8 @@ import org.cryptomator.ui.controls.FontAwesome5IconView;
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Worker;
 import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.ListCell;
 
@@ -13,25 +15,24 @@ class CheckListCell extends ListCell<HealthCheckTask> {
 
 	private final FontAwesome5IconView stateIcon = new FontAwesome5IconView();
 
-	CheckListCell(){
-		paddingProperty().set(new Insets(6));
+	CheckListCell() {
+		setPadding(new Insets(6));
+		setAlignment(Pos.CENTER_LEFT);
+		setContentDisplay(ContentDisplay.LEFT);
 	}
 
 	@Override
 	protected void updateItem(HealthCheckTask item, boolean empty) {
 		super.updateItem(item, empty);
+
 		if (item != null) {
 			setText(item.getTitle());
 			item.stateProperty().addListener(this::stateChanged);
-			setGraphic(stateIcon);
+			setGraphic(graphicForState(item.getState()));
 			stateIcon.setGlyph(glyphForState(item.getState()));
-			if (item.getState() == Worker.State.READY) {
-				stateIcon.setVisible(false);
-			}
-			setContentDisplay(ContentDisplay.LEFT);
 		} else {
+			setGraphic(null);
 			setText(null);
-			setContentDisplay(ContentDisplay.TEXT_ONLY);
 		}
 	}
 
@@ -40,6 +41,13 @@ class CheckListCell extends ListCell<HealthCheckTask> {
 		stateIcon.setVisible(true);
 	}
 
+	private Node graphicForState(Worker.State state) {
+		return switch (state) {
+			case READY -> null;
+			case SCHEDULED, RUNNING, FAILED, CANCELLED, SUCCEEDED -> stateIcon;
+		};
+	}
+
 	private FontAwesome5Icon glyphForState(Worker.State state) {
 		return switch (state) {
 			case READY -> FontAwesome5Icon.COG; //just a placeholder
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
index 7ca3cbd05..0afb3c8bf 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
@@ -27,7 +27,6 @@ import javafx.scene.Scene;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import java.security.SecureRandom;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
@@ -113,10 +112,10 @@ abstract class HealthCheckModule {
 	}
 
 	@Provides
-	@FxmlScene(FxmlFile.HEALTH_CHECK)
+	@FxmlScene(FxmlFile.HEALTH_CHECK_LIST)
 	@HealthCheckScoped
-	static Scene provideHealthCheckScene(@HealthCheckWindow FxmlLoaderFactory fxmlLoaders) {
-		return fxmlLoaders.createScene(FxmlFile.HEALTH_CHECK);
+	static Scene provideHealthCheckListScene(@HealthCheckWindow FxmlLoaderFactory fxmlLoaders) {
+		return fxmlLoaders.createScene(FxmlFile.HEALTH_CHECK_LIST);
 	}
 
 	@Binds
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
index db4fb71cb..e7aec4f7a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
@@ -26,7 +26,7 @@ class HealthCheckTask extends Task<Void> {
 	private final Masterkey masterkey;
 	private final SecureRandom csprng;
 	private final HealthCheck check;
-	private final ObservableList<DiagnosticResultAction> results;
+	private final ObservableList<DiagnosticResult> results;
 
 	public HealthCheckTask(Path vaultPath, VaultConfig vaultConfig, Masterkey masterkey, SecureRandom csprng, HealthCheck check) {
 		this.vaultPath = Objects.requireNonNull(vaultPath);
@@ -35,7 +35,6 @@ class HealthCheckTask extends Task<Void> {
 		this.csprng = Objects.requireNonNull(csprng);
 		this.check = Objects.requireNonNull(check);
 		this.results = FXCollections.observableArrayList();
-
 		updateTitle(getDisplayNameOf(check));
 	}
 
@@ -58,7 +57,7 @@ class HealthCheckTask extends Task<Void> {
 						throw new RuntimeException(e);
 					}
 				}
-				Platform.runLater(() -> results.add(new DiagnosticResultAction(result,vaultPath,vaultConfig, masterkey,csprng))); //FIXME: there can be a lotta results, each with a reference to the master key -> differentiate with severity!
+				Platform.runLater(() -> results.add(result));
 			});
 		}
 		return null;
@@ -76,7 +75,7 @@ class HealthCheckTask extends Task<Void> {
 
 	/* Getter */
 
-	public ObservableList<DiagnosticResultAction> results() {
+	public ObservableList<DiagnosticResult> results() {
 		return results;
 	}
 
@@ -85,7 +84,7 @@ class HealthCheckTask extends Task<Void> {
 	}
 
 	static String getDisplayNameOf(HealthCheck check) {
-		if( check instanceof DirIdCheck) { //TODO: discuss if this should be localized
+		if (check instanceof DirIdCheck) { //TODO: discuss if this should be localized
 			return "DirectoryCheck";
 		} else {
 			return check.identifier();
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java b/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
index 9590626cd..fb74cbd51 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ReportWriter.java
@@ -72,7 +72,7 @@ public class ReportWriter {
 					case SUCCEEDED -> {
 						writer.write("STATUS: SUCCESS\nRESULTS:\n");
 						for (var result : task.results()) {
-							writer.write(REPORT_CHECK_RESULT.formatted(result.getSeverity(), result.getDescription()));
+							writer.write(REPORT_CHECK_RESULT.formatted(result.getServerity(), result.toString()));
 						}
 					}
 					case CANCELLED -> writer.write("STATUS: CANCELED\n");
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/DiagnosticResultAction.java b/main/ui/src/main/java/org/cryptomator/ui/health/ResultFixApplier.java
similarity index 50%
rename from main/ui/src/main/java/org/cryptomator/ui/health/DiagnosticResultAction.java
rename to main/ui/src/main/java/org/cryptomator/ui/health/ResultFixApplier.java
index 057acbb13..9a639e8a0 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/DiagnosticResultAction.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ResultFixApplier.java
@@ -1,47 +1,47 @@
 package org.cryptomator.ui.health;
 
+import com.google.common.base.Preconditions;
+import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptofs.VaultConfig;
 import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 import org.cryptomator.cryptolib.api.Masterkey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
 import javafx.scene.control.Alert;
 import java.nio.file.Path;
 import java.security.SecureRandom;
+import java.util.concurrent.atomic.AtomicReference;
 
-class DiagnosticResultAction implements Runnable {
+@HealthCheckScoped
+class ResultFixApplier {
+
+	private static final Logger LOG = LoggerFactory.getLogger(ResultFixApplier.class);
 
-	private final DiagnosticResult result;
 	private final Path vaultPath;
-	private final VaultConfig vaultConfig;
-	private final Masterkey masterkey;
 	private final SecureRandom csprng;
+	private final Masterkey masterkey;
+	private final VaultConfig vaultConfig;
 
-	DiagnosticResultAction(DiagnosticResult result, Path vaultPath, VaultConfig vaultConfig, Masterkey masterkey, SecureRandom csprng) {
-		this.result = result;
-		this.vaultPath = vaultPath;
-		this.vaultConfig = vaultConfig;
-		this.masterkey = masterkey;
+	@Inject
+	public ResultFixApplier(@HealthCheckWindow Vault vault, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, SecureRandom csprng) {
+		this.vaultPath = vault.getPath();
+		this.masterkey = masterkeyRef.get();
+		this.vaultConfig = vaultConfigRef.get();
 		this.csprng = csprng;
 	}
 
-	public void run() {
+	public void fix(DiagnosticResult result) {
+		Preconditions.checkArgument(result.getServerity() == DiagnosticResult.Severity.WARN, "Unfixable result");
 		try (var masterkeyClone = masterkey.clone(); //
 			 var cryptor = vaultConfig.getCipherCombo().getCryptorProvider(csprng).withKey(masterkeyClone)) {
 			result.fix(vaultPath, vaultConfig, masterkeyClone, cryptor);
 		} catch (Exception e) {
-			e.printStackTrace();
+			LOG.error("Failed to apply fix", e);
 			Alert alert = new Alert(Alert.AlertType.ERROR, e.getMessage());
 			alert.showAndWait();
 			//TODO: real error/not supported handling
 		}
 	}
-
-	public DiagnosticResult.Severity getSeverity() {
-		return result.getServerity(); //TODO: fix spelling with updated cryptofs release
-	}
-
-	public String getDescription() {
-		return result.toString();
-	}
-
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
index 0051265dd..a8720165c 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
@@ -1,6 +1,7 @@
 package org.cryptomator.ui.health;
 
 import com.tobiasdiez.easybind.EasyBind;
+import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.controls.FontAwesome5Icon;
 import org.cryptomator.ui.controls.FontAwesome5IconView;
@@ -13,27 +14,28 @@ import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 
+// unscoped because each cell needs its own controller
 public class ResultListCellController implements FxController {
 
-	private final ObjectProperty<DiagnosticResultAction> result;
+	private final ResultFixApplier fixApplier;
+	private final ObjectProperty<DiagnosticResult> result;
 	private final Binding<String> description;
 
-	@FXML
 	public FontAwesome5IconView iconView;
-	@FXML
 	public Button actionButton;
 
 	@Inject
-	public ResultListCellController() {
+	public ResultListCellController(ResultFixApplier fixApplier) {
 		this.result = new SimpleObjectProperty<>(null);
-		this.description = EasyBind.wrapNullable(result).map(DiagnosticResultAction::getDescription).orElse("");
+		this.description = EasyBind.wrapNullable(result).map(DiagnosticResult::toString).orElse("");
+		this.fixApplier = fixApplier;
 		result.addListener(this::updateCellContent);
 	}
 
-	private void updateCellContent(ObservableValue<? extends DiagnosticResultAction> observable, DiagnosticResultAction oldVal, DiagnosticResultAction newVal) {
+	private void updateCellContent(ObservableValue<? extends DiagnosticResult> observable, DiagnosticResult oldVal, DiagnosticResult newVal) {
 		iconView.getStyleClass().clear();
 		actionButton.setVisible(false);
-		switch (newVal.getSeverity()) {
+		switch (newVal.getServerity()) {
 			case INFO -> {
 				iconView.setGlyph(FontAwesome5Icon.INFO_CIRCLE);
 				iconView.getStyleClass().add("glyph-icon-muted");
@@ -58,21 +60,21 @@ public class ResultListCellController implements FxController {
 	public void runResultAction() {
 		final var realResult = result.get();
 		if (realResult != null) {
-			realResult.run(); //TODO: this hogs currently the JAVAFX thread
+			fixApplier.fix(realResult);
 		}
 	}
-
 	/* Getter & Setter */
 
-	public DiagnosticResultAction getResult() {
+
+	public DiagnosticResult getResult() {
 		return result.get();
 	}
 
-	public void setResult(DiagnosticResultAction result) {
+	public void setResult(DiagnosticResult result) {
 		this.result.set(result);
 	}
 
-	public ObjectProperty<DiagnosticResultAction> resultProperty() {
+	public ObjectProperty<DiagnosticResult> resultProperty() {
 		return result;
 	}
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellFactory.java b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellFactory.java
index 11f0e0f6b..7acada487 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellFactory.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellFactory.java
@@ -1,6 +1,7 @@
 package org.cryptomator.ui.health;
 
 
+import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 import org.cryptomator.ui.common.FxmlLoaderFactory;
 
 import javax.inject.Inject;
@@ -13,7 +14,8 @@ import javafx.util.Callback;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 
-public class ResultListCellFactory implements Callback<ListView<DiagnosticResultAction>, ListCell<DiagnosticResultAction>> {
+@HealthCheckScoped
+public class ResultListCellFactory implements Callback<ListView<DiagnosticResult>, ListCell<DiagnosticResult>> {
 
 	private final FxmlLoaderFactory fxmlLoaders;
 
@@ -23,7 +25,7 @@ public class ResultListCellFactory implements Callback<ListView<DiagnosticResult
 	}
 
 	@Override
-	public ListCell<DiagnosticResultAction> call(ListView<DiagnosticResultAction> param) {
+	public ListCell<DiagnosticResult> call(ListView<DiagnosticResult> param) {
 		try {
 			FXMLLoader fxmlLoader = fxmlLoaders.load("/fxml/health_result_listcell.fxml");
 			return new ResultListCellFactory.Cell(fxmlLoader.getRoot(), fxmlLoader.getController());
@@ -32,7 +34,7 @@ public class ResultListCellFactory implements Callback<ListView<DiagnosticResult
 		}
 	}
 
-	private static class Cell extends ListCell<DiagnosticResultAction> {
+	private static class Cell extends ListCell<DiagnosticResult> {
 
 		private final Parent node;
 		private final ResultListCellController controller;
@@ -43,7 +45,7 @@ public class ResultListCellFactory implements Callback<ListView<DiagnosticResult
 		}
 
 		@Override
-		protected void updateItem(DiagnosticResultAction item, boolean empty) {
+		protected void updateItem(DiagnosticResult item, boolean empty) {
 			super.updateItem(item, empty);
 			if (item == null || empty) {
 				setText(null);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
index 7661fff8a..bdd364336 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
@@ -42,7 +42,7 @@ public class StartController implements FxController {
 	/* FXML */
 
 	@Inject
-	public StartController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window, @HealthCheckWindow KeyLoadingStrategy keyLoadingStrategy, ExecutorService executor, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, @FxmlScene(FxmlFile.HEALTH_CHECK) Lazy<Scene> checkScene, Lazy<ErrorComponent.Builder> errorComponent) {
+	public StartController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window, @HealthCheckWindow KeyLoadingStrategy keyLoadingStrategy, ExecutorService executor, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, @FxmlScene(FxmlFile.HEALTH_CHECK_LIST) Lazy<Scene> checkScene, Lazy<ErrorComponent.Builder> errorComponent) {
 		this.window = window;
 		this.unverifiedVaultConfig = vault.getUnverifiedVaultConfig(); //TODO: prevent workflow at all, if the vault config is emtpy
 		this.keyLoadingStrategy = keyLoadingStrategy;

From e134d2f422511043b3a527e60e47527861d82fbb Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Fri, 21 May 2021 17:48:20 +0200
Subject: [PATCH 50/67] keep more ui code in fxml

---
 .../cryptomator/ui/health/CheckListController.java | 14 +++++++-------
 .../src/main/resources/fxml/health_check_list.fxml |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
index bfd64dba3..ccb41d56b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
@@ -21,6 +21,7 @@ import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.concurrent.Worker;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ListView;
@@ -55,7 +56,6 @@ public class CheckListController implements FxController {
 	private final BooleanProperty showResultScreen;
 
 	/* FXML */
-	public CheckBox selectAllBox;
 	public ListView<HealthCheckTask> checksListView;
 
 
@@ -96,13 +96,13 @@ public class CheckListController implements FxController {
 			}
 		}));
 		selectedTask.bind(checksListView.getSelectionModel().selectedItemProperty());
-		selectAllBox.selectedProperty().addListener(this::selectOrDeselectAll);
-		selectAllBox.visibleProperty().bind(showResultScreen.not());
-		selectAllBox.managedProperty().bind(showResultScreen.not());
 	}
 
-	public void selectOrDeselectAll(ObservableValue<? extends Boolean> observable, boolean oldValue, boolean newValue) {
-		listPickIndicators.forEach( (task, pickProperty) -> pickProperty.set(newValue));
+	@FXML
+	public void toggleSelectAll(ActionEvent event) {
+		if (event.getSource() instanceof CheckBox c) {
+			listPickIndicators.forEach( (task, pickProperty) -> pickProperty.set(c.isSelected()));
+		}
 	}
 
 	@FXML
@@ -113,9 +113,9 @@ public class CheckListController implements FxController {
 		batchService.setExecutor(executorService);
 		batchService.start();
 		runningTask.set(batchService);
-		checksListView.setCellFactory(view -> new CheckListCell());
 		showResultScreen.set(true);
 		checksListView.getSelectionModel().select(batch.get(0));
+		checksListView.setCellFactory(view -> new CheckListCell());
 		window.sizeToScene();
 	}
 
diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
index ee1cdebef..17ec12d0b 100644
--- a/main/ui/src/main/resources/fxml/health_check_list.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -25,7 +25,7 @@
 		<HBox spacing="12" VBox.vgrow="ALWAYS">
 			<VBox minWidth="80" maxWidth="200" spacing="6" HBox.hgrow="ALWAYS" >
 				<Label fx:id="listHeading" text="%health.check.listHeader"/>
-				<CheckBox fx:id="selectAllBox" text="FIX: SELECT ALL" />
+				<CheckBox onAction="#toggleSelectAll" text="FIX: SELECT ALL" visible="${!controller.showResultScreen}" managed="${!controller.showResultScreen}" />
 				<ListView fx:id="checksListView" VBox.vgrow="ALWAYS"/>
 			</VBox>
 			<StackPane visible="${controller.showResultScreen}" managed="${controller.showResultScreen}" HBox.hgrow="ALWAYS" >

From 944e3e6c50233897f6c8b084effc9f1d95e6fc58 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Fri, 21 May 2021 17:55:39 +0200
Subject: [PATCH 51/67] placeholder: use identifier to look up human-readable
 names from ResourceBundle instead of if/elsing on classes (e.g.
 `resourceBundle.getString(identifier() + ".name")`)

TODO @infeo
---
 .../src/main/java/org/cryptomator/ui/health/CheckListCell.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
index 19dd40051..73afcfed0 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
@@ -26,7 +26,7 @@ class CheckListCell extends ListCell<HealthCheckTask> {
 		super.updateItem(item, empty);
 
 		if (item != null) {
-			setText(item.getTitle());
+			setText(item.getCheck().identifier()); // TODO lookup l18n key
 			item.stateProperty().addListener(this::stateChanged);
 			setGraphic(graphicForState(item.getState()));
 			stateIcon.setGlyph(glyphForState(item.getState()));

From 1ca2e029dceb240b9aa1ed142cbf2990e9824390 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@zoho.eu>
Date: Fri, 21 May 2021 18:51:49 +0200
Subject: [PATCH 52/67] method loadVaultConfig() throws exception instead of
 returning optional (#1661)

---
 .../org/cryptomator/common/vaults/Vault.java   | 12 ++++--------
 .../ui/keyloading/KeyLoadingModule.java        | 18 ++++++------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
index e36369c35..02fd03600 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
@@ -109,7 +109,7 @@ public class Vault {
 		} else if(vaultSettings.maxCleartextFilenameLength().get() == -1) {
 			LOG.debug("Determining cleartext filename length limitations...");
 			var checker = new FileSystemCapabilityChecker();
-			int shorteningThreshold = getUnverifiedVaultConfig().orElseThrow().allegedShorteningThreshold();
+			int shorteningThreshold = getUnverifiedVaultConfig().allegedShorteningThreshold();
 			int ciphertextLimit = checker.determineSupportedCiphertextFileNameLength(getPath());
 			if (ciphertextLimit < shorteningThreshold) {
 				int cleartextLimit = checker.determineSupportedCleartextFileNameLength(getPath());
@@ -327,14 +327,10 @@ public class Vault {
 		return stats;
 	}
 
-	public Optional<UnverifiedVaultConfig> getUnverifiedVaultConfig() {
+	public UnverifiedVaultConfig getUnverifiedVaultConfig() throws IOException {
 		Path configPath = getPath().resolve(org.cryptomator.common.Constants.VAULTCONFIG_FILENAME);
-		try {
-			String token = Files.readString(configPath, StandardCharsets.US_ASCII);
-			return Optional.of(VaultConfig.decode(token));
-		} catch (IOException e) {
-			return Optional.empty();
-		}
+		String token = Files.readString(configPath, StandardCharsets.US_ASCII);
+		return VaultConfig.decode(token);
 	}
 
 	public Observable[] observables() {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/keyloading/KeyLoadingModule.java b/main/ui/src/main/java/org/cryptomator/ui/keyloading/KeyLoadingModule.java
index 15a5d27b8..f7eb8922f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/keyloading/KeyLoadingModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/keyloading/KeyLoadingModule.java
@@ -10,6 +10,7 @@ import org.cryptomator.ui.common.FxmlLoaderFactory;
 import org.cryptomator.ui.keyloading.masterkeyfile.MasterkeyFileLoadingModule;
 
 import javax.inject.Provider;
+import java.io.IOException;
 import java.net.URI;
 import java.util.Map;
 import java.util.Optional;
@@ -28,20 +29,13 @@ abstract class KeyLoadingModule {
 	@Provides
 	@KeyLoading
 	@KeyLoadingScoped
-	static Optional<URI> provideKeyId(@KeyLoading Vault vault) {
-		return vault.getUnverifiedVaultConfig().map(UnverifiedVaultConfig::getKeyId);
-	}
-
-	@Provides
-	@KeyLoading
-	@KeyLoadingScoped
-	static KeyLoadingStrategy provideKeyLoaderProvider(@KeyLoading Optional<URI> keyId, Map<String, Provider<KeyLoadingStrategy>> strategies) {
-		if (keyId.isEmpty()) {
-			return KeyLoadingStrategy.failed(new IllegalArgumentException("No key id provided"));
-		} else {
-			String scheme = keyId.get().getScheme();
+	static KeyLoadingStrategy provideKeyLoaderProvider(@KeyLoading Vault vault, Map<String, Provider<KeyLoadingStrategy>> strategies) {
+		try {
+			String scheme = vault.getUnverifiedVaultConfig().getKeyId().getScheme();
 			var fallback = KeyLoadingStrategy.failed(new IllegalArgumentException("Unsupported key id " + scheme));
 			return strategies.getOrDefault(scheme, () -> fallback).get();
+		} catch (IOException e) {
+			return KeyLoadingStrategy.failed(e);
 		}
 	}
 

From 9562db7e13367c2a45fd9e452010b77994d47d95 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 25 May 2021 11:10:03 +0200
Subject: [PATCH 53/67] Closes 1659

---
 main/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/pom.xml b/main/pom.xml
index 64222a7a0..c09fbee89 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -32,7 +32,7 @@
 		<cryptomator.integrations.linux.version>1.0.0-beta1</cryptomator.integrations.linux.version>
 		<cryptomator.fuse.version>1.3.1</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.3.1</cryptomator.dokany.version>
-		<cryptomator.webdav.version>1.2.0</cryptomator.webdav.version>
+		<cryptomator.webdav.version>1.2.2</cryptomator.webdav.version>
 
 		<!-- 3rd party dependencies -->
 		<javafx.version>16</javafx.version>

From ab961f1a8b356427d69e19dbeb8ced8c825f62d8 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 25 May 2021 11:16:17 +0200
Subject: [PATCH 54/67] update thrid party licences

---
 .../main/resources/license/THIRD-PARTY.txt    | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt
index d1910d669..d1ec3a280 100644
--- a/main/ui/src/main/resources/license/THIRD-PARTY.txt
+++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt
@@ -19,10 +19,10 @@ Cryptomator uses 45 third-party dependencies under the following licenses:
 			- jnr-ffi (com.github.jnr:jnr-ffi:2.1.12 - http://github.com/jnr/jnr-ffi)
 			- FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/)
 			- Gson (com.google.code.gson:gson:2.8.6 - https://github.com/google/gson/gson)
-			- Dagger (com.google.dagger:dagger:2.32 - https://github.com/google/dagger)
-			- error-prone annotations (com.google.errorprone:error_prone_annotations:2.3.4 - http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations)
+			- Dagger (com.google.dagger:dagger:2.35.1 - https://github.com/google/dagger)
+			- error-prone annotations (com.google.errorprone:error_prone_annotations:2.5.1 - http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations)
 			- Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess)
-			- Guava: Google Core Libraries for Java (com.google.guava:guava:30.1-jre - https://github.com/google/guava/guava)
+			- Guava: Google Core Libraries for Java (com.google.guava:guava:30.1.1-jre - https://github.com/google/guava/guava)
 			- Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture)
 			- J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.3 - https://github.com/google/j2objc/)
 			- Apache Commons CLI (commons-cli:commons-cli:1.4 - http://commons.apache.org/proper/commons-cli/)
@@ -32,35 +32,37 @@ Cryptomator uses 45 third-party dependencies under the following licenses:
 			- Apache Commons Lang (org.apache.commons:commons-lang3:3.11 - https://commons.apache.org/proper/commons-lang/)
 			- Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.14 - http://hc.apache.org/httpcomponents-core-ga)
 			- Jackrabbit WebDAV Library (org.apache.jackrabbit:jackrabbit-webdav:2.21.5 - http://jackrabbit.apache.org/jackrabbit-webdav/)
-			- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:10.0.1 - https://eclipse.org/jetty/jetty-http)
-			- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:10.0.1 - https://eclipse.org/jetty/jetty-io)
-			- Jetty :: Security (org.eclipse.jetty:jetty-security:10.0.1 - https://eclipse.org/jetty/jetty-security)
-			- Jetty :: Server Core (org.eclipse.jetty:jetty-server:10.0.1 - https://eclipse.org/jetty/jetty-server)
-			- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:10.0.1 - https://eclipse.org/jetty/jetty-servlet)
-			- Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.1 - https://eclipse.org/jetty/jetty-util)
-			- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:10.0.1 - https://eclipse.org/jetty/jetty-webapp)
-			- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:10.0.1 - https://eclipse.org/jetty/jetty-xml)
+			- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:10.0.2 - https://eclipse.org/jetty/jetty-http)
+			- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:10.0.2 - https://eclipse.org/jetty/jetty-io)
+			- Jetty :: Security (org.eclipse.jetty:jetty-security:10.0.2 - https://eclipse.org/jetty/jetty-security)
+			- Jetty :: Server Core (org.eclipse.jetty:jetty-server:10.0.2 - https://eclipse.org/jetty/jetty-server)
+			- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:10.0.2 - https://eclipse.org/jetty/jetty-servlet)
+			- Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.2 - https://eclipse.org/jetty/jetty-util)
+			- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:10.0.2 - https://eclipse.org/jetty/jetty-webapp)
+			- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:10.0.2 - https://eclipse.org/jetty/jetty-xml)
+			- Jetty :: Servlet API and Schemas for JPMS and OSGi (org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 - https://eclipse.org/jetty/jetty-servlet-api)
         BSD:
 			- asm (org.ow2.asm:asm:7.1 - http://asm.ow2.org/)
 			- asm-analysis (org.ow2.asm:asm-analysis:7.1 - http://asm.ow2.org/)
 			- asm-commons (org.ow2.asm:asm-commons:7.1 - http://asm.ow2.org/)
 			- asm-tree (org.ow2.asm:asm-tree:7.1 - http://asm.ow2.org/)
 			- asm-util (org.ow2.asm:asm-util:7.1 - http://asm.ow2.org/)
+        Eclipse Public License - Version 1.0:
+			- Jetty :: Servlet API and Schemas for JPMS and OSGi (org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6 - https://eclipse.org/jetty/jetty-servlet-api)
         Eclipse Public License - Version 2.0:
-			- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:10.0.1 - https://eclipse.org/jetty/jetty-http)
-			- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:10.0.1 - https://eclipse.org/jetty/jetty-io)
-			- Jetty :: Security (org.eclipse.jetty:jetty-security:10.0.1 - https://eclipse.org/jetty/jetty-security)
-			- Jetty :: Server Core (org.eclipse.jetty:jetty-server:10.0.1 - https://eclipse.org/jetty/jetty-server)
-			- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:10.0.1 - https://eclipse.org/jetty/jetty-servlet)
-			- Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.1 - https://eclipse.org/jetty/jetty-util)
-			- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:10.0.1 - https://eclipse.org/jetty/jetty-webapp)
-			- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:10.0.1 - https://eclipse.org/jetty/jetty-xml)
+			- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:10.0.2 - https://eclipse.org/jetty/jetty-http)
+			- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:10.0.2 - https://eclipse.org/jetty/jetty-io)
+			- Jetty :: Security (org.eclipse.jetty:jetty-security:10.0.2 - https://eclipse.org/jetty/jetty-security)
+			- Jetty :: Server Core (org.eclipse.jetty:jetty-server:10.0.2 - https://eclipse.org/jetty/jetty-server)
+			- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:10.0.2 - https://eclipse.org/jetty/jetty-servlet)
+			- Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.2 - https://eclipse.org/jetty/jetty-util)
+			- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:10.0.2 - https://eclipse.org/jetty/jetty-webapp)
+			- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:10.0.2 - https://eclipse.org/jetty/jetty-xml)
         Eclipse Public License - v 2.0:
 			- jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
         GPLv2:
 			- jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
         GPLv2+CE:
-			- Java Servlet API (javax.servlet:javax.servlet-api:4.0.1 - https://javaee.github.io/servlet-spec/)
 			- javafx-base (org.openjfx:javafx-base:16 - https://openjdk.java.net/projects/openjfx/javafx-base/)
 			- javafx-controls (org.openjfx:javafx-controls:16 - https://openjdk.java.net/projects/openjfx/javafx-controls/)
 			- javafx-fxml (org.openjfx:javafx-fxml:16 - https://openjdk.java.net/projects/openjfx/javafx-fxml/)
@@ -70,11 +72,11 @@ Cryptomator uses 45 third-party dependencies under the following licenses:
 			- Java Native Access (net.java.dev.jna:jna:5.7.0 - https://github.com/java-native-access/jna)
 			- Java Native Access Platform (net.java.dev.jna:jna-platform:5.7.0 - https://github.com/java-native-access/jna)
         MIT License:
-			- java jwt (com.auth0:java-jwt:3.13.0 - https://github.com/auth0/java-jwt)
+			- java jwt (com.auth0:java-jwt:3.15.0 - https://github.com/auth0/java-jwt)
 			- jnr-x86asm (com.github.jnr:jnr-x86asm:1.0.2 - http://github.com/jnr/jnr-x86asm)
 			- jnr-fuse (com.github.serceman:jnr-fuse:0.5.5 - https://github.com/SerCeMan/jnr-fuse)
 			- zxcvbn4j (com.nulab-inc:zxcvbn:1.3.0 - https://github.com/nulab/zxcvbn4j)
-			- Checker Qual (org.checkerframework:checker-qual:3.5.0 - https://checkerframework.org)
+			- Checker Qual (org.checkerframework:checker-qual:3.8.0 - https://checkerframework.org)
 			- SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - http://www.slf4j.org)
         The BSD 2-Clause License:
 			- EasyBind (com.tobiasdiez:easybind:2.1.0 - https://github.com/tobiasdiez/EasyBind)

From b47382811fd8d820a7aa5d3a10f1e93590848860 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 25 May 2021 12:37:29 +0200
Subject: [PATCH 55/67] apply ugly workaround for new vault config loading

---
 .../org/cryptomator/ui/health/StartController.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
index bdd364336..3e9cc5b07 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/StartController.java
@@ -21,6 +21,7 @@ import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
+import java.io.IOException;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicReference;
@@ -44,13 +45,24 @@ public class StartController implements FxController {
 	@Inject
 	public StartController(@HealthCheckWindow Vault vault, @HealthCheckWindow Stage window, @HealthCheckWindow KeyLoadingStrategy keyLoadingStrategy, ExecutorService executor, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, @FxmlScene(FxmlFile.HEALTH_CHECK_LIST) Lazy<Scene> checkScene, Lazy<ErrorComponent.Builder> errorComponent) {
 		this.window = window;
-		this.unverifiedVaultConfig = vault.getUnverifiedVaultConfig(); //TODO: prevent workflow at all, if the vault config is emtpy
 		this.keyLoadingStrategy = keyLoadingStrategy;
 		this.executor = executor;
 		this.masterkeyRef = masterkeyRef;
 		this.vaultConfigRef = vaultConfigRef;
 		this.checkScene = checkScene;
 		this.errorComponent = errorComponent;
+
+		//TODO: this is ugly
+		//idea: delay the loading of the vault config and show a spinner (something like "check/load config") and react to the result of the loading
+		//or: load vault config in a previous step to see if it is loadable.
+		VaultConfig.UnverifiedVaultConfig tmp;
+		try {
+			tmp = vault.getUnverifiedVaultConfig();
+		} catch (IOException e) {
+			e.printStackTrace();
+			tmp =  null;
+		}
+		this.unverifiedVaultConfig = Optional.ofNullable(tmp);
 	}
 
 	@FXML

From 783c8718c1386cbd4f83d3c2d9e0f9695811420c Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 25 May 2021 13:20:18 +0200
Subject: [PATCH 56/67] add localization for health check names

---
 .../cryptomator/ui/health/CheckListCell.java  |  3 ++-
 .../ui/health/HealthCheckModule.java          |  4 ++--
 .../ui/health/HealthCheckTask.java            | 19 +++++++++----------
 .../main/resources/i18n/strings.properties    |  2 ++
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
index 73afcfed0..b4863213e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
@@ -26,11 +26,12 @@ class CheckListCell extends ListCell<HealthCheckTask> {
 		super.updateItem(item, empty);
 
 		if (item != null) {
-			setText(item.getCheck().identifier()); // TODO lookup l18n key
+			textProperty().bind(item.titleProperty());
 			item.stateProperty().addListener(this::stateChanged);
 			setGraphic(graphicForState(item.getState()));
 			stateIcon.setGlyph(glyphForState(item.getState()));
 		} else {
+			textProperty().unbind();
 			setGraphic(null);
 			setText(null);
 		}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
index 0afb3c8bf..e33a9f2f1 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
@@ -63,8 +63,8 @@ abstract class HealthCheckModule {
 	/* Only inject with Lazy-Wrapper!*/
 	@Provides
 	@HealthCheckScoped
-	static Collection<HealthCheckTask> provideAvailableHealthCheckTasks(Collection<HealthCheck> availableHealthChecks, @HealthCheckWindow Vault vault, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, SecureRandom csprng) {
-		return availableHealthChecks.stream().map(check -> new HealthCheckTask(vault.getPath(), vaultConfigRef.get(), masterkeyRef.get(), csprng, check)).toList();
+	static Collection<HealthCheckTask> provideAvailableHealthCheckTasks(Collection<HealthCheck> availableHealthChecks, @HealthCheckWindow Vault vault, AtomicReference<Masterkey> masterkeyRef, AtomicReference<VaultConfig> vaultConfigRef, SecureRandom csprng, ResourceBundle resourceBundle) {
+		return availableHealthChecks.stream().map(check -> new HealthCheckTask(vault.getPath(), vaultConfigRef.get(), masterkeyRef.get(), csprng, check, resourceBundle)).toList();
 	}
 
 	@Provides
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
index e7aec4f7a..36543c4bc 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
@@ -3,7 +3,6 @@ package org.cryptomator.ui.health;
 import org.cryptomator.cryptofs.VaultConfig;
 import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 import org.cryptomator.cryptofs.health.api.HealthCheck;
-import org.cryptomator.cryptofs.health.dirid.DirIdCheck;
 import org.cryptomator.cryptolib.api.Masterkey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +13,9 @@ import javafx.collections.ObservableList;
 import javafx.concurrent.Task;
 import java.nio.file.Path;
 import java.security.SecureRandom;
+import java.util.MissingResourceException;
 import java.util.Objects;
+import java.util.ResourceBundle;
 import java.util.concurrent.CancellationException;
 
 class HealthCheckTask extends Task<Void> {
@@ -28,14 +29,19 @@ class HealthCheckTask extends Task<Void> {
 	private final HealthCheck check;
 	private final ObservableList<DiagnosticResult> results;
 
-	public HealthCheckTask(Path vaultPath, VaultConfig vaultConfig, Masterkey masterkey, SecureRandom csprng, HealthCheck check) {
+	public HealthCheckTask(Path vaultPath, VaultConfig vaultConfig, Masterkey masterkey, SecureRandom csprng, HealthCheck check, ResourceBundle resourceBundle) {
 		this.vaultPath = Objects.requireNonNull(vaultPath);
 		this.vaultConfig = Objects.requireNonNull(vaultConfig);
 		this.masterkey = Objects.requireNonNull(masterkey);
 		this.csprng = Objects.requireNonNull(csprng);
 		this.check = Objects.requireNonNull(check);
 		this.results = FXCollections.observableArrayList();
-		updateTitle(getDisplayNameOf(check));
+		try {
+			updateTitle(resourceBundle.getString("health." + check.identifier()));
+		} catch (MissingResourceException e) {
+			LOG.warn("Missing proper name for health check {}, falling back to default.", check.identifier());
+			updateTitle(check.identifier());
+		}
 	}
 
 	@Override
@@ -83,11 +89,4 @@ class HealthCheckTask extends Task<Void> {
 		return check;
 	}
 
-	static String getDisplayNameOf(HealthCheck check) {
-		if (check instanceof DirIdCheck) { //TODO: discuss if this should be localized
-			return "DirectoryCheck";
-		} else {
-			return check.identifier();
-		}
-	}
 }
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index a245ab42b..aae581cb2 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -154,6 +154,8 @@ health.check.result.noSelectedCheck=For results select a finished check in the l
 health.check.result.header=Results of %s
 health.check.export=Export Report
 health.check.fix=Fix
+## Checks
+health.org.cryptomator.cryptofs.health.dirid.DirIdCheck=Directory Check
 
 # Preferences
 preferences.title=Preferences

From 98a899c7e2cca50dce5e7a04ea8ed7c7edfeedf8 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 25 May 2021 13:21:13 +0200
Subject: [PATCH 57/67] scope checklist cell and properly update graphic
 property

---
 .../main/java/org/cryptomator/ui/health/CheckListCell.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
index b4863213e..16b691a28 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
@@ -3,6 +3,7 @@ package org.cryptomator.ui.health;
 import org.cryptomator.ui.controls.FontAwesome5Icon;
 import org.cryptomator.ui.controls.FontAwesome5IconView;
 
+import javafx.beans.binding.Bindings;
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Worker;
 import javafx.geometry.Insets;
@@ -11,6 +12,7 @@ import javafx.scene.Node;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.ListCell;
 
+@HealthCheckScoped
 class CheckListCell extends ListCell<HealthCheckTask> {
 
 	private final FontAwesome5IconView stateIcon = new FontAwesome5IconView();
@@ -28,10 +30,11 @@ class CheckListCell extends ListCell<HealthCheckTask> {
 		if (item != null) {
 			textProperty().bind(item.titleProperty());
 			item.stateProperty().addListener(this::stateChanged);
-			setGraphic(graphicForState(item.getState()));
+			graphicProperty().bind(Bindings.createObjectBinding(() -> graphicForState(item.getState()),item.stateProperty()));
 			stateIcon.setGlyph(glyphForState(item.getState()));
 		} else {
 			textProperty().unbind();
+			graphicProperty().unbind();
 			setGraphic(null);
 			setText(null);
 		}

From 6038559172aa5c0ee677f5e47ca6f24900c23170 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Wed, 26 May 2021 15:50:03 +0200
Subject: [PATCH 58/67] Localization and small ui fixes

---
 .../src/main/resources/fxml/health_check_list.fxml  |  8 ++++----
 .../main/resources/fxml/health_result_listcell.fxml |  5 ++++-
 main/ui/src/main/resources/fxml/health_start.fxml   |  9 +++------
 .../main/resources/fxml/vault_detail_locked.fxml    |  2 +-
 main/ui/src/main/resources/i18n/strings.properties  | 13 +++++++++----
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
index 17ec12d0b..f16f718ee 100644
--- a/main/ui/src/main/resources/fxml/health_check_list.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -24,8 +24,8 @@
 	<children>
 		<HBox spacing="12" VBox.vgrow="ALWAYS">
 			<VBox minWidth="80" maxWidth="200" spacing="6" HBox.hgrow="ALWAYS" >
-				<Label fx:id="listHeading" text="%health.check.listHeader"/>
-				<CheckBox onAction="#toggleSelectAll" text="FIX: SELECT ALL" visible="${!controller.showResultScreen}" managed="${!controller.showResultScreen}" />
+				<Label fx:id="listHeading" text="%health.checkList.header"/>
+				<CheckBox onAction="#toggleSelectAll" text="%health.checkList.selectAllBox" visible="${!controller.showResultScreen}" managed="${!controller.showResultScreen}" />
 				<ListView fx:id="checksListView" VBox.vgrow="ALWAYS"/>
 			</VBox>
 			<StackPane visible="${controller.showResultScreen}" managed="${controller.showResultScreen}" HBox.hgrow="ALWAYS" >
@@ -38,8 +38,8 @@
 		<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
 			<buttons>
 				<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" onAction="#cancelCheck" disable="${!controller.running}" visible="${controller.showResultScreen}" managed="${controller.showResultScreen}" />
-				<Button text="%health.check.export" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" disable="${!controller.finished}" visible="${controller.showResultScreen}" managed="${controller.showResultScreen}" onAction="#exportResults"/>
-				<Button text="%health.check.runBatchButton" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#runSelectedChecks" disable="${controller.numberOfPickedChecks == ZERO}" visible="${!controller.showResultScreen}" managed="${!controller.showResultScreen}"/>
+				<Button text="%health.check.exportBtn" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" disable="${!controller.finished}" visible="${controller.showResultScreen}" managed="${controller.showResultScreen}" onAction="#exportResults"/>
+				<Button text="%health.check.runBatchBtn" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#runSelectedChecks" disable="${controller.numberOfPickedChecks == ZERO}" visible="${!controller.showResultScreen}" managed="${!controller.showResultScreen}"/>
 			</buttons>
 		</ButtonBar>
 	</children>
diff --git a/main/ui/src/main/resources/fxml/health_result_listcell.fxml b/main/ui/src/main/resources/fxml/health_result_listcell.fxml
index 0c6c05708..b4bcda77a 100644
--- a/main/ui/src/main/resources/fxml/health_result_listcell.fxml
+++ b/main/ui/src/main/resources/fxml/health_result_listcell.fxml
@@ -21,6 +21,9 @@
 		<FontAwesome5IconView fx:id="iconView" HBox.hgrow="NEVER" glyphSize="16"/>
 		<Label text="${controller.description}" wrapText="true"/>
 		<Region HBox.hgrow="ALWAYS"/>
-		<Button fx:id="actionButton" text="%health.check.fix" onAction="#runResultAction" alignment="CENTER_RIGHT" visible="false" />
+		<!-- TODO: setting the minWidth of the button is just a workaround.
+		           What we actually want to do is to prevent shrinking the button more than the text
+		           -> own subclass of HBox is needed -->
+		<Button fx:id="actionButton" text="%health.check.fixBtn" onAction="#runResultAction" alignment="CENTER" visible="false" minWidth="50"/>
 	</children>
 </HBox>
diff --git a/main/ui/src/main/resources/fxml/health_start.fxml b/main/ui/src/main/resources/fxml/health_start.fxml
index ccabefc11..1bd729597 100644
--- a/main/ui/src/main/resources/fxml/health_start.fxml
+++ b/main/ui/src/main/resources/fxml/health_start.fxml
@@ -4,10 +4,6 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ListView?>
-<?import javafx.scene.control.RadioButton?>
-<?import javafx.scene.control.ToggleGroup?>
-<?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.VBox?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
@@ -20,9 +16,10 @@
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
-		<Label text="TODO: Invalid vault config" visible="${controller.invalidConfig}" managed="${controller.invalidConfig}"/>
+		<Label text="%health.start.introduction" wrapText="true"/>
 
-		<Label text="TODO: Blabla going to health check now...:"/>
+		<Label text="%health.start.configInvalid" visible="${controller.invalidConfig}" managed="${controller.invalidConfig}"/>
+		<Label text="%health.start.configValid" visible="${!controller.invalidConfig}" managed="${!controller.invalidConfig}" wrapText="true"/>
 
 		<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
 			<buttons>
diff --git a/main/ui/src/main/resources/fxml/vault_detail_locked.fxml b/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
index 3171141d1..b7d6ce075 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
@@ -33,7 +33,7 @@
 		<Region VBox.vgrow="ALWAYS"/>
 
 		<HBox alignment="BOTTOM_RIGHT">
-			<Button text="TODO Sanitizer" onAction="#showHealthCheck"/>
+			<Button text="%main.vaultDetail.healthBtn" onAction="#showHealthCheck"/>
 			<Button text="%main.vaultDetail.optionsBtn" minWidth="120" onAction="#showVaultOptions">
 				<graphic>
 					<FontAwesome5IconView glyph="COG"/>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index aae581cb2..12eedd2c9 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -148,12 +148,16 @@ migration.impossible.moreInfo=The vault can still be opened with an older versio
 
 # Health Check
 health.title=Vault Check
-health.check.listHeader=Available Checks
-health.check.runBatchButton=Run selected Checks
+health.start.introduction=The Vault Health Check is a collection of checks to detect and possilby fix problems in the internal structure of your vault. Please note, that not all problems are fixable. You need the vault password to perform the checks.
+health.start.configValid=Reading and parsing vault configuration file was successful. Proceed to select checks.
+health.start.configInvalid=Error while reading and parsing the vault configuration file.
+health.checkList.header=Available Checks
+health.checkList.selectAllBox=Select All
+health.check.runBatchBtn=Run selected Checks
 health.check.result.noSelectedCheck=For results select a finished check in the left list.
 health.check.result.header=Results of %s
-health.check.export=Export Report
-health.check.fix=Fix
+health.check.exportBtn=Export Report
+health.check.fixBtn=Fix
 ## Checks
 health.org.cryptomator.cryptofs.health.dirid.DirIdCheck=Directory Check
 
@@ -256,6 +260,7 @@ main.vaultDetail.welcomeOnboarding=Thanks for choosing Cryptomator to protect yo
 ### Locked
 main.vaultDetail.lockedStatus=LOCKED
 main.vaultDetail.unlockBtn=Unlock…
+main.vaultDetail.healthBtn=Health Check
 main.vaultDetail.unlockNowBtn=Unlock Now
 main.vaultDetail.optionsBtn=Vault Options
 main.vaultDetail.passwordSavedInKeychain=Password saved

From f74b9d33479fdf281e72fc1be7292cc73e64e289 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Wed, 26 May 2021 15:50:50 +0200
Subject: [PATCH 59/67] Remove Scope

---
 .../src/main/java/org/cryptomator/ui/health/CheckListCell.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
index 16b691a28..78f8b1b33 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListCell.java
@@ -12,7 +12,6 @@ import javafx.scene.Node;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.ListCell;
 
-@HealthCheckScoped
 class CheckListCell extends ListCell<HealthCheckTask> {
 
 	private final FontAwesome5IconView stateIcon = new FontAwesome5IconView();

From 186c129a300d87f0feb672d02f39899c2d6664a0 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Mon, 31 May 2021 15:28:30 +0200
Subject: [PATCH 60/67] Replace stub check detail description with info about
 check duration and count of warnings and critical errors

---
 .../ui/controls/FormattedLabel2.java          | 39 ++++++++
 .../ui/health/CheckDetailController.java      | 88 ++++++++++++++++++-
 .../ui/health/HealthCheckTask.java            | 16 ++++
 .../resources/fxml/health_check_details.fxml  | 11 ++-
 4 files changed, 148 insertions(+), 6 deletions(-)
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel2.java

diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel2.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel2.java
new file mode 100644
index 000000000..426a6bc4f
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel2.java
@@ -0,0 +1,39 @@
+package org.cryptomator.ui.controls;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.StringBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+
+public class FormattedLabel2 extends FormattedLabel {
+
+	private final ObjectProperty<Object> arg2 = new SimpleObjectProperty<>();
+
+	public FormattedLabel2() {
+		textProperty().unbind();
+		textProperty().bind(createStringBinding2());
+	}
+
+	private StringBinding createStringBinding2() {
+		return Bindings.createStringBinding(this::updateText, formatProperty(), arg1Property(), arg2);
+	}
+
+	private String updateText() {
+		return String.format(getFormat(), getArg1(), arg2.get());
+	}
+
+	/* Getter & Setter */
+
+	public ObjectProperty<Object> arg2Property() {
+		return arg2;
+	}
+
+	public Object getArg2() {
+		return arg2.get();
+	}
+
+	public void setArg2(Object arg2) {
+		this.arg2.set(arg2);
+	}
+
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
index 12f6338e3..adbd12e2e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
@@ -8,37 +8,85 @@ import org.cryptomator.ui.common.FxController;
 import javax.inject.Inject;
 import javafx.beans.binding.Binding;
 import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.LongProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleLongProperty;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.concurrent.Worker;
 import javafx.fxml.FXML;
 import javafx.scene.control.ListView;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
 
 @HealthCheckScoped
 public class CheckDetailController implements FxController {
 
+	private final Map<ObservableList<DiagnosticResult>, WarnAndErrorEntry> cachedWarnAndErrorCounts;
 	private final Binding<ObservableList<DiagnosticResult>> results;
 	private final OptionalBinding<Worker.State> taskState;
 	private final Binding<String> taskName;
+	private final Binding<Number> taskDuration;
 	private final ResultListCellFactory resultListCellFactory;
 	private final BooleanBinding producingResults;
+	private final LongProperty numOfWarnings;
+	private final LongProperty numOfErrors;
 
 	public ListView<DiagnosticResult> resultsListView;
 
 	@Inject
 	public CheckDetailController(ObjectProperty<HealthCheckTask> selectedTask, ResultListCellFactory resultListCellFactory) {
+		selectedTask.addListener(this::rebindWarnAndErrorCount);
 		this.results = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::results).orElse(FXCollections.emptyObservableList());
 		this.taskState = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::stateProperty);
 		this.taskName = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::getTitle).orElse("");
+		this.taskDuration = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::durationInMillisProperty).orElse(-1L);
 		this.resultListCellFactory = resultListCellFactory;
 		this.producingResults = taskState.filter(this::producesResults).isPresent();
+		this.numOfWarnings = new SimpleLongProperty(0);
+		this.numOfErrors = new SimpleLongProperty(0);
+		this.cachedWarnAndErrorCounts = new IdentityHashMap<>(); //important to use an identity hashmap, because collections violate the immnutable hashkey contract
+	}
+
+	private synchronized void rebindWarnAndErrorCount(ObservableValue<? extends HealthCheckTask> observable, HealthCheckTask oldVal, HealthCheckTask newVal) {
+		//create and cache properites for the newList, if not already present
+		final var listToUpdate = newVal.results();
+		cachedWarnAndErrorCounts.computeIfAbsent(listToUpdate, key -> {
+			var warnProperty = new SimpleLongProperty(countSeverityInList(listToUpdate, DiagnosticResult.Severity.WARN));
+			var errProperty = new SimpleLongProperty(countSeverityInList(listToUpdate, DiagnosticResult.Severity.CRITICAL));
+			return new WarnAndErrorEntry(warnProperty, errProperty);
+		});
+		listToUpdate.addListener(this::updateListSpecificWarnAndErrorCount);
+
+		//updateBindings
+		numOfErrors.bind(cachedWarnAndErrorCounts.get(listToUpdate).errorCount);
+		numOfWarnings.bind(cachedWarnAndErrorCounts.get(listToUpdate).warningCount);
+	}
+
+	private synchronized void updateListSpecificWarnAndErrorCount(ListChangeListener.Change<? extends DiagnosticResult> c) {
+		long tmpErr = cachedWarnAndErrorCounts.get(c.getList()).errorCount.get();
+		long tmpWarn = cachedWarnAndErrorCounts.get(c.getList()).warningCount.get();
+		while (c.next()) {
+			if (c.wasAdded()) {
+				tmpWarn += countSeverityInList(c.getAddedSubList(), DiagnosticResult.Severity.WARN);
+				tmpErr += countSeverityInList(c.getAddedSubList(), DiagnosticResult.Severity.CRITICAL);
+			}
+		}
+		cachedWarnAndErrorCounts.get(c.getList()).errorCount.set(tmpErr);
+		cachedWarnAndErrorCounts.get(c.getList()).warningCount.set(tmpWarn);
+	}
+
+	private long countSeverityInList(List<? extends DiagnosticResult> list, DiagnosticResult.Severity severityToCount) {
+		return list.stream().map(DiagnosticResult::getServerity).filter(severityToCount::equals).count();
 	}
 
 	private boolean producesResults(Worker.State state) {
 		return switch (state) {
-			case SCHEDULED, RUNNING, SUCCEEDED -> true;
-			case READY, CANCELLED, FAILED -> false;
+			case SCHEDULED, RUNNING -> true;
+			case READY, SUCCEEDED, CANCELLED, FAILED -> false;
 		};
 	}
 
@@ -65,4 +113,40 @@ public class CheckDetailController implements FxController {
 	public BooleanBinding producingResultsProperty() {
 		return producingResults;
 	}
+
+	public Number getTaskDuration() {
+		return taskDuration.getValue();
+	}
+
+	public Binding<Number> taskDurationProperty() {
+		return taskDuration;
+	}
+
+	public long getNumOfWarnings() {
+		return numOfWarnings.get();
+	}
+
+	public LongProperty numOfWarningsProperty() {
+		return numOfWarnings;
+	}
+
+	public long getNumOfErrors() {
+		return numOfErrors.get();
+	}
+
+	public LongProperty numOfErrorsProperty() {
+		return numOfErrors;
+	}
+
+	private static class WarnAndErrorEntry {
+
+		WarnAndErrorEntry(LongProperty warningCount, LongProperty errorCount) {
+			this.warningCount = warningCount;
+			this.errorCount = errorCount;
+		}
+
+		final LongProperty warningCount;
+		final LongProperty errorCount;
+	}
+
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
index 36543c4bc..7acbfc1c2 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
@@ -8,11 +8,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javafx.application.Platform;
+import javafx.beans.property.LongProperty;
+import javafx.beans.property.SimpleLongProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.concurrent.Task;
 import java.nio.file.Path;
 import java.security.SecureRandom;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.MissingResourceException;
 import java.util.Objects;
 import java.util.ResourceBundle;
@@ -28,6 +32,7 @@ class HealthCheckTask extends Task<Void> {
 	private final SecureRandom csprng;
 	private final HealthCheck check;
 	private final ObservableList<DiagnosticResult> results;
+	private final LongProperty durationInMillis;
 
 	public HealthCheckTask(Path vaultPath, VaultConfig vaultConfig, Masterkey masterkey, SecureRandom csprng, HealthCheck check, ResourceBundle resourceBundle) {
 		this.vaultPath = Objects.requireNonNull(vaultPath);
@@ -42,10 +47,12 @@ class HealthCheckTask extends Task<Void> {
 			LOG.warn("Missing proper name for health check {}, falling back to default.", check.identifier());
 			updateTitle(check.identifier());
 		}
+		this.durationInMillis = new SimpleLongProperty(-1);
 	}
 
 	@Override
 	protected Void call() {
+		Instant start = Instant.now();
 		try (var masterkeyClone = masterkey.clone(); //
 			 var cryptor = vaultConfig.getCipherCombo().getCryptorProvider(csprng).withKey(masterkeyClone)) {
 			check.check(vaultPath, vaultConfig, masterkeyClone, cryptor, result -> {
@@ -66,6 +73,7 @@ class HealthCheckTask extends Task<Void> {
 				Platform.runLater(() -> results.add(result));
 			});
 		}
+		Platform.runLater(() ->durationInMillis.set(Duration.between(start, Instant.now()).toMillis()));
 		return null;
 	}
 
@@ -89,4 +97,12 @@ class HealthCheckTask extends Task<Void> {
 		return check;
 	}
 
+	public LongProperty durationInMillisProperty() {
+		return durationInMillis;
+	}
+
+	public long getDurationInMillis() {
+		return durationInMillis.get();
+	}
+
 }
diff --git a/main/ui/src/main/resources/fxml/health_check_details.fxml b/main/ui/src/main/resources/fxml/health_check_details.fxml
index d93b47212..3ff0b7b98 100644
--- a/main/ui/src/main/resources/fxml/health_check_details.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_details.fxml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FormattedLabel?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Text?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
+<?import org.cryptomator.ui.controls.FormattedLabel2?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.health.CheckDetailController"
 	  spacing="6">
 	<FormattedLabel fx:id="checkTitle" styleClass="label-large" format="%health.check.result.header" arg1="${controller.taskName}"/>
-	<Text fx:id="checkDescription" styleClass="label" text="FIXME: Here could be a small description."/>
-	<ListView fx:id="resultsListView"/>
+	<Label text="The check is currently running..." visible="${controller.producingResults}" managed="${controller.producingResults}"/>
+	<!-- TODO: what if the check was canceled? Should be indicated in ui -->
+	<FormattedLabel fx:id="checkDescription" styleClass="label" format="The check finished after %d milliseconds." arg1="${controller.taskDuration}" visible="${!controller.producingResults}" managed="${!controller.producingResults}"/>
+	<FormattedLabel2 styleClass="label" format="Found %d Warnings and %d unfixable Errors." arg1="${controller.numOfWarnings}" arg2="${controller.numOfErrors}" />
+	<ListView fx:id="resultsListView" VBox.vgrow="ALWAYS"/>
 </VBox>
\ No newline at end of file

From 7eaade15558810728050bc2d4edc0f03f4843314 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 1 Jun 2021 10:29:41 +0200
Subject: [PATCH 61/67] Depeding on state of selected task, show appropiate
 status text in check detail view

---
 .../ui/health/CheckDetailController.java      | 138 ++++++++++++------
 .../resources/fxml/health_check_details.fxml  |  16 +-
 .../resources/fxml/health_check_list.fxml     |   2 +-
 .../main/resources/i18n/strings.properties    |  12 +-
 4 files changed, 117 insertions(+), 51 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
index adbd12e2e..51278e946 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
@@ -7,7 +7,6 @@ import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
 import javafx.beans.binding.Binding;
-import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.LongProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleLongProperty;
@@ -25,71 +24,76 @@ import java.util.Map;
 @HealthCheckScoped
 public class CheckDetailController implements FxController {
 
-	private final Map<ObservableList<DiagnosticResult>, WarnAndErrorEntry> cachedWarnAndErrorCounts;
+	private final Map<ObservableList<DiagnosticResult>, WarnAndErrorEntry> cachedWarnAndCritCounts;
 	private final Binding<ObservableList<DiagnosticResult>> results;
 	private final OptionalBinding<Worker.State> taskState;
 	private final Binding<String> taskName;
 	private final Binding<Number> taskDuration;
 	private final ResultListCellFactory resultListCellFactory;
-	private final BooleanBinding producingResults;
-	private final LongProperty numOfWarnings;
-	private final LongProperty numOfErrors;
+	private final Binding<Boolean> taskRunning;
+	private final Binding<Boolean> taskScheduled;
+	private final Binding<Boolean> taskFinished;
+	private final Binding<Boolean> taskNotStarted;
+	private final Binding<Boolean> taskSucceeded;
+	private final Binding<Boolean> taskFailed;
+	private final Binding<Boolean> taskCancelled;
+	private final LongProperty countOfWarnSeverity;
+	private final LongProperty countOfCritSeverity;
 
 	public ListView<DiagnosticResult> resultsListView;
 
 	@Inject
 	public CheckDetailController(ObjectProperty<HealthCheckTask> selectedTask, ResultListCellFactory resultListCellFactory) {
-		selectedTask.addListener(this::rebindWarnAndErrorCount);
+		selectedTask.addListener(this::rebindWarnAndCritProperties);
 		this.results = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::results).orElse(FXCollections.emptyObservableList());
 		this.taskState = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::stateProperty);
 		this.taskName = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::getTitle).orElse("");
 		this.taskDuration = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::durationInMillisProperty).orElse(-1L);
 		this.resultListCellFactory = resultListCellFactory;
-		this.producingResults = taskState.filter(this::producesResults).isPresent();
-		this.numOfWarnings = new SimpleLongProperty(0);
-		this.numOfErrors = new SimpleLongProperty(0);
-		this.cachedWarnAndErrorCounts = new IdentityHashMap<>(); //important to use an identity hashmap, because collections violate the immnutable hashkey contract
+		this.taskRunning = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::runningProperty).orElse(false); //TODO: DOES NOT WORK
+		this.taskScheduled = taskState.map(Worker.State.SCHEDULED::equals).orElse(false);
+		this.taskNotStarted = taskState.map(Worker.State.READY::equals).orElse(false);
+		this.taskSucceeded = taskState.map(Worker.State.SUCCEEDED::equals).orElse(false);
+		this.taskFailed = taskState.map(Worker.State.FAILED::equals).orElse(false);
+		this.taskCancelled = taskState.map(Worker.State.CANCELLED::equals).orElse(false);
+		this.taskFinished = EasyBind.combine(taskSucceeded, taskFailed, taskCancelled, (a, b, c) -> a || b || c);
+		this.countOfWarnSeverity = new SimpleLongProperty(0);
+		this.countOfCritSeverity = new SimpleLongProperty(0);
+		this.cachedWarnAndCritCounts = new IdentityHashMap<>(); //important to use an identity hashmap, because collections violate the immnutable hashkey contract
 	}
 
-	private synchronized void rebindWarnAndErrorCount(ObservableValue<? extends HealthCheckTask> observable, HealthCheckTask oldVal, HealthCheckTask newVal) {
+	private synchronized void rebindWarnAndCritProperties(ObservableValue<? extends HealthCheckTask> observable, HealthCheckTask oldVal, HealthCheckTask newVal) {
 		//create and cache properites for the newList, if not already present
 		final var listToUpdate = newVal.results();
-		cachedWarnAndErrorCounts.computeIfAbsent(listToUpdate, key -> {
+		cachedWarnAndCritCounts.computeIfAbsent(listToUpdate, key -> {
 			var warnProperty = new SimpleLongProperty(countSeverityInList(listToUpdate, DiagnosticResult.Severity.WARN));
 			var errProperty = new SimpleLongProperty(countSeverityInList(listToUpdate, DiagnosticResult.Severity.CRITICAL));
 			return new WarnAndErrorEntry(warnProperty, errProperty);
 		});
-		listToUpdate.addListener(this::updateListSpecificWarnAndErrorCount);
+		listToUpdate.addListener(this::updateListSpecificWarnAndCritCount);
 
 		//updateBindings
-		numOfErrors.bind(cachedWarnAndErrorCounts.get(listToUpdate).errorCount);
-		numOfWarnings.bind(cachedWarnAndErrorCounts.get(listToUpdate).warningCount);
+		countOfCritSeverity.bind(cachedWarnAndCritCounts.get(listToUpdate).errorCount);
+		countOfWarnSeverity.bind(cachedWarnAndCritCounts.get(listToUpdate).warningCount);
 	}
 
-	private synchronized void updateListSpecificWarnAndErrorCount(ListChangeListener.Change<? extends DiagnosticResult> c) {
-		long tmpErr = cachedWarnAndErrorCounts.get(c.getList()).errorCount.get();
-		long tmpWarn = cachedWarnAndErrorCounts.get(c.getList()).warningCount.get();
+	private synchronized void updateListSpecificWarnAndCritCount(ListChangeListener.Change<? extends DiagnosticResult> c) {
+		long tmpErr = cachedWarnAndCritCounts.get(c.getList()).errorCount.get();
+		long tmpWarn = cachedWarnAndCritCounts.get(c.getList()).warningCount.get();
 		while (c.next()) {
 			if (c.wasAdded()) {
 				tmpWarn += countSeverityInList(c.getAddedSubList(), DiagnosticResult.Severity.WARN);
 				tmpErr += countSeverityInList(c.getAddedSubList(), DiagnosticResult.Severity.CRITICAL);
 			}
 		}
-		cachedWarnAndErrorCounts.get(c.getList()).errorCount.set(tmpErr);
-		cachedWarnAndErrorCounts.get(c.getList()).warningCount.set(tmpWarn);
+		cachedWarnAndCritCounts.get(c.getList()).errorCount.set(tmpErr);
+		cachedWarnAndCritCounts.get(c.getList()).warningCount.set(tmpWarn);
 	}
 
 	private long countSeverityInList(List<? extends DiagnosticResult> list, DiagnosticResult.Severity severityToCount) {
 		return list.stream().map(DiagnosticResult::getServerity).filter(severityToCount::equals).count();
 	}
 
-	private boolean producesResults(Worker.State state) {
-		return switch (state) {
-			case SCHEDULED, RUNNING -> true;
-			case READY, SUCCEEDED, CANCELLED, FAILED -> false;
-		};
-	}
-
 	@FXML
 	public void initialize() {
 		resultsListView.itemsProperty().bind(results);
@@ -106,14 +110,6 @@ public class CheckDetailController implements FxController {
 		return taskName;
 	}
 
-	public boolean isProducingResults() {
-		return producingResults.get();
-	}
-
-	public BooleanBinding producingResultsProperty() {
-		return producingResults;
-	}
-
 	public Number getTaskDuration() {
 		return taskDuration.getValue();
 	}
@@ -122,20 +118,76 @@ public class CheckDetailController implements FxController {
 		return taskDuration;
 	}
 
-	public long getNumOfWarnings() {
-		return numOfWarnings.get();
+	public long getCountOfWarnSeverity() {
+		return countOfWarnSeverity.get();
 	}
 
-	public LongProperty numOfWarningsProperty() {
-		return numOfWarnings;
+	public LongProperty countOfWarnSeverityProperty() {
+		return countOfWarnSeverity;
 	}
 
-	public long getNumOfErrors() {
-		return numOfErrors.get();
+	public long getCountOfCritSeverity() {
+		return countOfCritSeverity.get();
 	}
 
-	public LongProperty numOfErrorsProperty() {
-		return numOfErrors;
+	public LongProperty countOfCritSeverityProperty() {
+		return countOfCritSeverity;
+	}
+
+	public boolean isTaskRunning() {
+		return taskRunning.getValue();
+	}
+
+	public Binding<Boolean> taskRunningProperty() {
+		return taskRunning;
+	}
+
+	public boolean isTaskFinished() {
+		return taskFinished.getValue();
+	}
+
+	public Binding<Boolean> taskFinishedProperty() {
+		return taskFinished;
+	}
+
+	public boolean isTaskScheduled() {
+		return taskScheduled.getValue();
+	}
+
+	public Binding<Boolean> taskScheduledProperty() {
+		return taskScheduled;
+	}
+
+	public boolean isTaskNotStarted() {
+		return taskNotStarted.getValue();
+	}
+
+	public Binding<Boolean> taskNotStartedProperty() {
+		return taskNotStarted;
+	}
+
+	public boolean isTaskSucceeded() {
+		return taskSucceeded.getValue();
+	}
+
+	public Binding<Boolean> taskSucceededProperty() {
+		return taskSucceeded;
+	}
+
+	public boolean isTaskFailed() {
+		return taskFailed.getValue();
+	}
+
+	public Binding<Boolean> taskFailedProperty() {
+		return taskFailed;
+	}
+
+	public boolean isTaskCancelled() {
+		return taskCancelled.getValue();
+	}
+
+	public Binding<Boolean> taskCancelledProperty() {
+		return taskCancelled;
 	}
 
 	private static class WarnAndErrorEntry {
diff --git a/main/ui/src/main/resources/fxml/health_check_details.fxml b/main/ui/src/main/resources/fxml/health_check_details.fxml
index 3ff0b7b98..bad05cb7b 100644
--- a/main/ui/src/main/resources/fxml/health_check_details.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_details.fxml
@@ -9,10 +9,16 @@
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.health.CheckDetailController"
 	  spacing="6">
-	<FormattedLabel fx:id="checkTitle" styleClass="label-large" format="%health.check.result.header" arg1="${controller.taskName}"/>
-	<Label text="The check is currently running..." visible="${controller.producingResults}" managed="${controller.producingResults}"/>
-	<!-- TODO: what if the check was canceled? Should be indicated in ui -->
-	<FormattedLabel fx:id="checkDescription" styleClass="label" format="The check finished after %d milliseconds." arg1="${controller.taskDuration}" visible="${!controller.producingResults}" managed="${!controller.producingResults}"/>
-	<FormattedLabel2 styleClass="label" format="Found %d Warnings and %d unfixable Errors." arg1="${controller.numOfWarnings}" arg2="${controller.numOfErrors}" />
+	<FormattedLabel fx:id="checkTitle" styleClass="label-large" format="%health.check.detail.header" arg1="${controller.taskName}"/>
+
+	<Label text="%health.check.detail.taskNotStarted" visible="${controller.taskNotStarted}" managed="${controller.taskNotStarted}"/>
+	<Label text="%health.check.detail.taskRunning" visible="${controller.taskRunning}" managed="${controller.taskRunning}"/>
+	<Label text="%health.check.detail.taskScheduled" visible="${controller.taskScheduled}" managed="${controller.taskScheduled}"/>
+	<Label text="%health.check.detail.taskCancelled" visible="${controller.taskCancelled}" managed="${controller.taskCancelled}"/>
+	<Label text="%health.check.detail.taskFailed" visible="${controller.taskFailed}" managed="${controller.taskFailed}"/>
+	<FormattedLabel styleClass="label" format="%health.check.detail.taskSucceeded" arg1="${controller.taskDuration}" visible="${controller.taskSucceeded}" managed="${controller.taskSucceeded}"/>
+
+	<FormattedLabel2 styleClass="label" format="%health.check.detail.problemCount" arg1="${controller.countOfWarnSeverity}" arg2="${controller.countOfCritSeverity}" visible="${!controller.taskNotStarted}"
+					 managed="${!controller.taskNotStarted}"	/>
 	<ListView fx:id="resultsListView" VBox.vgrow="ALWAYS"/>
 </VBox>
\ No newline at end of file
diff --git a/main/ui/src/main/resources/fxml/health_check_list.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
index f16f718ee..a3a9c2f93 100644
--- a/main/ui/src/main/resources/fxml/health_check_list.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -30,7 +30,7 @@
 			</VBox>
 			<StackPane visible="${controller.showResultScreen}" managed="${controller.showResultScreen}" HBox.hgrow="ALWAYS" >
 				<VBox minWidth="300" alignment="CENTER" visible="${!controller.anyCheckSelected}" managed="${!controller.anyCheckSelected}" >
-					<Label text="%health.check.result.noSelectedCheck" wrapText="true" alignment="CENTER" />
+					<Label text="%health.check.detail.noSelectedCheck" wrapText="true" alignment="CENTER" />
 				</VBox>
 				<fx:include  source="/fxml/health_check_details.fxml" visible="${controller.anyCheckSelected}" managed="${controller.anyCheckSelected}" />
 			</StackPane>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 12eedd2c9..a5af2f77a 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -154,8 +154,16 @@ health.start.configInvalid=Error while reading and parsing the vault configurati
 health.checkList.header=Available Checks
 health.checkList.selectAllBox=Select All
 health.check.runBatchBtn=Run selected Checks
-health.check.result.noSelectedCheck=For results select a finished check in the left list.
-health.check.result.header=Results of %s
+## Detail view
+health.check.detail.noSelectedCheck=For results select a finished check in the left list.
+health.check.detail.header=Results of %s
+health.check.detail.taskNotStarted=The check was not selected to run.
+health.check.detail.taskScheduled=The check is scheduled.
+health.check.detail.taskRunning=The check is currently running…
+health.check.detail.taskSucceeded=The check finished successfully after %d milliseconds.
+health.check.detail.taskFailed=The check exited with errors.
+health.check.detail.taskCancelled=The check was cancelled.
+health.check.detail.problemCount=Found %d Problems and %d unfixable Errors.
 health.check.exportBtn=Export Report
 health.check.fixBtn=Fix
 ## Checks

From 8c37ab36756e8895e05ca4243fb8df3b0f2c15e6 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 1 Jun 2021 10:45:48 +0200
Subject: [PATCH 62/67] Closes #961

---
 .../src/main/java/org/cryptomator/common/vaults/VaultModule.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
index 19d577975..901ee7f42 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
@@ -98,7 +98,6 @@ public class VaultModule {
 		flags.append(" -oatomic_o_trunc");
 		flags.append(" -oauto_xattr");
 		flags.append(" -oauto_cache");
-		flags.append(" -omodules=iconv,from_code=UTF-8,to_code=UTF-8-MAC"); // show files names in Unicode NFD encoding
 		flags.append(" -onoappledouble"); // vastly impacts performance for some reason...
 		flags.append(" -odefault_permissions"); // let the kernel assume permissions based on file attributes etc
 

From eb196165c54175807424abe9078bc7dce4326408 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 1 Jun 2021 11:51:49 +0200
Subject: [PATCH 63/67] move healthcheck button to vault options

---
 .../ui/mainwindow/VaultDetailLockedController.java    |  9 +--------
 .../vaultoptions/GeneralVaultOptionsController.java   | 11 ++++++++++-
 main/ui/src/main/resources/fxml/health_start.fxml     |  2 +-
 .../src/main/resources/fxml/vault_detail_locked.fxml  |  1 -
 .../main/resources/fxml/vault_options_general.fxml    |  2 ++
 main/ui/src/main/resources/i18n/strings.properties    |  2 +-
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java
index 8d3f6a72c..20f0d916d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java
@@ -24,17 +24,15 @@ public class VaultDetailLockedController implements FxController {
 
 	private final ReadOnlyObjectProperty<Vault> vault;
 	private final FxApplication application;
-	private final HealthCheckComponent.Builder healthCheckWindow;
 	private final VaultOptionsComponent.Builder vaultOptionsWindow;
 	private final KeychainManager keychain;
 	private final Stage mainWindow;
 	private final BooleanExpression passwordSaved;
 
 	@Inject
-	VaultDetailLockedController(ObjectProperty<Vault> vault, FxApplication application, HealthCheckComponent.Builder healthCheckWindow, VaultOptionsComponent.Builder vaultOptionsWindow, KeychainManager keychain, @MainWindow Stage mainWindow) {
+	VaultDetailLockedController(ObjectProperty<Vault> vault, FxApplication application,  VaultOptionsComponent.Builder vaultOptionsWindow, KeychainManager keychain, @MainWindow Stage mainWindow) {
 		this.vault = vault;
 		this.application = application;
-		this.healthCheckWindow = healthCheckWindow;
 		this.vaultOptionsWindow = vaultOptionsWindow;
 		this.keychain = keychain;
 		this.mainWindow = mainWindow;
@@ -60,11 +58,6 @@ public class VaultDetailLockedController implements FxController {
 		vaultOptionsWindow.vault(vault.get()).build().showVaultOptionsWindow(SelectedVaultOptionsTab.KEY);
 	}
 
-	@FXML
-	public void showHealthCheck() {
-		healthCheckWindow.vault(vault.get()).build().showHealthCheckWindow();
-	}
-
 	/* Getter/Setter */
 
 	public ReadOnlyObjectProperty<Vault> vaultProperty() {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java
index e860ee811..79d3b53ad 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java
@@ -3,6 +3,7 @@ package org.cryptomator.ui.vaultoptions;
 import org.cryptomator.common.settings.WhenUnlocked;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.health.HealthCheckComponent;
 
 import javax.inject.Inject;
 import javafx.beans.Observable;
@@ -22,6 +23,7 @@ public class GeneralVaultOptionsController implements FxController {
 
 	private final Stage window;
 	private final Vault vault;
+	private final HealthCheckComponent.Builder healthCheckWindow;
 	private final ResourceBundle resourceBundle;
 
 	public TextField vaultName;
@@ -29,9 +31,10 @@ public class GeneralVaultOptionsController implements FxController {
 	public ChoiceBox<WhenUnlocked> actionAfterUnlockChoiceBox;
 
 	@Inject
-	GeneralVaultOptionsController(@VaultOptionsWindow Stage window, @VaultOptionsWindow Vault vault, ResourceBundle resourceBundle) {
+	GeneralVaultOptionsController(@VaultOptionsWindow Stage window, @VaultOptionsWindow Vault vault, HealthCheckComponent.Builder healthCheckWindow, ResourceBundle resourceBundle) {
 		this.window = window;
 		this.vault = vault;
+		this.healthCheckWindow = healthCheckWindow;
 		this.resourceBundle = resourceBundle;
 	}
 
@@ -61,6 +64,12 @@ public class GeneralVaultOptionsController implements FxController {
 		}
 	}
 
+	@FXML
+	public void showHealthCheck() {
+		healthCheckWindow.vault(vault).build().showHealthCheckWindow();
+	}
+
+
 	private static class WhenUnlockedConverter extends StringConverter<WhenUnlocked> {
 
 		private final ResourceBundle resourceBundle;
diff --git a/main/ui/src/main/resources/fxml/health_start.fxml b/main/ui/src/main/resources/fxml/health_start.fxml
index 1bd729597..bf9990614 100644
--- a/main/ui/src/main/resources/fxml/health_start.fxml
+++ b/main/ui/src/main/resources/fxml/health_start.fxml
@@ -18,7 +18,7 @@
 	<children>
 		<Label text="%health.start.introduction" wrapText="true"/>
 
-		<Label text="%health.start.configInvalid" visible="${controller.invalidConfig}" managed="${controller.invalidConfig}"/>
+		<Label text="%health.start.configInvalid" visible="${controller.invalidConfig}" managed="${controller.invalidConfig}" wrapText="true"/>
 		<Label text="%health.start.configValid" visible="${!controller.invalidConfig}" managed="${!controller.invalidConfig}" wrapText="true"/>
 
 		<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
diff --git a/main/ui/src/main/resources/fxml/vault_detail_locked.fxml b/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
index b7d6ce075..d4bbc7e4a 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
@@ -33,7 +33,6 @@
 		<Region VBox.vgrow="ALWAYS"/>
 
 		<HBox alignment="BOTTOM_RIGHT">
-			<Button text="%main.vaultDetail.healthBtn" onAction="#showHealthCheck"/>
 			<Button text="%main.vaultDetail.optionsBtn" minWidth="120" onAction="#showVaultOptions">
 				<graphic>
 					<FontAwesome5IconView glyph="COG"/>
diff --git a/main/ui/src/main/resources/fxml/vault_options_general.fxml b/main/ui/src/main/resources/fxml/vault_options_general.fxml
index 1fd251ea0..dce834c95 100644
--- a/main/ui/src/main/resources/fxml/vault_options_general.fxml
+++ b/main/ui/src/main/resources/fxml/vault_options_general.fxml
@@ -7,6 +7,7 @@
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.control.Button?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.vaultoptions.GeneralVaultOptionsController"
@@ -26,5 +27,6 @@
 			<Label text="%vaultOptions.general.actionAfterUnlock"/>
 			<ChoiceBox fx:id="actionAfterUnlockChoiceBox"/>
 		</HBox>
+		<Button text="%vaultOptions.general.healthBtn" onAction="#showHealthCheck"/>
 	</children>
 </VBox>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index a5af2f77a..6e724adec 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -268,7 +268,6 @@ main.vaultDetail.welcomeOnboarding=Thanks for choosing Cryptomator to protect yo
 ### Locked
 main.vaultDetail.lockedStatus=LOCKED
 main.vaultDetail.unlockBtn=Unlock…
-main.vaultDetail.healthBtn=Health Check
 main.vaultDetail.unlockNowBtn=Unlock Now
 main.vaultDetail.optionsBtn=Vault Options
 main.vaultDetail.passwordSavedInKeychain=Password saved
@@ -311,6 +310,7 @@ vaultOptions.general.actionAfterUnlock=After successful unlock
 vaultOptions.general.actionAfterUnlock.ignore=Do nothing
 vaultOptions.general.actionAfterUnlock.reveal=Reveal Drive
 vaultOptions.general.actionAfterUnlock.ask=Ask
+vaultOptions.general.healthBtn=Health Check
 ## Mount
 vaultOptions.mount=Mounting
 vaultOptions.mount.readonly=Read-Only

From 617feec111c78bd833508848a12c99995b1e5a68 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 1 Jun 2021 13:14:31 +0200
Subject: [PATCH 64/67] deactivate fix button

---
 .../org/cryptomator/ui/health/ResultListCellController.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
index a8720165c..f2bca059a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/ResultListCellController.java
@@ -35,6 +35,8 @@ public class ResultListCellController implements FxController {
 	private void updateCellContent(ObservableValue<? extends DiagnosticResult> observable, DiagnosticResult oldVal, DiagnosticResult newVal) {
 		iconView.getStyleClass().clear();
 		actionButton.setVisible(false);
+		//TODO: see comment in case WARN
+		actionButton.setManaged(false);
 		switch (newVal.getServerity()) {
 			case INFO -> {
 				iconView.setGlyph(FontAwesome5Icon.INFO_CIRCLE);
@@ -47,7 +49,9 @@ public class ResultListCellController implements FxController {
 			case WARN -> {
 				iconView.setGlyph(FontAwesome5Icon.EXCLAMATION_TRIANGLE);
 				iconView.getStyleClass().add("glyph-icon-orange");
-				actionButton.setVisible(true);
+				//TODO: Neither is any fix implemented, nor it is ensured, that only fix is executed at a time with good ui indication
+				//	before both are not fix, do not show the button
+				//actionButton.setVisible(true);
 			}
 			case CRITICAL -> {
 				iconView.setGlyph(FontAwesome5Icon.TIMES);

From 5185df631d12401e79bc774237c66f14b30dae9b Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 1 Jun 2021 13:22:56 +0200
Subject: [PATCH 65/67] rather add functionality to formattedLabel class than
 to extend it

---
 .../ui/controls/FormattedLabel.java           | 17 +++++++-
 .../ui/controls/FormattedLabel2.java          | 39 -------------------
 .../resources/fxml/health_check_details.fxml  |  3 +-
 3 files changed, 16 insertions(+), 43 deletions(-)
 delete mode 100644 main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel2.java

diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel.java
index c99cc62ea..04ed7e477 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel.java
@@ -12,6 +12,7 @@ public class FormattedLabel extends Label {
 
 	private final StringProperty format = new SimpleStringProperty("");
 	private final ObjectProperty<Object> arg1 = new SimpleObjectProperty<>();
+	private final ObjectProperty<Object> arg2 = new SimpleObjectProperty<>();
 	// add arg2, arg3, ... on demand
 
 	public FormattedLabel() {
@@ -19,11 +20,11 @@ public class FormattedLabel extends Label {
 	}
 
 	protected StringBinding createStringBinding() {
-		return Bindings.createStringBinding(this::updateText, format, arg1);
+		return Bindings.createStringBinding(this::updateText, format, arg1, arg2);
 	}
 
 	private String updateText() {
-		return String.format(format.get(), arg1.get());
+		return String.format(format.get(), arg1.get(), arg2.get());
 	}
 
 	/* Observables */
@@ -51,4 +52,16 @@ public class FormattedLabel extends Label {
 	public void setArg1(Object arg1) {
 		this.arg1.set(arg1);
 	}
+
+	public ObjectProperty<Object> arg2Property() {
+		return arg2;
+	}
+
+	public Object getArg2() {
+		return arg2.get();
+	}
+
+	public void setArg2(Object arg2) {
+		this.arg2.set(arg2);
+	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel2.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel2.java
deleted file mode 100644
index 426a6bc4f..000000000
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel2.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.cryptomator.ui.controls;
-
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.StringBinding;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-
-public class FormattedLabel2 extends FormattedLabel {
-
-	private final ObjectProperty<Object> arg2 = new SimpleObjectProperty<>();
-
-	public FormattedLabel2() {
-		textProperty().unbind();
-		textProperty().bind(createStringBinding2());
-	}
-
-	private StringBinding createStringBinding2() {
-		return Bindings.createStringBinding(this::updateText, formatProperty(), arg1Property(), arg2);
-	}
-
-	private String updateText() {
-		return String.format(getFormat(), getArg1(), arg2.get());
-	}
-
-	/* Getter & Setter */
-
-	public ObjectProperty<Object> arg2Property() {
-		return arg2;
-	}
-
-	public Object getArg2() {
-		return arg2.get();
-	}
-
-	public void setArg2(Object arg2) {
-		this.arg2.set(arg2);
-	}
-
-}
diff --git a/main/ui/src/main/resources/fxml/health_check_details.fxml b/main/ui/src/main/resources/fxml/health_check_details.fxml
index bad05cb7b..58cd0c99d 100644
--- a/main/ui/src/main/resources/fxml/health_check_details.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_details.fxml
@@ -4,7 +4,6 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FormattedLabel2?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.health.CheckDetailController"
@@ -18,7 +17,7 @@
 	<Label text="%health.check.detail.taskFailed" visible="${controller.taskFailed}" managed="${controller.taskFailed}"/>
 	<FormattedLabel styleClass="label" format="%health.check.detail.taskSucceeded" arg1="${controller.taskDuration}" visible="${controller.taskSucceeded}" managed="${controller.taskSucceeded}"/>
 
-	<FormattedLabel2 styleClass="label" format="%health.check.detail.problemCount" arg1="${controller.countOfWarnSeverity}" arg2="${controller.countOfCritSeverity}" visible="${!controller.taskNotStarted}"
+	<FormattedLabel styleClass="label" format="%health.check.detail.problemCount" arg1="${controller.countOfWarnSeverity}" arg2="${controller.countOfCritSeverity}" visible="${!controller.taskNotStarted}"
 					 managed="${!controller.taskNotStarted}"	/>
 	<ListView fx:id="resultsListView" VBox.vgrow="ALWAYS"/>
 </VBox>
\ No newline at end of file

From f85f953668cd4fabbc67a19d241b1192f65846a8 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 1 Jun 2021 15:01:23 +0200
Subject: [PATCH 66/67] Bind countOfWarnSeverity and countOfCritSeverity to
 list

---
 .../ui/health/CheckDetailController.java      | 84 ++++++-------------
 1 file changed, 25 insertions(+), 59 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
index 51278e946..d579ff709 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckDetailController.java
@@ -1,31 +1,27 @@
 package org.cryptomator.ui.health;
 
 import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.EasyObservableList;
+import com.tobiasdiez.easybind.Subscription;
 import com.tobiasdiez.easybind.optional.OptionalBinding;
 import org.cryptomator.cryptofs.health.api.DiagnosticResult;
 import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
 import javafx.beans.binding.Binding;
-import javafx.beans.property.LongProperty;
 import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleLongProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
 import javafx.concurrent.Worker;
 import javafx.fxml.FXML;
 import javafx.scene.control.ListView;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Stream;
 
 @HealthCheckScoped
 public class CheckDetailController implements FxController {
 
-	private final Map<ObservableList<DiagnosticResult>, WarnAndErrorEntry> cachedWarnAndCritCounts;
-	private final Binding<ObservableList<DiagnosticResult>> results;
+	private final EasyObservableList<DiagnosticResult> results;
 	private final OptionalBinding<Worker.State> taskState;
 	private final Binding<String> taskName;
 	private final Binding<Number> taskDuration;
@@ -37,15 +33,15 @@ public class CheckDetailController implements FxController {
 	private final Binding<Boolean> taskSucceeded;
 	private final Binding<Boolean> taskFailed;
 	private final Binding<Boolean> taskCancelled;
-	private final LongProperty countOfWarnSeverity;
-	private final LongProperty countOfCritSeverity;
+	private final Binding<Number> countOfWarnSeverity;
+	private final Binding<Number> countOfCritSeverity;
 
 	public ListView<DiagnosticResult> resultsListView;
+	private Subscription resultSubscription;
 
 	@Inject
 	public CheckDetailController(ObjectProperty<HealthCheckTask> selectedTask, ResultListCellFactory resultListCellFactory) {
-		selectedTask.addListener(this::rebindWarnAndCritProperties);
-		this.results = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::results).orElse(FXCollections.emptyObservableList());
+		this.results = EasyBind.wrapList(FXCollections.observableArrayList());
 		this.taskState = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::stateProperty);
 		this.taskName = EasyBind.wrapNullable(selectedTask).map(HealthCheckTask::getTitle).orElse("");
 		this.taskDuration = EasyBind.wrapNullable(selectedTask).mapObservable(HealthCheckTask::durationInMillisProperty).orElse(-1L);
@@ -57,46 +53,27 @@ public class CheckDetailController implements FxController {
 		this.taskFailed = taskState.map(Worker.State.FAILED::equals).orElse(false);
 		this.taskCancelled = taskState.map(Worker.State.CANCELLED::equals).orElse(false);
 		this.taskFinished = EasyBind.combine(taskSucceeded, taskFailed, taskCancelled, (a, b, c) -> a || b || c);
-		this.countOfWarnSeverity = new SimpleLongProperty(0);
-		this.countOfCritSeverity = new SimpleLongProperty(0);
-		this.cachedWarnAndCritCounts = new IdentityHashMap<>(); //important to use an identity hashmap, because collections violate the immnutable hashkey contract
+		this.countOfWarnSeverity = results.reduce(countSeverity(DiagnosticResult.Severity.WARN));
+		this.countOfCritSeverity = results.reduce(countSeverity(DiagnosticResult.Severity.CRITICAL));
+		selectedTask.addListener(this::selectedTaskChanged);
 	}
 
-	private synchronized void rebindWarnAndCritProperties(ObservableValue<? extends HealthCheckTask> observable, HealthCheckTask oldVal, HealthCheckTask newVal) {
-		//create and cache properites for the newList, if not already present
-		final var listToUpdate = newVal.results();
-		cachedWarnAndCritCounts.computeIfAbsent(listToUpdate, key -> {
-			var warnProperty = new SimpleLongProperty(countSeverityInList(listToUpdate, DiagnosticResult.Severity.WARN));
-			var errProperty = new SimpleLongProperty(countSeverityInList(listToUpdate, DiagnosticResult.Severity.CRITICAL));
-			return new WarnAndErrorEntry(warnProperty, errProperty);
-		});
-		listToUpdate.addListener(this::updateListSpecificWarnAndCritCount);
-
-		//updateBindings
-		countOfCritSeverity.bind(cachedWarnAndCritCounts.get(listToUpdate).errorCount);
-		countOfWarnSeverity.bind(cachedWarnAndCritCounts.get(listToUpdate).warningCount);
-	}
-
-	private synchronized void updateListSpecificWarnAndCritCount(ListChangeListener.Change<? extends DiagnosticResult> c) {
-		long tmpErr = cachedWarnAndCritCounts.get(c.getList()).errorCount.get();
-		long tmpWarn = cachedWarnAndCritCounts.get(c.getList()).warningCount.get();
-		while (c.next()) {
-			if (c.wasAdded()) {
-				tmpWarn += countSeverityInList(c.getAddedSubList(), DiagnosticResult.Severity.WARN);
-				tmpErr += countSeverityInList(c.getAddedSubList(), DiagnosticResult.Severity.CRITICAL);
-			}
+	private void selectedTaskChanged(ObservableValue<? extends HealthCheckTask> observable, HealthCheckTask oldValue, HealthCheckTask newValue) {
+		if (resultSubscription != null) {
+			resultSubscription.unsubscribe();
+		}
+		if (newValue != null) {
+			resultSubscription = EasyBind.bindContent(results, newValue.results());
 		}
-		cachedWarnAndCritCounts.get(c.getList()).errorCount.set(tmpErr);
-		cachedWarnAndCritCounts.get(c.getList()).warningCount.set(tmpWarn);
 	}
 
-	private long countSeverityInList(List<? extends DiagnosticResult> list, DiagnosticResult.Severity severityToCount) {
-		return list.stream().map(DiagnosticResult::getServerity).filter(severityToCount::equals).count();
+	private Function<Stream<? extends DiagnosticResult>, Long> countSeverity(DiagnosticResult.Severity severity) {
+		return stream -> stream.filter(item -> severity.equals(item.getServerity())).count();
 	}
 
 	@FXML
 	public void initialize() {
-		resultsListView.itemsProperty().bind(results);
+		resultsListView.setItems(results);
 		resultsListView.setCellFactory(resultListCellFactory);
 	}
 
@@ -119,18 +96,18 @@ public class CheckDetailController implements FxController {
 	}
 
 	public long getCountOfWarnSeverity() {
-		return countOfWarnSeverity.get();
+		return countOfWarnSeverity.getValue().longValue();
 	}
 
-	public LongProperty countOfWarnSeverityProperty() {
+	public Binding<Number> countOfWarnSeverityProperty() {
 		return countOfWarnSeverity;
 	}
 
 	public long getCountOfCritSeverity() {
-		return countOfCritSeverity.get();
+		return countOfCritSeverity.getValue().longValue();
 	}
 
-	public LongProperty countOfCritSeverityProperty() {
+	public Binding<Number> countOfCritSeverityProperty() {
 		return countOfCritSeverity;
 	}
 
@@ -190,15 +167,4 @@ public class CheckDetailController implements FxController {
 		return taskCancelled;
 	}
 
-	private static class WarnAndErrorEntry {
-
-		WarnAndErrorEntry(LongProperty warningCount, LongProperty errorCount) {
-			this.warningCount = warningCount;
-			this.errorCount = errorCount;
-		}
-
-		final LongProperty warningCount;
-		final LongProperty errorCount;
-	}
-
 }

From c868ac32cc590178bccd9c3666a279e54ed419d7 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 1 Jun 2021 17:52:31 +0200
Subject: [PATCH 67/67] Change localized text and tweak ui

---
 .../main/resources/fxml/health_check_details.fxml |  1 +
 .../resources/fxml/health_result_listcell.fxml    |  8 ++++----
 main/ui/src/main/resources/fxml/health_start.fxml | 15 ++++++++++++---
 .../ui/src/main/resources/i18n/strings.properties | 12 ++++++------
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/main/ui/src/main/resources/fxml/health_check_details.fxml b/main/ui/src/main/resources/fxml/health_check_details.fxml
index 58cd0c99d..51d9b22ae 100644
--- a/main/ui/src/main/resources/fxml/health_check_details.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_details.fxml
@@ -7,6 +7,7 @@
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.health.CheckDetailController"
+	  prefWidth="500"
 	  spacing="6">
 	<FormattedLabel fx:id="checkTitle" styleClass="label-large" format="%health.check.detail.header" arg1="${controller.taskName}"/>
 
diff --git a/main/ui/src/main/resources/fxml/health_result_listcell.fxml b/main/ui/src/main/resources/fxml/health_result_listcell.fxml
index b4bcda77a..6e30dd0ec 100644
--- a/main/ui/src/main/resources/fxml/health_result_listcell.fxml
+++ b/main/ui/src/main/resources/fxml/health_result_listcell.fxml
@@ -2,9 +2,9 @@
 
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.control.Button?>
 <?import javafx.scene.layout.Region?>
 <HBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
@@ -13,17 +13,17 @@
 	  prefWidth="200"
 	  spacing="6"
 	  alignment="CENTER_LEFT">
-	<!-- Remark Check the containing list view for a fixed cell size before editing height properties -->
+	<!-- Remark: Check the containing list view for a fixed cell size before editing height properties -->
 	<padding>
 		<Insets topRightBottomLeft="6"/>
 	</padding>
 	<children>
 		<FontAwesome5IconView fx:id="iconView" HBox.hgrow="NEVER" glyphSize="16"/>
-		<Label text="${controller.description}" wrapText="true"/>
+		<Label text="${controller.description}"/>
 		<Region HBox.hgrow="ALWAYS"/>
 		<!-- TODO: setting the minWidth of the button is just a workaround.
 		           What we actually want to do is to prevent shrinking the button more than the text
 		           -> own subclass of HBox is needed -->
-		<Button fx:id="actionButton" text="%health.check.fixBtn" onAction="#runResultAction" alignment="CENTER" visible="false" minWidth="50"/>
+		<Button fx:id="actionButton" text="%health.check.fixBtn" onAction="#runResultAction" alignment="CENTER" visible="false" minWidth="-Infinity"/>
 	</children>
 </HBox>
diff --git a/main/ui/src/main/resources/fxml/health_start.fxml b/main/ui/src/main/resources/fxml/health_start.fxml
index bf9990614..79d946884 100644
--- a/main/ui/src/main/resources/fxml/health_start.fxml
+++ b/main/ui/src/main/resources/fxml/health_start.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
@@ -18,9 +19,17 @@
 	<children>
 		<Label text="%health.start.introduction" wrapText="true"/>
 
-		<Label text="%health.start.configInvalid" visible="${controller.invalidConfig}" managed="${controller.invalidConfig}" wrapText="true"/>
-		<Label text="%health.start.configValid" visible="${!controller.invalidConfig}" managed="${!controller.invalidConfig}" wrapText="true"/>
-
+		<!-- TODO: combine the two below labels to one and bind the properties accordingly or, preferably think about a new flow -->
+		<Label text="%health.start.configInvalid" visible="${controller.invalidConfig}" managed="${controller.invalidConfig}" wrapText="true" contentDisplay="LEFT">
+			<graphic>
+				<FontAwesome5IconView glyph="TIMES" styleClass="glyph-icon-red" />
+			</graphic>
+		</Label>
+		<Label text="%health.start.configValid" visible="${!controller.invalidConfig}" managed="${!controller.invalidConfig}" wrapText="true" contentDisplay="LEFT">
+			<graphic>
+				<FontAwesome5IconView glyph="CHECK" styleClass="glyph-icon-primary" />
+			</graphic>
+		</Label>
 		<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
 			<buttons>
 				<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close"/>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 6e724adec..7ff081f5a 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -147,23 +147,23 @@ migration.impossible.reason=The vault cannot be automatically migrated because i
 migration.impossible.moreInfo=The vault can still be opened with an older version. For instructions on how to manually migrate a vault, visit
 
 # Health Check
-health.title=Vault Check
+health.title=Vault Health Check
 health.start.introduction=The Vault Health Check is a collection of checks to detect and possilby fix problems in the internal structure of your vault. Please note, that not all problems are fixable. You need the vault password to perform the checks.
 health.start.configValid=Reading and parsing vault configuration file was successful. Proceed to select checks.
 health.start.configInvalid=Error while reading and parsing the vault configuration file.
-health.checkList.header=Available Checks
+health.checkList.header=Available Health Checks
 health.checkList.selectAllBox=Select All
 health.check.runBatchBtn=Run selected Checks
 ## Detail view
-health.check.detail.noSelectedCheck=For results select a finished check in the left list.
+health.check.detail.noSelectedCheck=For results select a finished health check in the left list.
 health.check.detail.header=Results of %s
 health.check.detail.taskNotStarted=The check was not selected to run.
 health.check.detail.taskScheduled=The check is scheduled.
 health.check.detail.taskRunning=The check is currently running…
 health.check.detail.taskSucceeded=The check finished successfully after %d milliseconds.
-health.check.detail.taskFailed=The check exited with errors.
+health.check.detail.taskFailed=The check exited due to an error.
 health.check.detail.taskCancelled=The check was cancelled.
-health.check.detail.problemCount=Found %d Problems and %d unfixable Errors.
+health.check.detail.problemCount=Found %d problems and %d unfixable errors.
 health.check.exportBtn=Export Report
 health.check.fixBtn=Fix
 ## Checks
@@ -310,7 +310,7 @@ vaultOptions.general.actionAfterUnlock=After successful unlock
 vaultOptions.general.actionAfterUnlock.ignore=Do nothing
 vaultOptions.general.actionAfterUnlock.reveal=Reveal Drive
 vaultOptions.general.actionAfterUnlock.ask=Ask
-vaultOptions.general.healthBtn=Health Check
+vaultOptions.general.healthBtn=Start Health Check
 ## Mount
 vaultOptions.mount=Mounting
 vaultOptions.mount.readonly=Read-Only