From f61e95594529a7db334a06e846c63d123e1095e9 Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Thu, 4 Jun 2020 12:28:45 +0200
Subject: [PATCH 01/33] First Dummy window to show statistics

---
 .../org/cryptomator/ui/common/FxmlFile.java   |  1 +
 .../ui/mainwindow/MainWindowModule.java       |  7 +--
 .../VaultDetailUnlockedController.java        | 10 +++-
 .../VaultStatisticsComponent.java             | 38 ++++++++++++
 .../VaultStatisticsController.java            | 20 +++++++
 .../VaultStatisticsModule.java                | 58 +++++++++++++++++++
 .../VaultStatisticsScoped.java                | 13 +++++
 .../VaultStatisticsWindow.java                | 14 +++++
 .../resources/fxml/vault_detail_unlocked.fxml |  1 +
 .../main/resources/fxml/vault_statistics.fxml | 23 ++++++++
 10 files changed, 179 insertions(+), 6 deletions(-)
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsComponent.java
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsScoped.java
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsWindow.java
 create mode 100644 main/ui/src/main/resources/fxml/vault_statistics.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 262af2283..3a3b47d1b 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
@@ -28,6 +28,7 @@ public enum FxmlFile {
 	UNLOCK_INVALID_MOUNT_POINT("/fxml/unlock_invalid_mount_point.fxml"), //
 	UNLOCK_SUCCESS("/fxml/unlock_success.fxml"), //
 	VAULT_OPTIONS("/fxml/vault_options.fxml"), //
+	VAULT_STATISTICS("/fxml/vault_statistics.fxml"), //
 	WRONGFILEALERT("/fxml/wrongfilealert.fxml");
 
 	private final String ressourcePathString;
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 a34273f84..eca71c38e 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
@@ -7,7 +7,6 @@ import dagger.multibindings.IntoMap;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.Scene;
-import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import org.cryptomator.common.vaults.Vault;
@@ -18,19 +17,17 @@ 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.fxapp.FxApplicationScoped;
 import org.cryptomator.ui.migration.MigrationComponent;
 import org.cryptomator.ui.removevault.RemoveVaultComponent;
 import org.cryptomator.ui.vaultoptions.VaultOptionsComponent;
+import org.cryptomator.ui.vaultstatistics.VaultStatisticsComponent;
 import org.cryptomator.ui.wrongfilealert.WrongFileAlertComponent;
 
-import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
 
-@Module(subcomponents = {AddVaultWizardComponent.class, MigrationComponent.class, RemoveVaultComponent.class, VaultOptionsComponent.class, WrongFileAlertComponent.class})
+@Module(subcomponents = {AddVaultWizardComponent.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/VaultDetailUnlockedController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
index 32f9bc9b0..e42b902e7 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
@@ -6,6 +6,7 @@ import javafx.fxml.FXML;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.VaultService;
+import org.cryptomator.ui.vaultstatistics.VaultStatisticsComponent;
 
 import javax.inject.Inject;
 
@@ -14,11 +15,13 @@ public class VaultDetailUnlockedController implements FxController {
 
 	private final ReadOnlyObjectProperty<Vault> vault;
 	private final VaultService vaultService;
+	private final VaultStatisticsComponent.Builder vaultStatisticsWindow;
 
 	@Inject
-	public VaultDetailUnlockedController(ObjectProperty<Vault> vault, VaultService vaultService) {
+	public VaultDetailUnlockedController(ObjectProperty<Vault> vault, VaultService vaultService, VaultStatisticsComponent.Builder vaultStatisticsWindow) {
 		this.vault = vault;
 		this.vaultService = vaultService;
+		this.vaultStatisticsWindow = vaultStatisticsWindow;
 	}
 
 	@FXML
@@ -32,6 +35,11 @@ public class VaultDetailUnlockedController implements FxController {
 		// TODO count lock attempts, and allow forced lock
 	}
 
+	@FXML
+	public void showVaultStatistics() {
+		vaultStatisticsWindow.vault(vault.get()).build().showVaultStatisticsWindow();
+	}
+
 	/* Getter/Setter */
 
 	public ReadOnlyObjectProperty<Vault> vaultProperty() {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsComponent.java b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsComponent.java
new file mode 100644
index 000000000..915f936f9
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsComponent.java
@@ -0,0 +1,38 @@
+package org.cryptomator.ui.vaultstatistics;
+
+import dagger.BindsInstance;
+import dagger.Lazy;
+import dagger.Subcomponent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
+
+@VaultStatisticsScoped
+@Subcomponent(modules = {VaultStatisticsModule.class})
+public interface VaultStatisticsComponent {
+
+	@VaultStatisticsWindow
+	Stage window();
+
+	@FxmlScene(FxmlFile.VAULT_STATISTICS)
+	Lazy<Scene> scene();
+
+	default void showVaultStatisticsWindow() {
+		Stage stage = window();
+		stage.setScene(scene().get());
+		stage.sizeToScene();
+		stage.show();
+	}
+
+	@Subcomponent.Builder
+	interface Builder {
+
+		@BindsInstance
+		Builder vault(@VaultStatisticsWindow Vault vault);
+
+		VaultStatisticsComponent build();
+	}
+
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
new file mode 100644
index 000000000..30292f4c7
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
@@ -0,0 +1,20 @@
+package org.cryptomator.ui.vaultstatistics;
+
+import javafx.stage.Stage;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.FxController;
+
+import javax.inject.Inject;
+
+@VaultStatisticsScoped
+public class VaultStatisticsController implements FxController {
+
+	private final Stage window;
+	private final Vault vault;
+
+	@Inject
+	public VaultStatisticsController(@VaultStatisticsWindow Stage window, @VaultStatisticsWindow Vault vault) {
+		this.window = window;
+		this.vault = vault;
+	}
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java
new file mode 100644
index 000000000..a129c0eb7
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java
@@ -0,0 +1,58 @@
+package org.cryptomator.ui.vaultstatistics;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.Provides;
+import dagger.multibindings.IntoMap;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+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.FxmlScene;
+import org.cryptomator.ui.common.StageFactory;
+import org.cryptomator.ui.mainwindow.MainWindow;
+
+import javax.inject.Provider;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+@Module
+abstract class VaultStatisticsModule {
+
+	@Provides
+	@VaultStatisticsWindow
+	@VaultStatisticsScoped
+	static FXMLLoaderFactory provideFxmlLoaderFactory(Map<Class<? extends FxController>, Provider<FxController>> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) {
+		return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle);
+	}
+
+	@Provides
+	@VaultStatisticsWindow
+	@VaultStatisticsScoped
+	static Stage provideStage(StageFactory factory, @MainWindow Stage owner, ResourceBundle resourceBundle) {
+		Stage stage = factory.create();
+		stage.setTitle(resourceBundle.getString("removeVault.title"));
+		stage.setResizable(false);
+		stage.initModality(Modality.APPLICATION_MODAL);
+		stage.initOwner(owner);
+		return stage;
+	}
+
+	@Provides
+	@FxmlScene(FxmlFile.VAULT_STATISTICS)
+	@VaultStatisticsScoped
+	static Scene provideVaultStatisticsScene(@VaultStatisticsWindow FXMLLoaderFactory fxmlLoaders) {
+		return fxmlLoaders.createScene("/fxml/vault_statistics.fxml");
+	}
+
+	// ------------------
+
+	@Binds
+	@IntoMap
+	@FxControllerKey(VaultStatisticsController.class)
+	abstract FxController bindVaultStatisticsController(VaultStatisticsController controller);
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsScoped.java b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsScoped.java
new file mode 100644
index 000000000..842e7e508
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsScoped.java
@@ -0,0 +1,13 @@
+package org.cryptomator.ui.vaultstatistics;
+
+import javax.inject.Scope;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Scope
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+public @interface VaultStatisticsScoped {
+
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsWindow.java b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsWindow.java
new file mode 100644
index 000000000..4fe9174a1
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsWindow.java
@@ -0,0 +1,14 @@
+package org.cryptomator.ui.vaultstatistics;
+
+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 VaultStatisticsWindow {
+
+}
diff --git a/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml b/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
index 492c0336b..d7db563fa 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
@@ -45,4 +45,5 @@
 		<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
 						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.vault.stats.bytesPerSecondWritten}"/>
 	</HBox>
+	<Button styleClass="button-large" text="View statistics string" minWidth="120" onAction="#showVaultStatistics"/>
 </VBox>
\ No newline at end of file
diff --git a/main/ui/src/main/resources/fxml/vault_statistics.fxml b/main/ui/src/main/resources/fxml/vault_statistics.fxml
new file mode 100644
index 000000000..4d5edfde6
--- /dev/null
+++ b/main/ui/src/main/resources/fxml/vault_statistics.fxml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import org.cryptomator.ui.controls.ThrougputLabel?>
+<VBox xmlns="http://javafx.com/javafx"
+	  xmlns:fx="http://javafx.com/fxml"
+	  fx:controller="org.cryptomator.ui.vaultstatistics.VaultStatisticsController"
+	  prefHeight="400.0" prefWidth="600.0">
+
+
+	<HBox alignment="CENTER_RIGHT" spacing="6">
+		<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondRead"/>
+		<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
+						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.vault.stats.bytesPerSecondRead}"/>
+	</HBox>
+	<HBox alignment="CENTER_RIGHT" spacing="6">
+		<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondWritten"/>
+		<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
+						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.vault.stats.bytesPerSecondWritten}"/>
+	</HBox>
+</VBox>

From 05154cf6aa2e0a930a5b97f99da2004977dbcd69 Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Wed, 10 Jun 2020 11:55:08 +0200
Subject: [PATCH 02/33] Added Graph to statistics window

---
 .../VaultStatisticsController.java            | 55 ++++++++++++++++++-
 .../VaultStatisticsModule.java                |  4 +-
 .../ui/src/main/resources/css/light_theme.css | 34 ++++++++++++
 .../main/resources/fxml/vault_statistics.fxml | 18 ++++++
 .../main/resources/i18n/strings.properties    |  6 ++
 5 files changed, 113 insertions(+), 4 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
index 30292f4c7..fcf941590 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
@@ -1,5 +1,12 @@
 package org.cryptomator.ui.vaultstatistics;
 
+import javafx.beans.property.LongProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.SimpleLongProperty;
+import javafx.fxml.FXML;
+import javafx.scene.chart.LineChart;
+import javafx.scene.chart.XYChart;
 import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
@@ -10,11 +17,55 @@ import javax.inject.Inject;
 public class VaultStatisticsController implements FxController {
 
 	private final Stage window;
-	private final Vault vault;
+	private final ReadOnlyObjectProperty<Vault> vault;
+	@FXML
+	private LineChart<Double, Double> lineGraph;
+	private final LongProperty currentReadData;
+	private final LongProperty currentWriteData;
+	private final XYChart.Series<Double, Double> readData;
+	private final XYChart.Series<Double, Double> writeData;
+	private long timeAtStartOfTracking;
 
 	@Inject
-	public VaultStatisticsController(@VaultStatisticsWindow Stage window, @VaultStatisticsWindow Vault vault) {
+	public VaultStatisticsController(@VaultStatisticsWindow Stage window, ObjectProperty<Vault> vault) {
 		this.window = window;
 		this.vault = vault;
+
+		readData = new XYChart.Series<>();
+		readData.setName("Read Data"); // For Legend
+		//TODO Add Name to strings.properties
+		writeData = new XYChart.Series<>();
+		writeData.setName("Write Data");
+		//TODO Add Name to strings.properties
+
+
+		currentReadData = new SimpleLongProperty();
+		currentReadData.bind(getVault().getStats().bytesPerSecondReadProperty());
+		currentReadData.addListener((observable, oldValue, newValue) -> updateReadWriteData());
+
+		currentWriteData = new SimpleLongProperty();
+		currentWriteData.bind(getVault().getStats().bytesPerSecondWrittenProperty());
+		currentWriteData.addListener((observable, oldValue, newValue) -> updateReadWriteData());
+	}
+
+	@FXML
+	public void initialize() {
+		window.setTitle(window.getTitle() + " - " + vault.get().getDisplayableName());
+	}
+
+	public Vault getVault() {
+		return vault.get();
+	}
+
+	private void updateReadWriteData() {
+		//So the graphs start at x = 0
+		if (timeAtStartOfTracking == 0) {
+			timeAtStartOfTracking = System.currentTimeMillis();
+		}
+		readData.getData().add(new XYChart.Data<Double, Double>((System.currentTimeMillis() - timeAtStartOfTracking) / 1000.0, ((getVault().getStats().bytesPerSecondReadProperty().get()) / 1024.0)));
+		writeData.getData().add(new XYChart.Data<Double, Double>((System.currentTimeMillis() - timeAtStartOfTracking) / 1000.0, ((getVault().getStats().bytesPerSecondWrittenProperty().get()) / 1024.0)));
+		lineGraph.getData().addAll(writeData, readData);
+		//TODO
+		//Exception in thread "JavaFX Application Thread" java.lang.IllegalArgumentException: Duplicate series added
 	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java
index a129c0eb7..81a9724f6 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java
@@ -35,9 +35,9 @@ abstract class VaultStatisticsModule {
 	@VaultStatisticsScoped
 	static Stage provideStage(StageFactory factory, @MainWindow Stage owner, ResourceBundle resourceBundle) {
 		Stage stage = factory.create();
-		stage.setTitle(resourceBundle.getString("removeVault.title"));
+		stage.setTitle(resourceBundle.getString("vaultstatistics.title"));
 		stage.setResizable(false);
-		stage.initModality(Modality.APPLICATION_MODAL);
+		stage.initModality(Modality.NONE);
 		stage.initOwner(owner);
 		return stage;
 	}
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index 42f93bfbf..f87d2338b 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -868,3 +868,37 @@
 	-fx-background-color: PROGRESS_BAR_BG;
 	-fx-background-radius: 4px;
 }
+/*******************************************************************************
+ *                                                                             *
+ * Vault Statistics                                                                *
+ *                                                                             *
+ ******************************************************************************/
+.chart-plot-background {
+	-fx-background-color: #F7F7F7;
+}
+.chart-vertical-grid-lines {
+	-fx-stroke: #49B04A;
+}
+.chart-horizontal-grid-lines {
+	-fx-stroke: #49B04A;
+}
+.chart-alternative-row-fill {
+	-fx-fill: #E1E1E1;
+	-fx-stroke: transparent;
+	-fx-stroke-width: 0;
+}
+.default-color0.chart-series-line { -fx-stroke: #2D4D2E; }
+.default-color1.chart-series-line { -fx-stroke: #66CC68 ; }
+
+.chart-legend {
+	-fx-background-color:  transparent;
+	-fx-padding: 20px;
+}
+
+.chart-legend-item-symbol{
+	-fx-background-radius: 0;
+}
+
+.chart-legend-item{
+	-fx-text-fill: #191970;
+}
diff --git a/main/ui/src/main/resources/fxml/vault_statistics.fxml b/main/ui/src/main/resources/fxml/vault_statistics.fxml
index 4d5edfde6..b4891eec8 100644
--- a/main/ui/src/main/resources/fxml/vault_statistics.fxml
+++ b/main/ui/src/main/resources/fxml/vault_statistics.fxml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.chart.LineChart?>
+<?import javafx.scene.chart.NumberAxis?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.Cursor?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import org.cryptomator.ui.controls.ThrougputLabel?>
@@ -20,4 +23,19 @@
 		<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
 						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.vault.stats.bytesPerSecondWritten}"/>
 	</HBox>
+
+	<LineChart
+			styleClass="chart-plot-background, chart-vertical-grid-lines, chart-horizontal-grid-lines, chart-alternative-row-fill, default-color0.chart-series-line, default-color1.chart-series-line, default-color2.chart-series-line, chart-legend, chart-legend-item-symbol, chart-legend-item"
+			fx:id="lineGraph" createSymbols="true" legendVisible="true" prefHeight="372.0" prefWidth="423.0" visible="true" animated="false" horizontalGridLinesVisible="true" verticalGridLinesVisible="true"
+			title="%vaultstatistics.throughputTitle">
+		<xAxis>
+			<NumberAxis autoRanging="true" lowerBound="0" side="BOTTOM" tickUnit="1" upperBound="10" label="%vaultstatistics.xAxisTimeLabel"/>
+		</xAxis>
+		<yAxis>
+			<NumberAxis autoRanging="true" lowerBound="0" side="LEFT" tickUnit="1024" upperBound="100" label="%vaultstatistics.yAxisTimeLabel"/>
+		</yAxis>
+		<cursor>
+			<Cursor fx:constant="DEFAULT"/>
+		</cursor>
+	</LineChart>
 </VBox>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 416971ef2..133b99c23 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -160,6 +160,12 @@ preferences.donationKey.getDonationKey=Get a donation key
 ## About
 preferences.about=About
 
+# Vault Statistics
+vaultstatistics.title=Vault Statistics
+vaultstatistics.xAxisTimeLabel=Seconds
+vaultstatistics.yAxisTimeLabel=Throughput in KiB
+vaultstatistics.throughputTitle=Read and Writes
+
 # Main Window
 main.closeBtn.tooltip=Close
 main.minimizeBtn.tooltip=Minimize

From 5180f2061a4f162e0b3633674a4dcf747b46ea47 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 10 Jun 2020 13:58:02 +0200
Subject: [PATCH 03/33] add series only once (in scene initialization instead
 of on every tick) - thus fixing IAE

---
 .../ui/vaultstatistics/VaultStatisticsController.java         | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
index fcf941590..39060b6e3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
@@ -51,6 +51,7 @@ public class VaultStatisticsController implements FxController {
 	@FXML
 	public void initialize() {
 		window.setTitle(window.getTitle() + " - " + vault.get().getDisplayableName());
+		lineGraph.getData().addAll(writeData, readData);
 	}
 
 	public Vault getVault() {
@@ -64,8 +65,5 @@ public class VaultStatisticsController implements FxController {
 		}
 		readData.getData().add(new XYChart.Data<Double, Double>((System.currentTimeMillis() - timeAtStartOfTracking) / 1000.0, ((getVault().getStats().bytesPerSecondReadProperty().get()) / 1024.0)));
 		writeData.getData().add(new XYChart.Data<Double, Double>((System.currentTimeMillis() - timeAtStartOfTracking) / 1000.0, ((getVault().getStats().bytesPerSecondWrittenProperty().get()) / 1024.0)));
-		lineGraph.getData().addAll(writeData, readData);
-		//TODO
-		//Exception in thread "JavaFX Application Thread" java.lang.IllegalArgumentException: Duplicate series added
 	}
 }

From 55e9cabf5127e8ec97d674e9355abeb73b37604e Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Tue, 16 Jun 2020 14:13:17 +0200
Subject: [PATCH 04/33] Updated Graph to use Timeline + minor UI changes +
 wording

---
 .../VaultStatisticsController.java            | 104 ++++++++++++------
 .../VaultStatisticsModule.java                |  21 +++-
 main/ui/src/main/resources/css/dark_theme.css |  53 +++++++++
 .../ui/src/main/resources/css/light_theme.css |  39 +++++--
 .../main/resources/fxml/vault_statistics.fxml |   9 +-
 .../main/resources/i18n/strings.properties    |   4 +-
 6 files changed, 172 insertions(+), 58 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
index 39060b6e3..b23df4939 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
@@ -1,13 +1,16 @@
 package org.cryptomator.ui.vaultstatistics;
 
-import javafx.beans.property.LongProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.beans.property.SimpleLongProperty;
+import javafx.animation.Animation;
+import javafx.animation.KeyFrame;
+import javafx.animation.Timeline;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.chart.LineChart;
-import javafx.scene.chart.XYChart;
+import javafx.scene.chart.XYChart.Data;
+import javafx.scene.chart.XYChart.Series;
 import javafx.stage.Stage;
+import javafx.util.Duration;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 
@@ -16,54 +19,85 @@ import javax.inject.Inject;
 @VaultStatisticsScoped
 public class VaultStatisticsController implements FxController {
 
+	private static final int IO_SAMPLING_STEPS = 100;
+	private static final double IO_SAMPLING_INTERVAL = 0.5;
+
 	private final Stage window;
-	private final ReadOnlyObjectProperty<Vault> vault;
+	private final Vault vault;
 	@FXML
-	private LineChart<Double, Double> lineGraph;
-	private final LongProperty currentReadData;
-	private final LongProperty currentWriteData;
-	private final XYChart.Series<Double, Double> readData;
-	private final XYChart.Series<Double, Double> writeData;
-	private long timeAtStartOfTracking;
+	private LineChart<Number, Number> lineGraph;
+	private final Series<Number, Number> readData;
+	private final Series<Number, Number> writeData;
+	private Timeline ioAnimation;
+
 
 	@Inject
-	public VaultStatisticsController(@VaultStatisticsWindow Stage window, ObjectProperty<Vault> vault) {
+	public VaultStatisticsController(@VaultStatisticsWindow Stage window, @VaultStatisticsWindow Vault vault) {
 		this.window = window;
 		this.vault = vault;
 
-		readData = new XYChart.Series<>();
+		readData = new Series<>();
 		readData.setName("Read Data"); // For Legend
 		//TODO Add Name to strings.properties
-		writeData = new XYChart.Series<>();
+		writeData = new Series<>();
 		writeData.setName("Write Data");
 		//TODO Add Name to strings.properties
 
-
-		currentReadData = new SimpleLongProperty();
-		currentReadData.bind(getVault().getStats().bytesPerSecondReadProperty());
-		currentReadData.addListener((observable, oldValue, newValue) -> updateReadWriteData());
-
-		currentWriteData = new SimpleLongProperty();
-		currentWriteData.bind(getVault().getStats().bytesPerSecondWrittenProperty());
-		currentWriteData.addListener((observable, oldValue, newValue) -> updateReadWriteData());
+		ioAnimation = new Timeline(); //TODO Research better timer
+		ioAnimation.getKeyFrames().add(new KeyFrame(Duration.seconds(IO_SAMPLING_INTERVAL), new IoSamplingAnimationHandler(readData, writeData)));
+		ioAnimation.setCycleCount(Animation.INDEFINITE);
+		ioAnimation.play();
 	}
 
 	@FXML
 	public void initialize() {
-		window.setTitle(window.getTitle() + " - " + vault.get().getDisplayableName());
-		lineGraph.getData().addAll(writeData, readData);
+		lineGraph.getData().addAll(readData, writeData);
+	}
+
+	private class IoSamplingAnimationHandler implements EventHandler<ActionEvent> {
+
+		private static final double BYTES_TO_MEGABYTES_FACTOR = 1.0 / IO_SAMPLING_INTERVAL / 1024.0 / 1024.0;
+		private final Series<Number, Number> decryptedBytesRead;
+		private final Series<Number, Number> encryptedBytesWrite;
+
+		public IoSamplingAnimationHandler(Series<Number, Number> readData, Series<Number, Number> writeData) {
+			this.decryptedBytesRead = readData;
+			this.encryptedBytesWrite = writeData;
+
+			// initialize data once and change value of datapoints later:
+			for (int i = 0; i < IO_SAMPLING_STEPS; i++) {
+				decryptedBytesRead.getData().add(new Data<>(i, 0));
+				encryptedBytesWrite.getData().add(new Data<>(i, 0));
+			}
+		}
+
+		@Override
+		public void handle(ActionEvent event) {
+			// move all values one step:
+			for (int i = 0; i < IO_SAMPLING_STEPS - 1; i++) {
+				int j = i + 1;
+				Number tmp = decryptedBytesRead.getData().get(j).getYValue();
+				decryptedBytesRead.getData().get(i).setYValue(tmp);
+
+				tmp = encryptedBytesWrite.getData().get(j).getYValue();
+				encryptedBytesWrite.getData().get(i).setYValue(tmp);
+			}
+
+			// add latest value:
+			final long decBytes = vault.getStats().bytesPerSecondReadProperty().get();
+			final double decMb = decBytes * BYTES_TO_MEGABYTES_FACTOR;
+			final long encBytes = vault.getStats().bytesPerSecondWrittenProperty().get();
+			final double encMb = encBytes * BYTES_TO_MEGABYTES_FACTOR;
+			decryptedBytesRead.getData().get(IO_SAMPLING_STEPS - 1).setYValue(decMb);
+			encryptedBytesWrite.getData().get(IO_SAMPLING_STEPS - 1).setYValue(encMb);
+		}
 	}
 
 	public Vault getVault() {
-		return vault.get();
-	}
-
-	private void updateReadWriteData() {
-		//So the graphs start at x = 0
-		if (timeAtStartOfTracking == 0) {
-			timeAtStartOfTracking = System.currentTimeMillis();
-		}
-		readData.getData().add(new XYChart.Data<Double, Double>((System.currentTimeMillis() - timeAtStartOfTracking) / 1000.0, ((getVault().getStats().bytesPerSecondReadProperty().get()) / 1024.0)));
-		writeData.getData().add(new XYChart.Data<Double, Double>((System.currentTimeMillis() - timeAtStartOfTracking) / 1000.0, ((getVault().getStats().bytesPerSecondWrittenProperty().get()) / 1024.0)));
+		return vault;
 	}
+	/*
+	public ReadOnlyObjectProperty<Vault> vaultProperty() {
+		return vault;
+	}*/
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java
index 81a9724f6..0485c17d9 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java
@@ -4,9 +4,12 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.scene.Scene;
-import javafx.stage.Modality;
 import javafx.stage.Stage;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
 import org.cryptomator.ui.common.FxController;
@@ -14,7 +17,6 @@ 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.mainwindow.MainWindow;
 
 import javax.inject.Provider;
 import java.util.Map;
@@ -33,12 +35,19 @@ abstract class VaultStatisticsModule {
 	@Provides
 	@VaultStatisticsWindow
 	@VaultStatisticsScoped
-	static Stage provideStage(StageFactory factory, @MainWindow Stage owner, ResourceBundle resourceBundle) {
+	static Stage provideStage(StageFactory factory, ResourceBundle resourceBundle, @VaultStatisticsWindow Vault vault) {
 		Stage stage = factory.create();
-		stage.setTitle(resourceBundle.getString("vaultstatistics.title"));
+		stage.setTitle(String.format(resourceBundle.getString("vaultstatistics.title"), vault.getDisplayableName()));
 		stage.setResizable(false);
-		stage.initModality(Modality.NONE);
-		stage.initOwner(owner);
+		vault.stateProperty().addListener(new ChangeListener<>() {
+			@Override
+			public void changed(ObservableValue<? extends VaultState> observable, VaultState oldValue, VaultState newValue) {
+				if (newValue != VaultState.UNLOCKED) {
+					stage.hide();
+					observable.removeListener(this);
+				}
+			}
+		});
 		return stage;
 	}
 
diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index 6f8022beb..52cf13aaa 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -869,3 +869,56 @@
 	-fx-background-color: PROGRESS_BAR_BG;
 	-fx-background-radius: 4px;
 }
+/*******************************************************************************
+ *                                                                             *
+ * I/O Statistics                                                              *
+ *                                                                             *
+ ******************************************************************************/
+.chart {
+	-fx-padding: 10px;
+}
+
+.chart-plot-background {
+	-fx-background-color: MAIN_BG;
+	-fx-padding: 20px;
+}
+/*
+.default-color0.chart-line-symbol { -fx-background-color: #00FFFF; }
+.default-color1.chart-line-symbol { -fx-background-color: #00FF00; }
+*/
+/* content */
+
+.chart-content {
+	-fx-padding: 10px;
+}
+.chart-horizontal-grid-lines {
+	-fx-stroke: #FFFFFF;
+}
+.chart-vertical-zero-line,
+.chart-horizontal-zero-line {
+	-fx-stroke: #FFFFFF;
+}
+.chart-series-line {
+	-fx-stroke-width: 2px;
+}
+.chart-alternative-row-fill {
+	-fx-fill: #E1E1E1;
+	-fx-stroke: transparent;
+	-fx-stroke-width: 0;
+}
+
+.default-color0.chart-series-line { -fx-stroke: #FF0000; }
+.default-color1.chart-series-line { -fx-stroke: #00FF00 ; }
+
+.chart-legend {
+	-fx-background-color:  transparent;
+	-fx-padding: 20px;
+}
+
+.chart-legend-item-symbol{
+	-fx-background-radius: 10;
+}
+
+.chart-legend-item{
+	-fx-text-fill: #FFFFFF;
+}
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index f87d2338b..3ba377a95 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -870,25 +870,44 @@
 }
 /*******************************************************************************
  *                                                                             *
- * Vault Statistics                                                                *
+ * I/O Statistics                                                              *
  *                                                                             *
  ******************************************************************************/
-.chart-plot-background {
-	-fx-background-color: #F7F7F7;
+.chart {
+	-fx-padding: 10px;
 }
-.chart-vertical-grid-lines {
-	-fx-stroke: #49B04A;
+
+.chart-plot-background {
+	-fx-background-color: MAIN_BG;
+	-fx-padding: 20px;
+}
+/*
+.default-color0.chart-line-symbol { -fx-background-color: #00FFFF; }
+.default-color1.chart-line-symbol { -fx-background-color: #00FF00; }
+*/
+/* content */
+
+.chart-content {
+	-fx-padding: 10px;
 }
 .chart-horizontal-grid-lines {
-	-fx-stroke: #49B04A;
+	-fx-stroke: #000000;
+}
+.chart-vertical-zero-line,
+.chart-horizontal-zero-line {
+	-fx-stroke: #000000;
+}
+.chart-series-line {
+	-fx-stroke-width: 2px;
 }
 .chart-alternative-row-fill {
 	-fx-fill: #E1E1E1;
 	-fx-stroke: transparent;
 	-fx-stroke-width: 0;
 }
-.default-color0.chart-series-line { -fx-stroke: #2D4D2E; }
-.default-color1.chart-series-line { -fx-stroke: #66CC68 ; }
+
+.default-color0.chart-series-line { -fx-stroke: #FF0000; }
+.default-color1.chart-series-line { -fx-stroke: #00FF00 ; }
 
 .chart-legend {
 	-fx-background-color:  transparent;
@@ -896,9 +915,9 @@
 }
 
 .chart-legend-item-symbol{
-	-fx-background-radius: 0;
+	-fx-background-radius: 10;
 }
 
 .chart-legend-item{
-	-fx-text-fill: #191970;
+	-fx-text-fill: #000000;
 }
diff --git a/main/ui/src/main/resources/fxml/vault_statistics.fxml b/main/ui/src/main/resources/fxml/vault_statistics.fxml
index b4891eec8..36f0098ce 100644
--- a/main/ui/src/main/resources/fxml/vault_statistics.fxml
+++ b/main/ui/src/main/resources/fxml/vault_statistics.fxml
@@ -25,14 +25,13 @@
 	</HBox>
 
 	<LineChart
-			styleClass="chart-plot-background, chart-vertical-grid-lines, chart-horizontal-grid-lines, chart-alternative-row-fill, default-color0.chart-series-line, default-color1.chart-series-line, default-color2.chart-series-line, chart-legend, chart-legend-item-symbol, chart-legend-item"
-			fx:id="lineGraph" createSymbols="true" legendVisible="true" prefHeight="372.0" prefWidth="423.0" visible="true" animated="false" horizontalGridLinesVisible="true" verticalGridLinesVisible="true"
-			title="%vaultstatistics.throughputTitle">
+			styleClass="chart-plot-background, chart-alternative-row-fill, default-color2.chart-series-line"
+			fx:id="lineGraph" createSymbols="true" legendVisible="true" prefHeight="372.0" prefWidth="423.0" visible="true" animated="false" title="%vaultstatistics.throughputTitle" verticalZeroLineVisible="true" verticalGridLinesVisible="false" horizontalGridLinesVisible="true">
 		<xAxis>
-			<NumberAxis autoRanging="true" lowerBound="0" side="BOTTOM" tickUnit="1" upperBound="10" label="%vaultstatistics.xAxisTimeLabel"/>
+			<NumberAxis autoRanging="false" lowerBound="0" side="BOTTOM" tickUnit="5" upperBound="100" label="%vaultstatistics.xAxisTimeLabel"/>
 		</xAxis>
 		<yAxis>
-			<NumberAxis autoRanging="true" lowerBound="0" side="LEFT" tickUnit="1024" upperBound="100" label="%vaultstatistics.yAxisTimeLabel"/>
+			<NumberAxis autoRanging="true" lowerBound="0" side="LEFT" tickUnit="1024" upperBound="100" label="%vaultstatistics.yAxisThroughputLabel" forceZeroInRange="true"/>
 		</yAxis>
 		<cursor>
 			<Cursor fx:constant="DEFAULT"/>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 133b99c23..9c26942c6 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -161,9 +161,9 @@ preferences.donationKey.getDonationKey=Get a donation key
 preferences.about=About
 
 # Vault Statistics
-vaultstatistics.title=Vault Statistics
+vaultstatistics.title=Statistics for %s
 vaultstatistics.xAxisTimeLabel=Seconds
-vaultstatistics.yAxisTimeLabel=Throughput in KiB
+vaultstatistics.yAxisThroughputLabel=Throughput in KiB/s
 vaultstatistics.throughputTitle=Read and Writes
 
 # Main Window

From 1846c5c14ce84cd3926e418dc71e4c02cdb61b59 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 16 Jun 2020 15:05:24 +0200
Subject: [PATCH 05/33] formatting

---
 .../org/cryptomator/ui/controls/ThrougputLabel.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/ThrougputLabel.java b/main/ui/src/main/java/org/cryptomator/ui/controls/ThrougputLabel.java
index b07cf9b6f..a21e6d916 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/ThrougputLabel.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/ThrougputLabel.java
@@ -10,8 +10,8 @@ import javafx.scene.control.Label;
 
 public class ThrougputLabel extends Label {
 
-	private static final long kibsThreshold = 1l << 7; // 0.128 kiB/s
-	private static final long mibsThreshold = 1l << 19; // 0.512 MiB/s
+	private static final long KIBS_THRESHOLD = 1l << 7; // 0.128 kiB/s
+	private static final long MIBS_THRESHOLD = 1l << 19; // 0.512 MiB/s
 
 	private final StringProperty idleFormat = new SimpleStringProperty("-");
 	private final StringProperty kibsFormat = new SimpleStringProperty("%.3f");
@@ -22,18 +22,17 @@ public class ThrougputLabel extends Label {
 		textProperty().bind(createStringBinding());
 	}
 
-
 	protected StringBinding createStringBinding() {
 		return Bindings.createStringBinding(this::updateText, kibsFormat, mibsFormat, bytesPerSecond);
 	}
 
 	private String updateText() {
 		long bps = bytesPerSecond.get();
-		if (bps > mibsThreshold) {
-			double mibs = ((double) bytesPerSecond.get()) / 1024.0 / 1024.0;
+		if (bps > MIBS_THRESHOLD) {
+			double mibs = ((double) bps) / 1024.0 / 1024.0;
 			return String.format(mibsFormat.get(), mibs);
-		} else if (bps > kibsThreshold) {
-			double kibs = ((double) bytesPerSecond.get()) / 1024.0;
+		} else if (bps > KIBS_THRESHOLD) {
+			double kibs = ((double) bps) / 1024.0;
 			return String.format(kibsFormat.get(), kibs);
 		} else {
 			return String.format(idleFormat.get(), bps);

From d00d9d98dc008ea3d93813620408dbb67c0f7e2f Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 16 Jun 2020 15:35:12 +0200
Subject: [PATCH 06/33] make sure to release all strong referenced to the I/O
 chart when closing the window

---
 .../cryptomator/ui/common/WeakBindings.java   | 21 +++++++
 .../VaultStatisticsController.java            | 56 +++++++++++++------
 .../VaultStatisticsModule.java                |  7 ++-
 .../main/resources/fxml/vault_statistics.fxml |  4 +-
 4 files changed, 67 insertions(+), 21 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/WeakBindings.java b/main/ui/src/main/java/org/cryptomator/ui/common/WeakBindings.java
index c02eb1d86..70111dd38 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/WeakBindings.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/WeakBindings.java
@@ -1,7 +1,9 @@
 package org.cryptomator.ui.common;
 
+import javafx.beans.binding.LongBinding;
 import javafx.beans.binding.StringBinding;
 import javafx.beans.value.ObservableObjectValue;
+import javafx.beans.value.ObservableValue;
 
 
 /**
@@ -29,4 +31,23 @@ public final class WeakBindings {
 		};
 	}
 
+	/**
+	 * Create a new LongBinding that listens to changes from the given observable without being strongly referenced by it.
+	 *
+	 * @param observable The observable
+	 * @return a LongBinding weakly referenced from the given observable
+	 */
+	public static LongBinding bindLong(ObservableValue<Number> observable) {
+		return new LongBinding() {
+			{
+				bind(observable);
+			}
+
+			@Override
+			protected long computeValue() {
+				return observable.getValue().longValue();
+			}
+		};
+	}
+
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
index b23df4939..d76156b42 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
@@ -3,6 +3,7 @@ package org.cryptomator.ui.vaultstatistics;
 import javafx.animation.Animation;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
+import javafx.beans.binding.LongBinding;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
@@ -12,7 +13,9 @@ import javafx.scene.chart.XYChart.Series;
 import javafx.stage.Stage;
 import javafx.util.Duration;
 import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.common.vaults.VaultStats;
 import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.WeakBindings;
 
 import javax.inject.Inject;
 
@@ -22,31 +25,38 @@ public class VaultStatisticsController implements FxController {
 	private static final int IO_SAMPLING_STEPS = 100;
 	private static final double IO_SAMPLING_INTERVAL = 0.5;
 
-	private final Stage window;
-	private final Vault vault;
-	@FXML
-	private LineChart<Number, Number> lineGraph;
+	private final VaultStats stats;
 	private final Series<Number, Number> readData;
 	private final Series<Number, Number> writeData;
-	private Timeline ioAnimation;
+	private final Timeline ioAnimation;
+	private final LongBinding bpsRead;
+	private final LongBinding bpsWritten;
 
+	public LineChart<Number, Number> lineGraph;
 
 	@Inject
 	public VaultStatisticsController(@VaultStatisticsWindow Stage window, @VaultStatisticsWindow Vault vault) {
-		this.window = window;
-		this.vault = vault;
+		this.stats = vault.getStats();
+		this.bpsRead = WeakBindings.bindLong(stats.bytesPerSecondReadProperty());
+		this.bpsWritten = WeakBindings.bindLong(stats.bytesPerSecondWrittenProperty());
 
-		readData = new Series<>();
+		this.readData = new Series<>();
 		readData.setName("Read Data"); // For Legend
 		//TODO Add Name to strings.properties
-		writeData = new Series<>();
+		this.writeData = new Series<>();
 		writeData.setName("Write Data");
 		//TODO Add Name to strings.properties
 
-		ioAnimation = new Timeline(); //TODO Research better timer
+		this.ioAnimation = new Timeline(); //TODO Research better timer
 		ioAnimation.getKeyFrames().add(new KeyFrame(Duration.seconds(IO_SAMPLING_INTERVAL), new IoSamplingAnimationHandler(readData, writeData)));
 		ioAnimation.setCycleCount(Animation.INDEFINITE);
 		ioAnimation.play();
+
+		// make sure to stop animating,
+		// otherwise a global timer (GC root) will keep a strong reference to animation
+		window.setOnHiding(evt -> {
+			ioAnimation.stop();
+		});
 	}
 
 	@FXML
@@ -84,20 +94,30 @@ public class VaultStatisticsController implements FxController {
 			}
 
 			// add latest value:
-			final long decBytes = vault.getStats().bytesPerSecondReadProperty().get();
+			final long decBytes = stats.bytesPerSecondReadProperty().get();
 			final double decMb = decBytes * BYTES_TO_MEGABYTES_FACTOR;
-			final long encBytes = vault.getStats().bytesPerSecondWrittenProperty().get();
+			final long encBytes = stats.bytesPerSecondWrittenProperty().get();
 			final double encMb = encBytes * BYTES_TO_MEGABYTES_FACTOR;
 			decryptedBytesRead.getData().get(IO_SAMPLING_STEPS - 1).setYValue(decMb);
 			encryptedBytesWrite.getData().get(IO_SAMPLING_STEPS - 1).setYValue(encMb);
 		}
 	}
 
-	public Vault getVault() {
-		return vault;
+	/* Getter/Setter */
+
+	public LongBinding bpsReadProperty() {
+		return bpsRead;
+	}
+
+	public long getBpsRead() {
+		return bpsRead.get();
+	}
+
+	public LongBinding bpsWrittenProperty() {
+		return bpsWritten;
+	}
+
+	public long getBpsWritten() {
+		return bpsWritten.get();
 	}
-	/*
-	public ReadOnlyObjectProperty<Vault> vaultProperty() {
-		return vault;
-	}*/
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java
index 0485c17d9..4acad0869 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java
@@ -19,6 +19,7 @@ import org.cryptomator.ui.common.FxmlScene;
 import org.cryptomator.ui.common.StageFactory;
 
 import javax.inject.Provider;
+import java.lang.ref.WeakReference;
 import java.util.Map;
 import java.util.ResourceBundle;
 
@@ -39,11 +40,15 @@ abstract class VaultStatisticsModule {
 		Stage stage = factory.create();
 		stage.setTitle(String.format(resourceBundle.getString("vaultstatistics.title"), vault.getDisplayableName()));
 		stage.setResizable(false);
+		var weakStage = new WeakReference<>(stage);
 		vault.stateProperty().addListener(new ChangeListener<>() {
 			@Override
 			public void changed(ObservableValue<? extends VaultState> observable, VaultState oldValue, VaultState newValue) {
 				if (newValue != VaultState.UNLOCKED) {
-					stage.hide();
+					Stage stage = weakStage.get();
+					if (stage != null) {
+						stage.hide();
+					}
 					observable.removeListener(this);
 				}
 			}
diff --git a/main/ui/src/main/resources/fxml/vault_statistics.fxml b/main/ui/src/main/resources/fxml/vault_statistics.fxml
index 36f0098ce..207950297 100644
--- a/main/ui/src/main/resources/fxml/vault_statistics.fxml
+++ b/main/ui/src/main/resources/fxml/vault_statistics.fxml
@@ -16,12 +16,12 @@
 	<HBox alignment="CENTER_RIGHT" spacing="6">
 		<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondRead"/>
 		<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
-						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.vault.stats.bytesPerSecondRead}"/>
+						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.bpsRead}"/>
 	</HBox>
 	<HBox alignment="CENTER_RIGHT" spacing="6">
 		<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondWritten"/>
 		<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
-						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.vault.stats.bytesPerSecondWritten}"/>
+						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.bpsWritten}"/>
 	</HBox>
 
 	<LineChart

From 7a696929995aaa854f370378b255ad8c4181ebd8 Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Wed, 17 Jun 2020 11:04:36 +0200
Subject: [PATCH 07/33] Prettied up the statistics window for both Ui Themes

---
 .../VaultStatisticsController.java            |  9 ++--
 main/ui/src/main/resources/css/dark_theme.css | 44 +++++++++++--------
 .../ui/src/main/resources/css/light_theme.css | 44 +++++++++++--------
 .../main/resources/fxml/vault_statistics.fxml | 27 +++++-------
 .../main/resources/i18n/strings.properties    |  2 +
 5 files changed, 70 insertions(+), 56 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
index d76156b42..46ee16fb1 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
@@ -18,6 +18,7 @@ import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.WeakBindings;
 
 import javax.inject.Inject;
+import java.util.ResourceBundle;
 
 @VaultStatisticsScoped
 public class VaultStatisticsController implements FxController {
@@ -35,17 +36,15 @@ public class VaultStatisticsController implements FxController {
 	public LineChart<Number, Number> lineGraph;
 
 	@Inject
-	public VaultStatisticsController(@VaultStatisticsWindow Stage window, @VaultStatisticsWindow Vault vault) {
+	public VaultStatisticsController(@VaultStatisticsWindow Stage window, @VaultStatisticsWindow Vault vault, ResourceBundle resourceBundle) {
 		this.stats = vault.getStats();
 		this.bpsRead = WeakBindings.bindLong(stats.bytesPerSecondReadProperty());
 		this.bpsWritten = WeakBindings.bindLong(stats.bytesPerSecondWrittenProperty());
 
 		this.readData = new Series<>();
-		readData.setName("Read Data"); // For Legend
-		//TODO Add Name to strings.properties
+		readData.setName(resourceBundle.getString("vaultstatistics.readDataLabel"));
 		this.writeData = new Series<>();
-		writeData.setName("Write Data");
-		//TODO Add Name to strings.properties
+		writeData.setName(resourceBundle.getString("vaultstatistics.writtenDataLabel"));
 
 		this.ioAnimation = new Timeline(); //TODO Research better timer
 		ioAnimation.getKeyFrames().add(new KeyFrame(Duration.seconds(IO_SAMPLING_INTERVAL), new IoSamplingAnimationHandler(readData, writeData)));
diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index 52cf13aaa..71195116d 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -882,43 +882,51 @@
 	-fx-background-color: MAIN_BG;
 	-fx-padding: 20px;
 }
-/*
-.default-color0.chart-line-symbol { -fx-background-color: #00FFFF; }
-.default-color1.chart-line-symbol { -fx-background-color: #00FF00; }
-*/
+
 /* content */
 
 .chart-content {
 	-fx-padding: 10px;
+	-fx-text-fill: TEXT_FILL;
+	-fx-tick-label-fill: GRAY_3;
+	-fx-minor-tick-visible: false
 }
 .chart-horizontal-grid-lines {
-	-fx-stroke: #FFFFFF;
+	-fx-stroke: PRIMARY_L2;
 }
 .chart-vertical-zero-line,
 .chart-horizontal-zero-line {
-	-fx-stroke: #FFFFFF;
+	-fx-stroke: PRIMARY_L2;
 }
 .chart-series-line {
 	-fx-stroke-width: 2px;
 }
 .chart-alternative-row-fill {
-	-fx-fill: #E1E1E1;
+	-fx-fill: GRAY_3;
 	-fx-stroke: transparent;
 	-fx-stroke-width: 0;
 }
+.axis {
+	-fx-tick-label-fill: TEXT_FILL;
+	-fx-tick-length: 20;
+	-fx-minor-tick-length: 10;
+}
+.axis-label {
+	-fx-text-fill: TEXT_FILL;
+}
+.default-color0.chart-series-line { -fx-stroke: PRIMARY; }
+.default-color1.chart-series-line { -fx-stroke: RED_5 ; }
 
-.default-color0.chart-series-line { -fx-stroke: #FF0000; }
-.default-color1.chart-series-line { -fx-stroke: #00FF00 ; }
+/* legend */
 
 .chart-legend {
-	-fx-background-color:  transparent;
-	-fx-padding: 20px;
+	-fx-text-fill: TEXT_FILL;
+	-fx-background-color: transparent;
+	-fx-padding: 0.4em;
 }
-
-.chart-legend-item-symbol{
-	-fx-background-radius: 10;
-}
-
-.chart-legend-item{
-	-fx-text-fill: #FFFFFF;
+.chart-line-symbol {
+	-fx-background-radius: 5px;
+	-fx-padding: 5px;
 }
+.default-color0.chart-line-symbol { -fx-background-color: PRIMARY; }
+.default-color1.chart-line-symbol { -fx-background-color: RED_5; }
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index 3ba377a95..855e48ec0 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -881,43 +881,51 @@
 	-fx-background-color: MAIN_BG;
 	-fx-padding: 20px;
 }
-/*
-.default-color0.chart-line-symbol { -fx-background-color: #00FFFF; }
-.default-color1.chart-line-symbol { -fx-background-color: #00FF00; }
-*/
+
 /* content */
 
 .chart-content {
 	-fx-padding: 10px;
+	-fx-text-fill: TEXT_FILL;
+	-fx-tick-label-fill: GRAY_3;
+	-fx-minor-tick-visible: false
 }
 .chart-horizontal-grid-lines {
-	-fx-stroke: #000000;
+	-fx-stroke: PRIMARY_D2;
 }
 .chart-vertical-zero-line,
 .chart-horizontal-zero-line {
-	-fx-stroke: #000000;
+	-fx-stroke: PRIMARY_D2;
 }
 .chart-series-line {
 	-fx-stroke-width: 2px;
 }
 .chart-alternative-row-fill {
-	-fx-fill: #E1E1E1;
+	-fx-fill: GRAY_8;
 	-fx-stroke: transparent;
 	-fx-stroke-width: 0;
 }
+.axis {
+	-fx-tick-label-fill: TEXT_FILL;
+	-fx-tick-length: 20;
+	-fx-minor-tick-length: 10;
+}
+.axis-label {
+	-fx-text-fill: TEXT_FILL;
+}
+.default-color0.chart-series-line { -fx-stroke: PRIMARY; }
+.default-color1.chart-series-line { -fx-stroke: RED_5 ; }
 
-.default-color0.chart-series-line { -fx-stroke: #FF0000; }
-.default-color1.chart-series-line { -fx-stroke: #00FF00 ; }
+/* legend */
 
 .chart-legend {
-	-fx-background-color:  transparent;
-	-fx-padding: 20px;
+	-fx-text-fill: TEXT_FILL;
+	-fx-background-color: transparent;
+	-fx-padding: 0.4em;
 }
-
-.chart-legend-item-symbol{
-	-fx-background-radius: 10;
-}
-
-.chart-legend-item{
-	-fx-text-fill: #000000;
+.chart-line-symbol {
+	-fx-background-radius: 5px;
+	-fx-padding: 5px;
 }
+.default-color0.chart-line-symbol { -fx-background-color: PRIMARY; }
+.default-color1.chart-line-symbol { -fx-background-color: RED_5; }
diff --git a/main/ui/src/main/resources/fxml/vault_statistics.fxml b/main/ui/src/main/resources/fxml/vault_statistics.fxml
index 207950297..5de2d45e6 100644
--- a/main/ui/src/main/resources/fxml/vault_statistics.fxml
+++ b/main/ui/src/main/resources/fxml/vault_statistics.fxml
@@ -12,21 +12,8 @@
 	  fx:controller="org.cryptomator.ui.vaultstatistics.VaultStatisticsController"
 	  prefHeight="400.0" prefWidth="600.0">
 
-
-	<HBox alignment="CENTER_RIGHT" spacing="6">
-		<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondRead"/>
-		<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
-						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.bpsRead}"/>
-	</HBox>
-	<HBox alignment="CENTER_RIGHT" spacing="6">
-		<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondWritten"/>
-		<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
-						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.bpsWritten}"/>
-	</HBox>
-
-	<LineChart
-			styleClass="chart-plot-background, chart-alternative-row-fill, default-color2.chart-series-line"
-			fx:id="lineGraph" createSymbols="true" legendVisible="true" prefHeight="372.0" prefWidth="423.0" visible="true" animated="false" title="%vaultstatistics.throughputTitle" verticalZeroLineVisible="true" verticalGridLinesVisible="false" horizontalGridLinesVisible="true">
+	<LineChart fx:id="lineGraph" VBox.vgrow="ALWAYS" createSymbols="false" legendVisible="true" prefHeight="372.0" prefWidth="423.0" visible="true" animated="false"
+			   title="%vaultstatistics.throughputTitle" verticalZeroLineVisible="true" verticalGridLinesVisible="false" horizontalGridLinesVisible="true">
 		<xAxis>
 			<NumberAxis autoRanging="false" lowerBound="0" side="BOTTOM" tickUnit="5" upperBound="100" label="%vaultstatistics.xAxisTimeLabel"/>
 		</xAxis>
@@ -37,4 +24,14 @@
 			<Cursor fx:constant="DEFAULT"/>
 		</cursor>
 	</LineChart>
+	<HBox alignment="CENTER_RIGHT" spacing="6">
+		<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondRead"/>
+		<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
+						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.bpsRead}"/>
+	</HBox>
+	<HBox alignment="CENTER_RIGHT" spacing="6">
+		<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondWritten"/>
+		<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
+						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.bpsWritten}"/>
+	</HBox>
 </VBox>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 9c26942c6..0f1cee1cf 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -165,6 +165,8 @@ vaultstatistics.title=Statistics for %s
 vaultstatistics.xAxisTimeLabel=Seconds
 vaultstatistics.yAxisThroughputLabel=Throughput in KiB/s
 vaultstatistics.throughputTitle=Read and Writes
+vaultstatistics.readDataLabel=Read Data
+vaultstatistics.writtenDataLabel=Written Data
 
 # Main Window
 main.closeBtn.tooltip=Close

From 9c034f3be6c756a49c3d93f942cac40d6597fdc2 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 25 Jun 2020 17:16:42 +0200
Subject: [PATCH 08/33] split up read and write charts and added cache
 efficiency chart (because we will add further read/write-specific stats like
 total number of files read/written, bytes encrypted/decrypted, etc)

---
 .../cryptomator/common/vaults/VaultStats.java | 24 ++++++
 .../org/cryptomator/ui/common/FxmlFile.java   |  2 +-
 .../cryptomator/ui/common/WeakBindings.java   | 20 +++++
 .../ui/mainwindow/MainWindowModule.java       |  2 +-
 .../VaultDetailUnlockedController.java        |  2 +-
 .../VaultStatisticsComponent.java             |  2 +-
 .../VaultStatisticsController.java            | 86 +++++++++++++------
 .../VaultStatisticsModule.java                |  6 +-
 .../VaultStatisticsScoped.java                |  2 +-
 .../VaultStatisticsWindow.java                |  2 +-
 main/ui/src/main/resources/css/dark_theme.css | 77 ++++++++---------
 .../ui/src/main/resources/css/light_theme.css | 72 ++++++++--------
 main/ui/src/main/resources/fxml/stats.fxml    | 77 +++++++++++++++++
 .../main/resources/fxml/vault_statistics.fxml | 37 --------
 .../main/resources/i18n/strings.properties    | 10 +--
 15 files changed, 269 insertions(+), 152 deletions(-)
 rename main/ui/src/main/java/org/cryptomator/ui/{vaultstatistics => stats}/VaultStatisticsComponent.java (94%)
 rename main/ui/src/main/java/org/cryptomator/ui/{vaultstatistics => stats}/VaultStatisticsController.java (59%)
 rename main/ui/src/main/java/org/cryptomator/ui/{vaultstatistics => stats}/VaultStatisticsModule.java (90%)
 rename main/ui/src/main/java/org/cryptomator/ui/{vaultstatistics => stats}/VaultStatisticsScoped.java (85%)
 rename main/ui/src/main/java/org/cryptomator/ui/{vaultstatistics => stats}/VaultStatisticsWindow.java (85%)
 create mode 100644 main/ui/src/main/resources/fxml/stats.fxml
 delete mode 100644 main/ui/src/main/resources/fxml/vault_statistics.fxml

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
index 69564b876..4ef791110 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
@@ -2,9 +2,12 @@ package org.cryptomator.common.vaults;
 
 import javafx.application.Platform;
 import javafx.beans.Observable;
+import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.LongProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleLongProperty;
+import javafx.beans.value.ObservableValue;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
 import javafx.util.Duration;
@@ -28,6 +31,7 @@ public class VaultStats {
 	private final ScheduledService<Optional<CryptoFileSystemStats>> updateService;
 	private final LongProperty bytesPerSecondRead = new SimpleLongProperty();
 	private final LongProperty bytesPerSecondWritten = new SimpleLongProperty();
+	private final DoubleProperty cacheHitRate = new SimpleDoubleProperty();
 
 	@Inject
 	VaultStats(AtomicReference<CryptoFileSystem> fs, ObjectProperty<VaultState> state, ExecutorService executor) {
@@ -55,6 +59,17 @@ public class VaultStats {
 		assert Platform.isFxApplicationThread();
 		bytesPerSecondRead.set(stats.map(CryptoFileSystemStats::pollBytesRead).orElse(0l));
 		bytesPerSecondWritten.set(stats.map(CryptoFileSystemStats::pollBytesWritten).orElse(0l));
+		cacheHitRate.set(stats.map(this::getCacheHitRate).orElse(0.0));
+	}
+	
+	private double getCacheHitRate(CryptoFileSystemStats stats) {
+		long accesses = stats.pollChunkCacheAccesses();
+		long hits = stats.pollChunkCacheHits();
+		if (accesses == 0) {
+			return 0.0;
+		} else {
+			return hits / (double) accesses;
+		}
 	}
 
 	private class UpdateStatsService extends ScheduledService<Optional<CryptoFileSystemStats>> {
@@ -94,4 +109,13 @@ public class VaultStats {
 	public long getBytesPerSecondWritten() {
 		return bytesPerSecondWritten.get();
 	}
+
+	public DoubleProperty cacheHitRateProperty() {
+		return cacheHitRate;
+	}
+
+	public double getCacheHitRate() {
+		return cacheHitRate.get();
+	}
+	
 }
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 3a3b47d1b..52108a12a 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
@@ -28,7 +28,7 @@ public enum FxmlFile {
 	UNLOCK_INVALID_MOUNT_POINT("/fxml/unlock_invalid_mount_point.fxml"), //
 	UNLOCK_SUCCESS("/fxml/unlock_success.fxml"), //
 	VAULT_OPTIONS("/fxml/vault_options.fxml"), //
-	VAULT_STATISTICS("/fxml/vault_statistics.fxml"), //
+	VAULT_STATISTICS("/fxml/stats.fxml"), //
 	WRONGFILEALERT("/fxml/wrongfilealert.fxml");
 
 	private final String ressourcePathString;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/WeakBindings.java b/main/ui/src/main/java/org/cryptomator/ui/common/WeakBindings.java
index 70111dd38..34c90d212 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/WeakBindings.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/WeakBindings.java
@@ -1,5 +1,6 @@
 package org.cryptomator.ui.common;
 
+import javafx.beans.binding.DoubleBinding;
 import javafx.beans.binding.LongBinding;
 import javafx.beans.binding.StringBinding;
 import javafx.beans.value.ObservableObjectValue;
@@ -50,4 +51,23 @@ public final class WeakBindings {
 		};
 	}
 
+	/**
+	 * Create a new DoubleBinding that listens to changes from the given observable without being strongly referenced by it.
+	 *
+	 * @param observable The observable
+	 * @return a DoubleBinding weakly referenced from the given observable
+	 */
+	public static DoubleBinding bindDouble(ObservableValue<Number> observable) {
+		return new DoubleBinding() {
+			{
+				bind(observable);
+			}
+
+			@Override
+			protected double computeValue() {
+				return observable.getValue().doubleValue();
+			}
+		};
+	}
+
 }
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 eca71c38e..cc9c98c87 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
@@ -20,7 +20,7 @@ import org.cryptomator.ui.common.StageFactory;
 import org.cryptomator.ui.migration.MigrationComponent;
 import org.cryptomator.ui.removevault.RemoveVaultComponent;
 import org.cryptomator.ui.vaultoptions.VaultOptionsComponent;
-import org.cryptomator.ui.vaultstatistics.VaultStatisticsComponent;
+import org.cryptomator.ui.stats.VaultStatisticsComponent;
 import org.cryptomator.ui.wrongfilealert.WrongFileAlertComponent;
 
 import javax.inject.Provider;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
index e42b902e7..7f64cf7e5 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
@@ -6,7 +6,7 @@ import javafx.fxml.FXML;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.VaultService;
-import org.cryptomator.ui.vaultstatistics.VaultStatisticsComponent;
+import org.cryptomator.ui.stats.VaultStatisticsComponent;
 
 import javax.inject.Inject;
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsComponent.java b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsComponent.java
similarity index 94%
rename from main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsComponent.java
rename to main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsComponent.java
index 915f936f9..18c596793 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsComponent.java
@@ -1,4 +1,4 @@
-package org.cryptomator.ui.vaultstatistics;
+package org.cryptomator.ui.stats;
 
 import dagger.BindsInstance;
 import dagger.Lazy;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
similarity index 59%
rename from main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
rename to main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
index 46ee16fb1..f8914c476 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
@@ -1,13 +1,17 @@
-package org.cryptomator.ui.vaultstatistics;
+package org.cryptomator.ui.stats;
 
 import javafx.animation.Animation;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.DoubleBinding;
 import javafx.beans.binding.LongBinding;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
+import javafx.scene.chart.AreaChart;
 import javafx.scene.chart.LineChart;
+import javafx.scene.chart.NumberAxis;
 import javafx.scene.chart.XYChart.Data;
 import javafx.scene.chart.XYChart.Series;
 import javafx.stage.Stage;
@@ -18,13 +22,14 @@ import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.WeakBindings;
 
 import javax.inject.Inject;
+import java.util.Arrays;
 import java.util.ResourceBundle;
 
 @VaultStatisticsScoped
 public class VaultStatisticsController implements FxController {
 
-	private static final int IO_SAMPLING_STEPS = 100;
-	private static final double IO_SAMPLING_INTERVAL = 0.5;
+	private static final int IO_SAMPLING_STEPS = 30;
+	private static final double IO_SAMPLING_INTERVAL = 1;
 
 	private final VaultStats stats;
 	private final Series<Number, Number> readData;
@@ -32,19 +37,27 @@ public class VaultStatisticsController implements FxController {
 	private final Timeline ioAnimation;
 	private final LongBinding bpsRead;
 	private final LongBinding bpsWritten;
+	private final DoubleBinding cacheHitRate;
+	private final DoubleBinding cacheHitDregrees;
+	private final DoubleBinding cacheHitPercentage;
 
-	public LineChart<Number, Number> lineGraph;
+	public AreaChart<Number, Number> readChart;
+	public AreaChart<Number, Number> writeChart;
+	public NumberAxis readChartXAxis;
+	public NumberAxis readChartYAxis;
+	public NumberAxis writeChartXAxis;
+	public NumberAxis writeChartYAxis;
 
 	@Inject
 	public VaultStatisticsController(@VaultStatisticsWindow Stage window, @VaultStatisticsWindow Vault vault, ResourceBundle resourceBundle) {
 		this.stats = vault.getStats();
+		this.readData = new Series<>();
+		this.writeData = new Series<>();
 		this.bpsRead = WeakBindings.bindLong(stats.bytesPerSecondReadProperty());
 		this.bpsWritten = WeakBindings.bindLong(stats.bytesPerSecondWrittenProperty());
-
-		this.readData = new Series<>();
-		readData.setName(resourceBundle.getString("vaultstatistics.readDataLabel"));
-		this.writeData = new Series<>();
-		writeData.setName(resourceBundle.getString("vaultstatistics.writtenDataLabel"));
+		this.cacheHitRate = WeakBindings.bindDouble(stats.cacheHitRateProperty());
+		this.cacheHitDregrees = cacheHitRate.multiply(-270);
+		this.cacheHitPercentage = cacheHitRate.multiply(100);
 
 		this.ioAnimation = new Timeline(); //TODO Research better timer
 		ioAnimation.getKeyFrames().add(new KeyFrame(Duration.seconds(IO_SAMPLING_INTERVAL), new IoSamplingAnimationHandler(readData, writeData)));
@@ -60,14 +73,18 @@ public class VaultStatisticsController implements FxController {
 
 	@FXML
 	public void initialize() {
-		lineGraph.getData().addAll(readData, writeData);
+		readChart.getData().addAll(readData);
+		writeChart.getData().addAll(writeData);
 	}
 
 	private class IoSamplingAnimationHandler implements EventHandler<ActionEvent> {
 
 		private static final double BYTES_TO_MEGABYTES_FACTOR = 1.0 / IO_SAMPLING_INTERVAL / 1024.0 / 1024.0;
+		
+		private long step = IO_SAMPLING_STEPS;
 		private final Series<Number, Number> decryptedBytesRead;
 		private final Series<Number, Number> encryptedBytesWrite;
+		private final long[] maxBuf = new long[IO_SAMPLING_STEPS];
 
 		public IoSamplingAnimationHandler(Series<Number, Number> readData, Series<Number, Number> writeData) {
 			this.decryptedBytesRead = readData;
@@ -82,23 +99,28 @@ public class VaultStatisticsController implements FxController {
 
 		@Override
 		public void handle(ActionEvent event) {
-			// move all values one step:
-			for (int i = 0; i < IO_SAMPLING_STEPS - 1; i++) {
-				int j = i + 1;
-				Number tmp = decryptedBytesRead.getData().get(j).getYValue();
-				decryptedBytesRead.getData().get(i).setYValue(tmp);
+			final long currentStep = step++;
+			final long decBytes = stats.bytesPerSecondReadProperty().get();
+			final long encBytes = stats.bytesPerSecondWrittenProperty().get();
 
-				tmp = encryptedBytesWrite.getData().get(j).getYValue();
-				encryptedBytesWrite.getData().get(i).setYValue(tmp);
-			}
+			maxBuf[(int) currentStep % IO_SAMPLING_STEPS] = Math.max(decBytes, encBytes);
+			long allTimeMax = Arrays.stream(maxBuf).max().orElse(0l);
+			
+			// remove oldest value:
+			decryptedBytesRead.getData().remove(0);
+			encryptedBytesWrite.getData().remove(0);
 
 			// add latest value:
-			final long decBytes = stats.bytesPerSecondReadProperty().get();
-			final double decMb = decBytes * BYTES_TO_MEGABYTES_FACTOR;
-			final long encBytes = stats.bytesPerSecondWrittenProperty().get();
-			final double encMb = encBytes * BYTES_TO_MEGABYTES_FACTOR;
-			decryptedBytesRead.getData().get(IO_SAMPLING_STEPS - 1).setYValue(decMb);
-			encryptedBytesWrite.getData().get(IO_SAMPLING_STEPS - 1).setYValue(encMb);
+			decryptedBytesRead.getData().add(new Data<>(currentStep, decBytes));
+			encryptedBytesWrite.getData().add(new Data<>(currentStep, encBytes));
+			
+			// adjust ranges:
+			readChartXAxis.setLowerBound(currentStep - IO_SAMPLING_STEPS);
+			readChartXAxis.setUpperBound(currentStep);
+			readChartYAxis.setUpperBound(allTimeMax);
+			writeChartXAxis.setLowerBound(currentStep - IO_SAMPLING_STEPS);
+			writeChartXAxis.setUpperBound(currentStep);
+			writeChartYAxis.setUpperBound(allTimeMax);
 		}
 	}
 
@@ -119,4 +141,20 @@ public class VaultStatisticsController implements FxController {
 	public long getBpsWritten() {
 		return bpsWritten.get();
 	}
+
+	public DoubleBinding cacheHitPercentageProperty() {
+		return cacheHitPercentage;
+	}
+
+	public double getCacheHitPercentage() {
+		return cacheHitPercentage.get();
+	}
+
+	public DoubleBinding cacheHitDregreesProperty() {
+		return cacheHitDregrees;
+	}
+
+	public double getCacheHitDregrees() {
+		return cacheHitDregrees.get();
+	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java
similarity index 90%
rename from main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java
rename to main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java
index 4acad0869..1d3b1eeab 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java
@@ -1,4 +1,4 @@
-package org.cryptomator.ui.vaultstatistics;
+package org.cryptomator.ui.stats;
 
 import dagger.Binds;
 import dagger.Module;
@@ -38,7 +38,7 @@ abstract class VaultStatisticsModule {
 	@VaultStatisticsScoped
 	static Stage provideStage(StageFactory factory, ResourceBundle resourceBundle, @VaultStatisticsWindow Vault vault) {
 		Stage stage = factory.create();
-		stage.setTitle(String.format(resourceBundle.getString("vaultstatistics.title"), vault.getDisplayableName()));
+		stage.setTitle(String.format(resourceBundle.getString("stats.title"), vault.getDisplayableName()));
 		stage.setResizable(false);
 		var weakStage = new WeakReference<>(stage);
 		vault.stateProperty().addListener(new ChangeListener<>() {
@@ -60,7 +60,7 @@ abstract class VaultStatisticsModule {
 	@FxmlScene(FxmlFile.VAULT_STATISTICS)
 	@VaultStatisticsScoped
 	static Scene provideVaultStatisticsScene(@VaultStatisticsWindow FXMLLoaderFactory fxmlLoaders) {
-		return fxmlLoaders.createScene("/fxml/vault_statistics.fxml");
+		return fxmlLoaders.createScene("/fxml/stats.fxml");
 	}
 
 	// ------------------
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsScoped.java b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsScoped.java
similarity index 85%
rename from main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsScoped.java
rename to main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsScoped.java
index 842e7e508..43de85b54 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsScoped.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsScoped.java
@@ -1,4 +1,4 @@
-package org.cryptomator.ui.vaultstatistics;
+package org.cryptomator.ui.stats;
 
 import javax.inject.Scope;
 import java.lang.annotation.Documented;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsWindow.java b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsWindow.java
similarity index 85%
rename from main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsWindow.java
rename to main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsWindow.java
index 4fe9174a1..2cd3ca37f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultstatistics/VaultStatisticsWindow.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsWindow.java
@@ -1,4 +1,4 @@
-package org.cryptomator.ui.vaultstatistics;
+package org.cryptomator.ui.stats;
 
 import javax.inject.Qualifier;
 import java.lang.annotation.Documented;
diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index 71195116d..5450664ab 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -874,59 +874,52 @@
  * I/O Statistics                                                              *
  *                                                                             *
  ******************************************************************************/
-.chart {
+
+.cache-arc-background {
+	-fx-fill: transparent;
+	-fx-stroke: MUTED_BG;
+	-fx-stroke-type: centered;
+	-fx-stroke-width: 12;
+	-fx-stroke-line-cap: butt;
+}
+
+.cache-arc-foreground {
+	-fx-fill: transparent;
+	-fx-stroke: PRIMARY;
+	-fx-stroke-type: centered;
+	-fx-stroke-width: 12;
+	-fx-stroke-line-cap: butt;
+}
+
+.chart.io-stats {
 	-fx-padding: 10px;
+	-fx-horizontal-grid-lines-visible: false;
+	-fx-horizontal-zero-line-visible: false;
+	-fx-vertical-grid-lines-visible: false;
+	-fx-vertical-zero-line-visible: false;
+}
+
+.axis.io-stats {
+	-fx-tick-mark-visible: false;
+	-fx-minor-tick-visible: false;
+	-fx-tick-labels-visible: false;
 }
 
 .chart-plot-background {
-	-fx-background-color: MAIN_BG;
-	-fx-padding: 20px;
+	-fx-background-color: transparent;
 }
 
-/* content */
-
-.chart-content {
-	-fx-padding: 10px;
-	-fx-text-fill: TEXT_FILL;
-	-fx-tick-label-fill: GRAY_3;
-	-fx-minor-tick-visible: false
-}
-.chart-horizontal-grid-lines {
-	-fx-stroke: PRIMARY_L2;
-}
 .chart-vertical-zero-line,
-.chart-horizontal-zero-line {
-	-fx-stroke: PRIMARY_L2;
-}
-.chart-series-line {
-	-fx-stroke-width: 2px;
-}
+.chart-horizontal-zero-line,
 .chart-alternative-row-fill {
-	-fx-fill: GRAY_3;
 	-fx-stroke: transparent;
 	-fx-stroke-width: 0;
 }
-.axis {
-	-fx-tick-label-fill: TEXT_FILL;
-	-fx-tick-length: 20;
-	-fx-minor-tick-length: 10;
-}
-.axis-label {
-	-fx-text-fill: TEXT_FILL;
-}
-.default-color0.chart-series-line { -fx-stroke: PRIMARY; }
-.default-color1.chart-series-line { -fx-stroke: RED_5 ; }
 
-/* legend */
-
-.chart-legend {
-	-fx-text-fill: TEXT_FILL;
-	-fx-background-color: transparent;
-	-fx-padding: 0.4em;
+.default-color0.chart-series-area-line {
+	-fx-stroke: PRIMARY;
 }
-.chart-line-symbol {
-	-fx-background-radius: 5px;
-	-fx-padding: 5px;
+.default-color0.chart-series-area-fill {
+	-fx-fill: linear-gradient(to bottom, PRIMARY, transparent);
+	-fx-stroke: transparent;
 }
-.default-color0.chart-line-symbol { -fx-background-color: PRIMARY; }
-.default-color1.chart-line-symbol { -fx-background-color: RED_5; }
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index 855e48ec0..cc0e848ab 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -884,48 +884,52 @@
 
 /* content */
 
-.chart-content {
+
+.cache-arc-background {
+	-fx-fill: transparent;
+	-fx-stroke: MUTED_BG;
+	-fx-stroke-type: centered;
+	-fx-stroke-width: 12;
+	-fx-stroke-line-cap: butt;
+}
+
+.cache-arc-foreground {
+	-fx-fill: transparent;
+	-fx-stroke: PRIMARY;
+	-fx-stroke-type: centered;
+	-fx-stroke-width: 12;
+	-fx-stroke-line-cap: butt;
+}
+
+.chart.io-stats {
 	-fx-padding: 10px;
-	-fx-text-fill: TEXT_FILL;
-	-fx-tick-label-fill: GRAY_3;
-	-fx-minor-tick-visible: false
+	-fx-horizontal-grid-lines-visible: false;
+	-fx-horizontal-zero-line-visible: false;
+	-fx-vertical-grid-lines-visible: false;
+	-fx-vertical-zero-line-visible: false;
 }
-.chart-horizontal-grid-lines {
-	-fx-stroke: PRIMARY_D2;
+
+.axis.io-stats {
+	-fx-tick-mark-visible: false;
+	-fx-minor-tick-visible: false;
+	-fx-tick-labels-visible: false;
 }
+
+.chart-plot-background {
+	-fx-background-color: transparent;
+}
+
 .chart-vertical-zero-line,
-.chart-horizontal-zero-line {
-	-fx-stroke: PRIMARY_D2;
-}
-.chart-series-line {
-	-fx-stroke-width: 2px;
-}
+.chart-horizontal-zero-line,
 .chart-alternative-row-fill {
-	-fx-fill: GRAY_8;
 	-fx-stroke: transparent;
 	-fx-stroke-width: 0;
 }
-.axis {
-	-fx-tick-label-fill: TEXT_FILL;
-	-fx-tick-length: 20;
-	-fx-minor-tick-length: 10;
-}
-.axis-label {
-	-fx-text-fill: TEXT_FILL;
-}
-.default-color0.chart-series-line { -fx-stroke: PRIMARY; }
-.default-color1.chart-series-line { -fx-stroke: RED_5 ; }
 
-/* legend */
-
-.chart-legend {
-	-fx-text-fill: TEXT_FILL;
-	-fx-background-color: transparent;
-	-fx-padding: 0.4em;
+.default-color0.chart-series-area-line {
+	-fx-stroke: PRIMARY;
 }
-.chart-line-symbol {
-	-fx-background-radius: 5px;
-	-fx-padding: 5px;
+.default-color0.chart-series-area-fill {
+	-fx-fill: linear-gradient(to bottom, PRIMARY, transparent);
+	-fx-stroke: transparent;
 }
-.default-color0.chart-line-symbol { -fx-background-color: PRIMARY; }
-.default-color1.chart-line-symbol { -fx-background-color: RED_5; }
diff --git a/main/ui/src/main/resources/fxml/stats.fxml b/main/ui/src/main/resources/fxml/stats.fxml
new file mode 100644
index 000000000..d0cef21c4
--- /dev/null
+++ b/main/ui/src/main/resources/fxml/stats.fxml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.chart.AreaChart?>
+<?import javafx.scene.chart.NumberAxis?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.Cursor?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.shape.Arc?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
+<?import org.cryptomator.ui.controls.ThrougputLabel?>
+<?import javafx.scene.Group?>
+<HBox xmlns="http://javafx.com/javafx"
+	  xmlns:fx="http://javafx.com/fxml"
+	  fx:controller="org.cryptomator.ui.stats.VaultStatisticsController"
+	  prefWidth="600.0" spacing="12">
+	<padding>
+		<Insets topRightBottomLeft="12"/>
+	</padding>
+	
+	<!-- Caching -->
+	<VBox prefWidth="200" prefHeight="200">
+		<StackPane>
+			<Group>
+				<Arc styleClass="cache-arc-background" centerX="100" centerY="100" radiusX="100" radiusY="100" startAngle="225" length="-270"/>
+				<Arc styleClass="cache-arc-foreground" centerX="100" centerY="100" radiusX="100" radiusY="100" startAngle="225" length="${controller.cacheHitDregrees}"/>
+			</Group>
+			<VBox StackPane.alignment="CENTER" alignment="CENTER">
+				<FormattedLabel styleClass="label-large" format="\%1.0f %%" arg1="${controller.cacheHitPercentage}" />
+				<Label text="%stats.cacheHitRate" />
+			</VBox>
+		</StackPane>
+	</VBox>
+
+	<!-- Read -->
+	<VBox prefWidth="200" prefHeight="200">
+		<HBox spacing="12">
+			<Label text="%stats.readDataLabel"/>
+			<ThrougputLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
+						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.bpsRead}"/>
+		</HBox>
+		<AreaChart fx:id="readChart" styleClass="io-stats" createSymbols="false" animated="false">
+			<xAxis>
+				<NumberAxis fx:id="readChartXAxis" styleClass="io-stats" autoRanging="false" forceZeroInRange="false" side="BOTTOM"/>
+			</xAxis>
+			<yAxis>
+				<NumberAxis fx:id="readChartYAxis" styleClass="io-stats" autoRanging="false" forceZeroInRange="true" side="LEFT" tickUnit="Infinity"/>
+			</yAxis>
+			<cursor>
+				<Cursor fx:constant="DEFAULT"/>
+			</cursor>
+		</AreaChart>
+	</VBox>
+
+	<!-- Write -->
+	<VBox prefWidth="200" prefHeight="200">
+		<HBox>
+			<Label text="%stats.writtenDataLabel"/>
+			<ThrougputLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
+							mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.bpsWritten}"/>
+		</HBox>
+		<AreaChart fx:id="writeChart" styleClass="io-stats" createSymbols="false" animated="false">
+			<xAxis>
+				<NumberAxis fx:id="writeChartXAxis" styleClass="io-stats" autoRanging="false" forceZeroInRange="false" side="BOTTOM"/>
+			</xAxis>
+			<yAxis>
+				<NumberAxis fx:id="writeChartYAxis" styleClass="io-stats" autoRanging="false" forceZeroInRange="true" side="LEFT" tickUnit="Infinity"/>
+			</yAxis>
+			<cursor>
+				<Cursor fx:constant="DEFAULT"/>
+			</cursor>
+		</AreaChart>
+	</VBox>
+	
+</HBox>
diff --git a/main/ui/src/main/resources/fxml/vault_statistics.fxml b/main/ui/src/main/resources/fxml/vault_statistics.fxml
deleted file mode 100644
index 5de2d45e6..000000000
--- a/main/ui/src/main/resources/fxml/vault_statistics.fxml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.chart.LineChart?>
-<?import javafx.scene.chart.NumberAxis?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.Cursor?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.ThrougputLabel?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
-	  fx:controller="org.cryptomator.ui.vaultstatistics.VaultStatisticsController"
-	  prefHeight="400.0" prefWidth="600.0">
-
-	<LineChart fx:id="lineGraph" VBox.vgrow="ALWAYS" createSymbols="false" legendVisible="true" prefHeight="372.0" prefWidth="423.0" visible="true" animated="false"
-			   title="%vaultstatistics.throughputTitle" verticalZeroLineVisible="true" verticalGridLinesVisible="false" horizontalGridLinesVisible="true">
-		<xAxis>
-			<NumberAxis autoRanging="false" lowerBound="0" side="BOTTOM" tickUnit="5" upperBound="100" label="%vaultstatistics.xAxisTimeLabel"/>
-		</xAxis>
-		<yAxis>
-			<NumberAxis autoRanging="true" lowerBound="0" side="LEFT" tickUnit="1024" upperBound="100" label="%vaultstatistics.yAxisThroughputLabel" forceZeroInRange="true"/>
-		</yAxis>
-		<cursor>
-			<Cursor fx:constant="DEFAULT"/>
-		</cursor>
-	</LineChart>
-	<HBox alignment="CENTER_RIGHT" spacing="6">
-		<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondRead"/>
-		<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
-						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.bpsRead}"/>
-	</HBox>
-	<HBox alignment="CENTER_RIGHT" spacing="6">
-		<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondWritten"/>
-		<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
-						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.bpsWritten}"/>
-	</HBox>
-</VBox>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 0f1cee1cf..3681c281c 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -161,12 +161,10 @@ preferences.donationKey.getDonationKey=Get a donation key
 preferences.about=About
 
 # Vault Statistics
-vaultstatistics.title=Statistics for %s
-vaultstatistics.xAxisTimeLabel=Seconds
-vaultstatistics.yAxisThroughputLabel=Throughput in KiB/s
-vaultstatistics.throughputTitle=Read and Writes
-vaultstatistics.readDataLabel=Read Data
-vaultstatistics.writtenDataLabel=Written Data
+stats.title=Statistics for %s
+stats.readDataLabel=Read Data
+stats.writtenDataLabel=Written Data
+stats.cacheHitRate=Cache Hit Rate
 
 # Main Window
 main.closeBtn.tooltip=Close

From 3519346df919f5e47a8f33943538e84bfb3b0ba3 Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Mon, 20 Jul 2020 10:59:48 +0200
Subject: [PATCH 09/33] cleaned up unlock window

---
 .../main/resources/fxml/vault_detail_unlocked.fxml  | 13 +------------
 main/ui/src/main/resources/i18n/strings.properties  |  4 ++++
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml b/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
index d7db563fa..fbc257e56 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
@@ -34,16 +34,5 @@
 	</Button>
 
 	<Region VBox.vgrow="ALWAYS"/>
-
-	<HBox alignment="CENTER_RIGHT" spacing="6">
-		<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondRead"/>
-		<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
-						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.vault.stats.bytesPerSecondRead}"/>
-	</HBox>
-	<HBox alignment="CENTER_RIGHT" spacing="6">
-		<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondWritten"/>
-		<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
-						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.vault.stats.bytesPerSecondWritten}"/>
-	</HBox>
-	<Button styleClass="button-large" text="View statistics string" minWidth="120" onAction="#showVaultStatistics"/>
+	<Button styleClass="button-large" text="%main.vaultDetail.stats" minWidth="120" onAction="#showVaultStatistics"/>
 </VBox>
\ No newline at end of file
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 3681c281c..1209e5485 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -165,6 +165,9 @@ stats.title=Statistics for %s
 stats.readDataLabel=Read Data
 stats.writtenDataLabel=Written Data
 stats.cacheHitRate=Cache Hit Rate
+stats.totalMiB=Total: %s MiB
+stats.totalReads=Number of Reads: %s
+stats.totalWrites=Number of Writes: %s
 
 # Main Window
 main.closeBtn.tooltip=Close
@@ -197,6 +200,7 @@ main.vaultDetail.bytesPerSecondWritten=written:
 main.vaultDetail.throughput.idle=idle
 main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
+main.vaultDetail.stats=Show Statistics
 ### Missing
 main.vaultDetail.missing.info=Cryptomator could not find a vault at this path.
 ### Needs Migration

From ff2fa70bd6b9a37b1ba70b5794602e61d337297e Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Mon, 20 Jul 2020 11:00:59 +0200
Subject: [PATCH 10/33] preperation for displaying en-de-crypted bytes per
 second

---
 .../cryptomator/common/vaults/VaultStats.java | 27 ++++++++++++++++-
 .../cryptomator/ui/common/WeakBindings.java   | 20 +++++++++++++
 .../ui/stats/VaultStatisticsController.java   | 25 ++++++++++++++++
 main/ui/src/main/resources/fxml/stats.fxml    | 30 ++++++++++++-------
 4 files changed, 91 insertions(+), 11 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
index 4ef791110..4d13163e9 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
@@ -3,9 +3,11 @@ package org.cryptomator.common.vaults;
 import javafx.application.Platform;
 import javafx.beans.Observable;
 import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.LongProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleDoubleProperty;
+import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleLongProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.ScheduledService;
@@ -31,7 +33,11 @@ public class VaultStats {
 	private final ScheduledService<Optional<CryptoFileSystemStats>> updateService;
 	private final LongProperty bytesPerSecondRead = new SimpleLongProperty();
 	private final LongProperty bytesPerSecondWritten = new SimpleLongProperty();
+	private final LongProperty bytesPerSecondEncrypted = new SimpleLongProperty();
+	private final LongProperty bytesPerSecondDecrypted = new SimpleLongProperty();
 	private final DoubleProperty cacheHitRate = new SimpleDoubleProperty();
+	//private final IntegerProperty filesRead = new SimpleIntegerProperty();
+	//private final IntegerProperty filesWritten = new SimpleIntegerProperty();
 
 	@Inject
 	VaultStats(AtomicReference<CryptoFileSystem> fs, ObjectProperty<VaultState> state, ExecutorService executor) {
@@ -60,6 +66,8 @@ public class VaultStats {
 		bytesPerSecondRead.set(stats.map(CryptoFileSystemStats::pollBytesRead).orElse(0l));
 		bytesPerSecondWritten.set(stats.map(CryptoFileSystemStats::pollBytesWritten).orElse(0l));
 		cacheHitRate.set(stats.map(this::getCacheHitRate).orElse(0.0));
+		bytesPerSecondDecrypted.set(stats.map(CryptoFileSystemStats::pollBytesDecrypted).orElse(0l));
+		bytesPerSecondEncrypted.set(stats.map(CryptoFileSystemStats::pollBytesEncrypted).orElse(0l));
 	}
 	
 	private double getCacheHitRate(CryptoFileSystemStats stats) {
@@ -110,6 +118,22 @@ public class VaultStats {
 		return bytesPerSecondWritten.get();
 	}
 
+	public LongProperty bytesPerSecondEncryptedProperty() {
+		return bytesPerSecondEncrypted;
+	}
+
+	public long getBytesPerSecondEnrypted() {
+		return bytesPerSecondEncrypted.get();
+	}
+
+	public LongProperty bytesPerSecondDecryptedProperty() {
+		return bytesPerSecondDecrypted;
+	}
+
+	public long getBytesPerSecondDecrypted() {
+		return bytesPerSecondDecrypted.get();
+	}
+
 	public DoubleProperty cacheHitRateProperty() {
 		return cacheHitRate;
 	}
@@ -117,5 +141,6 @@ public class VaultStats {
 	public double getCacheHitRate() {
 		return cacheHitRate.get();
 	}
-	
+
+
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/WeakBindings.java b/main/ui/src/main/java/org/cryptomator/ui/common/WeakBindings.java
index 34c90d212..e6071df1d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/WeakBindings.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/WeakBindings.java
@@ -1,6 +1,7 @@
 package org.cryptomator.ui.common;
 
 import javafx.beans.binding.DoubleBinding;
+import javafx.beans.binding.IntegerBinding;
 import javafx.beans.binding.LongBinding;
 import javafx.beans.binding.StringBinding;
 import javafx.beans.value.ObservableObjectValue;
@@ -70,4 +71,23 @@ public final class WeakBindings {
 		};
 	}
 
+	/**
+	 * Create a new IntegerBinding that listens to changes from the given observable without being strongly referenced by it.
+	 *
+	 * @param observable The observable
+	 * @return a IntegerBinding weakly referenced from the given observable
+	 */
+	public static IntegerBinding bindInterger(ObservableValue<Number> observable) {
+		return new IntegerBinding() {
+			{
+				bind(observable);
+			}
+
+			@Override
+			protected int computeValue() {
+				return observable.getValue().intValue();
+			}
+		};
+	}
+
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
index f8914c476..cc747b8f6 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
@@ -5,6 +5,7 @@ import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.DoubleBinding;
+import javafx.beans.binding.IntegerBinding;
 import javafx.beans.binding.LongBinding;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
@@ -40,6 +41,10 @@ public class VaultStatisticsController implements FxController {
 	private final DoubleBinding cacheHitRate;
 	private final DoubleBinding cacheHitDregrees;
 	private final DoubleBinding cacheHitPercentage;
+	/*private final IntegerBinding filesRead;
+	private final IntegerBinding filesWritten;*/
+	private final LongBinding bpsEncrypted;
+	private final LongBinding bpsDecrypted;
 
 	public AreaChart<Number, Number> readChart;
 	public AreaChart<Number, Number> writeChart;
@@ -58,6 +63,10 @@ public class VaultStatisticsController implements FxController {
 		this.cacheHitRate = WeakBindings.bindDouble(stats.cacheHitRateProperty());
 		this.cacheHitDregrees = cacheHitRate.multiply(-270);
 		this.cacheHitPercentage = cacheHitRate.multiply(100);
+		/*this.filesRead = WeakBindings.bindInterger();
+		this.filesWritten = WeakBindings.bindInterger();*/
+		this.bpsEncrypted = WeakBindings.bindLong(stats.bytesPerSecondEncryptedProperty());
+		this.bpsDecrypted = WeakBindings.bindLong(stats.bytesPerSecondDecryptedProperty());
 
 		this.ioAnimation = new Timeline(); //TODO Research better timer
 		ioAnimation.getKeyFrames().add(new KeyFrame(Duration.seconds(IO_SAMPLING_INTERVAL), new IoSamplingAnimationHandler(readData, writeData)));
@@ -157,4 +166,20 @@ public class VaultStatisticsController implements FxController {
 	public double getCacheHitDregrees() {
 		return cacheHitDregrees.get();
 	}
+
+	public LongBinding bpsEncryptedProperty() {
+		return bpsEncrypted;
+	}
+
+	public long getBpsEncrypted() {
+		return bpsEncrypted.get();
+	}
+
+	public LongBinding bpsDecryptedProperty() {
+		return bpsDecrypted;
+	}
+
+	public long getBpsDecrypted() {
+		return bpsDecrypted.get();
+	}
 }
diff --git a/main/ui/src/main/resources/fxml/stats.fxml b/main/ui/src/main/resources/fxml/stats.fxml
index d0cef21c4..85ea52efb 100644
--- a/main/ui/src/main/resources/fxml/stats.fxml
+++ b/main/ui/src/main/resources/fxml/stats.fxml
@@ -19,7 +19,7 @@
 	<padding>
 		<Insets topRightBottomLeft="12"/>
 	</padding>
-	
+
 	<!-- Caching -->
 	<VBox prefWidth="200" prefHeight="200">
 		<StackPane>
@@ -28,18 +28,18 @@
 				<Arc styleClass="cache-arc-foreground" centerX="100" centerY="100" radiusX="100" radiusY="100" startAngle="225" length="${controller.cacheHitDregrees}"/>
 			</Group>
 			<VBox StackPane.alignment="CENTER" alignment="CENTER">
-				<FormattedLabel styleClass="label-large" format="\%1.0f %%" arg1="${controller.cacheHitPercentage}" />
-				<Label text="%stats.cacheHitRate" />
+				<FormattedLabel styleClass="label-large" format="\%1.0f %%" arg1="${controller.cacheHitPercentage}"/>
+				<Label text="%stats.cacheHitRate"/>
 			</VBox>
 		</StackPane>
 	</VBox>
 
 	<!-- Read -->
-	<VBox prefWidth="200" prefHeight="200">
-		<HBox spacing="12">
-			<Label text="%stats.readDataLabel"/>
+	<VBox prefWidth="300" prefHeight="200">
+		<HBox spacing="12" alignment="CENTER">
+			<Label styleClass="label-large" text="%stats.readDataLabel"/>
 			<ThrougputLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
-						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.bpsRead}"/>
+							mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.bpsRead}"/>
 		</HBox>
 		<AreaChart fx:id="readChart" styleClass="io-stats" createSymbols="false" animated="false">
 			<xAxis>
@@ -52,12 +52,18 @@
 				<Cursor fx:constant="DEFAULT"/>
 			</cursor>
 		</AreaChart>
+		<VBox spacing="12" alignment="CENTER">
+			<FormattedLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" format="%stats.totalMiB" arg1="${controller.bpsRead}"/>
+			<!-- <FormattedLabel styleClass="label-large" alignment="CENTER_LEFT" minWidth="60" format="%stats.totalReads" arg1="${controller.}"/> -->
+			<!--<FormattedLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" format="%stats.totalMiB" arg1="${controller.bpsEncrypted}"/>-->
+
+		</VBox>
 	</VBox>
 
 	<!-- Write -->
 	<VBox prefWidth="200" prefHeight="200">
-		<HBox>
-			<Label text="%stats.writtenDataLabel"/>
+		<HBox alignment="CENTER">
+			<Label styleClass="label-large" text="%stats.writtenDataLabel"/>
 			<ThrougputLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
 							mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.bpsWritten}"/>
 		</HBox>
@@ -72,6 +78,10 @@
 				<Cursor fx:constant="DEFAULT"/>
 			</cursor>
 		</AreaChart>
+		<VBox spacing="12" alignment="CENTER">
+			<FormattedLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" format="%stats.totalMiB" arg1="${controller.bpsWritten}"/>
+			<!-- <FormattedLabel styleClass="label-large" alignment="CENTER_LEFT" minWidth="60" format="%stats.totalWrites" arg1="${controller.}"/> -->
+		</VBox>
+
 	</VBox>
-	
 </HBox>

From ed77a4aacd76ce312f606ee1cfcaee9f664a4ae5 Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Mon, 20 Jul 2020 16:08:25 +0200
Subject: [PATCH 11/33] Added basic counting of additional total stats (not
 correct)

---
 .../cryptomator/common/vaults/VaultStats.java | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
index 4d13163e9..fcb3b5cce 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
@@ -3,13 +3,10 @@ package org.cryptomator.common.vaults;
 import javafx.application.Platform;
 import javafx.beans.Observable;
 import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.LongProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleDoubleProperty;
-import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleLongProperty;
-import javafx.beans.value.ObservableValue;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
 import javafx.util.Duration;
@@ -36,6 +33,10 @@ public class VaultStats {
 	private final LongProperty bytesPerSecondEncrypted = new SimpleLongProperty();
 	private final LongProperty bytesPerSecondDecrypted = new SimpleLongProperty();
 	private final DoubleProperty cacheHitRate = new SimpleDoubleProperty();
+	private final LongProperty toalBytesRead = new SimpleLongProperty();
+	private final LongProperty toalBytesWritten = new SimpleLongProperty();
+	private final LongProperty totalBytesEncrypted = new SimpleLongProperty();
+	private final LongProperty totalBytesDecrypted = new SimpleLongProperty();
 	//private final IntegerProperty filesRead = new SimpleIntegerProperty();
 	//private final IntegerProperty filesWritten = new SimpleIntegerProperty();
 
@@ -68,8 +69,13 @@ public class VaultStats {
 		cacheHitRate.set(stats.map(this::getCacheHitRate).orElse(0.0));
 		bytesPerSecondDecrypted.set(stats.map(CryptoFileSystemStats::pollBytesDecrypted).orElse(0l));
 		bytesPerSecondEncrypted.set(stats.map(CryptoFileSystemStats::pollBytesEncrypted).orElse(0l));
+		toalBytesRead.set(stats.map(CryptoFileSystemStats::pollBytesRead).orElse(0l) + toalBytesRead.get());
+		toalBytesWritten.set(stats.map(CryptoFileSystemStats::pollBytesWritten).orElse(0l) + toalBytesWritten.get());
+		totalBytesEncrypted.set(stats.map(CryptoFileSystemStats::pollBytesEncrypted).orElse(0l) + totalBytesEncrypted.get());
+		totalBytesDecrypted.set(stats.map(CryptoFileSystemStats::pollBytesDecrypted).orElse(0l) + totalBytesDecrypted.get());
+
 	}
-	
+
 	private double getCacheHitRate(CryptoFileSystemStats stats) {
 		long accesses = stats.pollChunkCacheAccesses();
 		long hits = stats.pollChunkCacheHits();
@@ -142,5 +148,21 @@ public class VaultStats {
 		return cacheHitRate.get();
 	}
 
+	public LongProperty toalBytesReadProperty() {return toalBytesRead;}
+
+	public long getTotalBytesRead() { return toalBytesRead.get();}
+
+	public LongProperty toalBytesWrittenProperty() {return toalBytesWritten;}
+
+	public long getTotalBytesWritten() { return toalBytesWritten.get();}
+
+	public LongProperty totalBytesEncryptedProperty() {return totalBytesEncrypted;}
+
+	public long getTotalBytesEncrypted() { return totalBytesEncrypted.get();}
+
+	public LongProperty totalBytesDecryptedProperty() {return totalBytesDecrypted;}
+
+	public long getTotalBytesDecrypted() { return totalBytesDecrypted.get();}
+
 
 }

From ed9f16e0120834042797c101af533fbc5cf488c5 Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Mon, 20 Jul 2020 16:09:45 +0200
Subject: [PATCH 12/33] Displaying additional stats with a new DataLabel

---
 .../cryptomator/ui/controls/DataLabel.java    | 88 +++++++++++++++++++
 .../ui/stats/VaultStatisticsController.java   | 38 ++++++--
 main/ui/src/main/resources/fxml/stats.fxml    | 36 ++++++--
 .../main/resources/i18n/strings.properties    | 10 ++-
 4 files changed, 154 insertions(+), 18 deletions(-)
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/controls/DataLabel.java

diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/DataLabel.java b/main/ui/src/main/java/org/cryptomator/ui/controls/DataLabel.java
new file mode 100644
index 000000000..a5834cce7
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/DataLabel.java
@@ -0,0 +1,88 @@
+package org.cryptomator.ui.controls;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.StringBinding;
+import javafx.beans.property.LongProperty;
+import javafx.beans.property.SimpleLongProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.scene.control.Label;
+
+public class DataLabel extends Label {
+
+	private static final long KIB_THRESHOLD = 1l << 7; // 0.128 kiB
+	private static final long MIB_THRESHOLD = 1l << 19; // 0.512 MiB
+	private static final long GIB_THRESHOLD = 1l << 29; // 0.512 GiB
+
+	private final StringProperty byteFormat = new SimpleStringProperty("-");
+	private final StringProperty kibFormat = new SimpleStringProperty("%.3f");
+	private final StringProperty mibFormat = new SimpleStringProperty("%.3f");
+	private final StringProperty gibFormat = new SimpleStringProperty("%.3f");
+	private final LongProperty dataInBytes = new SimpleLongProperty();
+
+	public DataLabel() {
+		textProperty().bind(createStringBinding());
+	}
+
+	protected StringBinding createStringBinding() {
+		return Bindings.createStringBinding(this::updateText, kibFormat, mibFormat, gibFormat, dataInBytes);
+	}
+
+	private String updateText() {
+		long data = dataInBytes.get();
+		if (data > GIB_THRESHOLD) {
+			double giB = ((double) data) / 1024.0 / 1024.0 / 1024.0;
+			return String.format(gibFormat.get(), giB);
+		} else if (data > MIB_THRESHOLD) {
+			double miB = ((double) data) / 1024.0 / 1024.0;
+			return String.format(mibFormat.get(), miB);
+		} else if (data > KIB_THRESHOLD) {
+			double kiB = ((double) data) / 1024.0;
+			return String.format(kibFormat.get(), kiB);
+		} else {
+			return String.format(byteFormat.get(), data);
+		}
+	}
+
+	public StringProperty byteFormatProperty() { return byteFormat; }
+
+	public String getByteFormat() { return byteFormat.get(); }
+
+	public void setByteFormat(String byteFormat) {
+		this.byteFormat.set(byteFormat);
+	}
+
+	public StringProperty kibFormatProperty() { return kibFormat; }
+
+	public String getKibFormat() { return kibFormat.get(); }
+
+	public void setKibFormat(String kibFormat) {
+		this.kibFormat.set(kibFormat);
+	}
+
+	public StringProperty mibFormatProperty() { return mibFormat; }
+
+	public String getMibFormat() { return mibFormat.get(); }
+
+	public void setMibFormat(String mibFormat) {
+		this.mibFormat.set(mibFormat);
+	}
+
+	public StringProperty gibFormatProperty() { return gibFormat; }
+
+	public String getGibFormat() { return gibFormat.get(); }
+
+	public void setGibFormat(String gibFormat) {
+		this.gibFormat.set(gibFormat);
+	}
+
+	public LongProperty dataInBytesProperty() { return dataInBytes; }
+
+	public long getDataInBytes() {
+		return dataInBytes.get();
+	}
+
+	public void setDataInBytes(long dataInBytes) { this.dataInBytes.set(dataInBytes); }
+
+
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
index cc747b8f6..20218d100 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
@@ -3,15 +3,13 @@ package org.cryptomator.ui.stats;
 import javafx.animation.Animation;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
-import javafx.beans.binding.Bindings;
 import javafx.beans.binding.DoubleBinding;
-import javafx.beans.binding.IntegerBinding;
 import javafx.beans.binding.LongBinding;
+import javafx.beans.property.LongProperty;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.chart.AreaChart;
-import javafx.scene.chart.LineChart;
 import javafx.scene.chart.NumberAxis;
 import javafx.scene.chart.XYChart.Data;
 import javafx.scene.chart.XYChart.Series;
@@ -41,6 +39,10 @@ public class VaultStatisticsController implements FxController {
 	private final DoubleBinding cacheHitRate;
 	private final DoubleBinding cacheHitDregrees;
 	private final DoubleBinding cacheHitPercentage;
+	private final LongBinding totalBytesRead;
+	private final LongBinding totalBytesWritten;
+	private final LongBinding totalBytesEncrypted;
+	private final LongBinding totalBytesDecrypted;
 	/*private final IntegerBinding filesRead;
 	private final IntegerBinding filesWritten;*/
 	private final LongBinding bpsEncrypted;
@@ -63,6 +65,10 @@ public class VaultStatisticsController implements FxController {
 		this.cacheHitRate = WeakBindings.bindDouble(stats.cacheHitRateProperty());
 		this.cacheHitDregrees = cacheHitRate.multiply(-270);
 		this.cacheHitPercentage = cacheHitRate.multiply(100);
+		this.totalBytesRead = WeakBindings.bindLong(stats.toalBytesReadProperty());
+		this.totalBytesWritten = WeakBindings.bindLong(stats.toalBytesWrittenProperty());
+		this.totalBytesDecrypted = WeakBindings.bindLong(stats.totalBytesDecryptedProperty());
+		this.totalBytesEncrypted = WeakBindings.bindLong(stats.totalBytesEncryptedProperty());
 		/*this.filesRead = WeakBindings.bindInterger();
 		this.filesWritten = WeakBindings.bindInterger();*/
 		this.bpsEncrypted = WeakBindings.bindLong(stats.bytesPerSecondEncryptedProperty());
@@ -89,7 +95,7 @@ public class VaultStatisticsController implements FxController {
 	private class IoSamplingAnimationHandler implements EventHandler<ActionEvent> {
 
 		private static final double BYTES_TO_MEGABYTES_FACTOR = 1.0 / IO_SAMPLING_INTERVAL / 1024.0 / 1024.0;
-		
+
 		private long step = IO_SAMPLING_STEPS;
 		private final Series<Number, Number> decryptedBytesRead;
 		private final Series<Number, Number> encryptedBytesWrite;
@@ -114,7 +120,7 @@ public class VaultStatisticsController implements FxController {
 
 			maxBuf[(int) currentStep % IO_SAMPLING_STEPS] = Math.max(decBytes, encBytes);
 			long allTimeMax = Arrays.stream(maxBuf).max().orElse(0l);
-			
+
 			// remove oldest value:
 			decryptedBytesRead.getData().remove(0);
 			encryptedBytesWrite.getData().remove(0);
@@ -122,7 +128,7 @@ public class VaultStatisticsController implements FxController {
 			// add latest value:
 			decryptedBytesRead.getData().add(new Data<>(currentStep, decBytes));
 			encryptedBytesWrite.getData().add(new Data<>(currentStep, encBytes));
-			
+
 			// adjust ranges:
 			readChartXAxis.setLowerBound(currentStep - IO_SAMPLING_STEPS);
 			readChartXAxis.setUpperBound(currentStep);
@@ -155,9 +161,7 @@ public class VaultStatisticsController implements FxController {
 		return cacheHitPercentage;
 	}
 
-	public double getCacheHitPercentage() {
-		return cacheHitPercentage.get();
-	}
+	public double getCacheHitPercentage() { return cacheHitPercentage.get(); }
 
 	public DoubleBinding cacheHitDregreesProperty() {
 		return cacheHitDregrees;
@@ -167,6 +171,22 @@ public class VaultStatisticsController implements FxController {
 		return cacheHitDregrees.get();
 	}
 
+	public LongBinding totalBytesReadProperty() { return totalBytesRead;}
+
+	public long getTotalBytesRead() { return totalBytesRead.get();}
+
+	public LongBinding totalBytesWrittenProperty() { return totalBytesWritten;}
+
+	public long getTotalBytesWritten() { return totalBytesWritten.get();}
+
+	public LongBinding totalBytesEncryptedProperty() {return totalBytesEncrypted;}
+
+	public long getTotalBytesEncrypted() { return totalBytesEncrypted.get();}
+
+	public LongBinding totalBytesDecryptedProperty() {return totalBytesDecrypted;}
+
+	public long getTotalBytesDecrypted() { return totalBytesDecrypted.get();}
+
 	public LongBinding bpsEncryptedProperty() {
 		return bpsEncrypted;
 	}
diff --git a/main/ui/src/main/resources/fxml/stats.fxml b/main/ui/src/main/resources/fxml/stats.fxml
index 85ea52efb..dfeca90af 100644
--- a/main/ui/src/main/resources/fxml/stats.fxml
+++ b/main/ui/src/main/resources/fxml/stats.fxml
@@ -12,10 +12,11 @@
 <?import org.cryptomator.ui.controls.FormattedLabel?>
 <?import org.cryptomator.ui.controls.ThrougputLabel?>
 <?import javafx.scene.Group?>
+<?import org.cryptomator.ui.controls.DataLabel?>
 <HBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.stats.VaultStatisticsController"
-	  prefWidth="600.0" spacing="12">
+	  prefWidth="1000.0" spacing="12">
 	<padding>
 		<Insets topRightBottomLeft="12"/>
 	</padding>
@@ -35,7 +36,7 @@
 	</VBox>
 
 	<!-- Read -->
-	<VBox prefWidth="300" prefHeight="200">
+	<VBox prefWidth="400" prefHeight="200">
 		<HBox spacing="12" alignment="CENTER">
 			<Label styleClass="label-large" text="%stats.readDataLabel"/>
 			<ThrougputLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
@@ -53,15 +54,26 @@
 			</cursor>
 		</AreaChart>
 		<VBox spacing="12" alignment="CENTER">
-			<FormattedLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" format="%stats.totalMiB" arg1="${controller.bpsRead}"/>
-			<!-- <FormattedLabel styleClass="label-large" alignment="CENTER_LEFT" minWidth="60" format="%stats.totalReads" arg1="${controller.}"/> -->
-			<!--<FormattedLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" format="%stats.totalMiB" arg1="${controller.bpsEncrypted}"/>-->
+			<HBox alignment="CENTER">
+				<Label styleClass="label-large" text="%stats.totalMiBRead"/>
+				<DataLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" byteFormat="%stats.data.bytes" kibFormat="%stats.data.kiB" mibFormat="%stats.data.miB" gibFormat="%stats.data.giB"
+						   dataInBytes="${controller.totalBytesRead}"/>
+			</HBox>
+			<HBox alignment="CENTER">
+				<Label styleClass="label-large" text="%stats.totalMiBDecrypted"/>
+				<DataLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60"  byteFormat="%stats.data.bytes" kibFormat="%stats.data.kiB" mibFormat="%stats.data.miB" gibFormat="%stats.data.giB"
+						   dataInBytes="${controller.totalBytesDecrypted}"/>
+			</HBox>
 
+			<!--
+			<FormattedLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" format="%stats.totalMiBRead" arg1="${controller.totalBytesRead}"/>
+			<FormattedLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" format="%stats.totalMiBDecrypted" arg1="${controller.totalBytesDecrypted}"/>
+			-->
 		</VBox>
 	</VBox>
 
 	<!-- Write -->
-	<VBox prefWidth="200" prefHeight="200">
+	<VBox prefWidth="400" prefHeight="200">
 		<HBox alignment="CENTER">
 			<Label styleClass="label-large" text="%stats.writtenDataLabel"/>
 			<ThrougputLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
@@ -79,8 +91,16 @@
 			</cursor>
 		</AreaChart>
 		<VBox spacing="12" alignment="CENTER">
-			<FormattedLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" format="%stats.totalMiB" arg1="${controller.bpsWritten}"/>
-			<!-- <FormattedLabel styleClass="label-large" alignment="CENTER_LEFT" minWidth="60" format="%stats.totalWrites" arg1="${controller.}"/> -->
+			<HBox alignment="CENTER">
+				<Label styleClass="label-large" text="%stats.totalMiBWritten"/>
+				<DataLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" byteFormat="%stats.data.bytes" kibFormat="%stats.data.kiB" mibFormat="%stats.data.miB" gibFormat="%stats.data.giB"
+						   dataInBytes="${controller.totalBytesWritten}"/>
+			</HBox>
+			<HBox alignment="CENTER">
+				<Label styleClass="label-large" text="%stats.totalMiBEncrypted"/>
+				<DataLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" byteFormat="%stats.data.bytes" kibFormat="%stats.data.kiB" mibFormat="%stats.data.miB" gibFormat="%stats.data.giB"
+						   dataInBytes="${controller.totalBytesEncrypted}"/>
+			</HBox>
 		</VBox>
 
 	</VBox>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 1209e5485..3e30c16fb 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -165,9 +165,17 @@ stats.title=Statistics for %s
 stats.readDataLabel=Read Data
 stats.writtenDataLabel=Written Data
 stats.cacheHitRate=Cache Hit Rate
-stats.totalMiB=Total: %s MiB
+stats.totalMiBRead=Total Read: 
+stats.totalMiBWritten=Total Written: 
+stats.totalMiBEncrypted=Total Encypted: 
+stats.totalMiBDecrypted=Total Decrypted: 
 stats.totalReads=Number of Reads: %s
 stats.totalWrites=Number of Writes: %s
+stats.data.bytes=%s Bytes
+stats.data.kiB=%.1f KiB
+stats.data.miB=%.1f MiB
+stats.data.giB=%.1f GiB
+
 
 # Main Window
 main.closeBtn.tooltip=Close

From 158677bd54634e47afd4ca099207472b807c81ce Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Tue, 21 Jul 2020 11:10:05 +0200
Subject: [PATCH 13/33] Using new methods from CryptoFs to get correct
 statistics

---
 .../cryptomator/common/vaults/VaultStats.java | 24 ++++++++++++-------
 .../ui/stats/VaultStatisticsController.java   | 16 +++++++++----
 main/ui/src/main/resources/fxml/stats.fxml    | 10 ++++----
 .../main/resources/i18n/strings.properties    |  4 ++--
 4 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
index fcb3b5cce..7b83a8a8c 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
@@ -37,8 +37,8 @@ public class VaultStats {
 	private final LongProperty toalBytesWritten = new SimpleLongProperty();
 	private final LongProperty totalBytesEncrypted = new SimpleLongProperty();
 	private final LongProperty totalBytesDecrypted = new SimpleLongProperty();
-	//private final IntegerProperty filesRead = new SimpleIntegerProperty();
-	//private final IntegerProperty filesWritten = new SimpleIntegerProperty();
+	private final LongProperty filesRead = new SimpleLongProperty();
+	private final LongProperty filesWritten = new SimpleLongProperty();
 
 	@Inject
 	VaultStats(AtomicReference<CryptoFileSystem> fs, ObjectProperty<VaultState> state, ExecutorService executor) {
@@ -69,10 +69,12 @@ public class VaultStats {
 		cacheHitRate.set(stats.map(this::getCacheHitRate).orElse(0.0));
 		bytesPerSecondDecrypted.set(stats.map(CryptoFileSystemStats::pollBytesDecrypted).orElse(0l));
 		bytesPerSecondEncrypted.set(stats.map(CryptoFileSystemStats::pollBytesEncrypted).orElse(0l));
-		toalBytesRead.set(stats.map(CryptoFileSystemStats::pollBytesRead).orElse(0l) + toalBytesRead.get());
-		toalBytesWritten.set(stats.map(CryptoFileSystemStats::pollBytesWritten).orElse(0l) + toalBytesWritten.get());
-		totalBytesEncrypted.set(stats.map(CryptoFileSystemStats::pollBytesEncrypted).orElse(0l) + totalBytesEncrypted.get());
-		totalBytesDecrypted.set(stats.map(CryptoFileSystemStats::pollBytesDecrypted).orElse(0l) + totalBytesDecrypted.get());
+		toalBytesRead.set(stats.map(CryptoFileSystemStats::pollTotalBytesRead).orElse(0l));
+		toalBytesWritten.set(stats.map(CryptoFileSystemStats::pollTotalBytesWritten).orElse(0l));
+		totalBytesEncrypted.set(stats.map(CryptoFileSystemStats::pollTotalBytesEncrypted).orElse(0l));
+		totalBytesDecrypted.set(stats.map(CryptoFileSystemStats::pollTotalBytesDecrypted).orElse(0l));
+		filesRead.set(stats.map(CryptoFileSystemStats::pollAmountOfFilesRead).orElse(0l));
+		filesWritten.set(stats.map(CryptoFileSystemStats::pollAmountOfFilesWritten).orElse(0l));
 
 	}
 
@@ -140,9 +142,7 @@ public class VaultStats {
 		return bytesPerSecondDecrypted.get();
 	}
 
-	public DoubleProperty cacheHitRateProperty() {
-		return cacheHitRate;
-	}
+	public DoubleProperty cacheHitRateProperty() { return cacheHitRate; }
 
 	public double getCacheHitRate() {
 		return cacheHitRate.get();
@@ -164,5 +164,11 @@ public class VaultStats {
 
 	public long getTotalBytesDecrypted() { return totalBytesDecrypted.get();}
 
+	public LongProperty filesRead() { return filesRead;}
 
+	public long getFilesRead() { return filesRead.get();}
+
+	public LongProperty filesWritten() {return filesWritten;}
+
+	public long getFilesWritten() {return filesWritten.get();}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
index 20218d100..9397c2686 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
@@ -43,8 +43,8 @@ public class VaultStatisticsController implements FxController {
 	private final LongBinding totalBytesWritten;
 	private final LongBinding totalBytesEncrypted;
 	private final LongBinding totalBytesDecrypted;
-	/*private final IntegerBinding filesRead;
-	private final IntegerBinding filesWritten;*/
+	private final LongBinding filesRead;
+	private final LongBinding filesWritten;
 	private final LongBinding bpsEncrypted;
 	private final LongBinding bpsDecrypted;
 
@@ -69,8 +69,8 @@ public class VaultStatisticsController implements FxController {
 		this.totalBytesWritten = WeakBindings.bindLong(stats.toalBytesWrittenProperty());
 		this.totalBytesDecrypted = WeakBindings.bindLong(stats.totalBytesDecryptedProperty());
 		this.totalBytesEncrypted = WeakBindings.bindLong(stats.totalBytesEncryptedProperty());
-		/*this.filesRead = WeakBindings.bindInterger();
-		this.filesWritten = WeakBindings.bindInterger();*/
+		this.filesRead = WeakBindings.bindLong(stats.filesRead());
+		this.filesWritten = WeakBindings.bindLong(stats.filesWritten());
 		this.bpsEncrypted = WeakBindings.bindLong(stats.bytesPerSecondEncryptedProperty());
 		this.bpsDecrypted = WeakBindings.bindLong(stats.bytesPerSecondDecryptedProperty());
 
@@ -202,4 +202,12 @@ public class VaultStatisticsController implements FxController {
 	public long getBpsDecrypted() {
 		return bpsDecrypted.get();
 	}
+
+	public LongBinding filesReadProperty() { return filesRead;}
+
+	public long getFilesRead() { return filesRead.get();}
+
+	public LongBinding filesWrittenProperty() {return filesWritten;}
+
+	public long getFilesWritten() {return filesWritten.get();}
 }
diff --git a/main/ui/src/main/resources/fxml/stats.fxml b/main/ui/src/main/resources/fxml/stats.fxml
index dfeca90af..75482e2ab 100644
--- a/main/ui/src/main/resources/fxml/stats.fxml
+++ b/main/ui/src/main/resources/fxml/stats.fxml
@@ -61,15 +61,13 @@
 			</HBox>
 			<HBox alignment="CENTER">
 				<Label styleClass="label-large" text="%stats.totalMiBDecrypted"/>
-				<DataLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60"  byteFormat="%stats.data.bytes" kibFormat="%stats.data.kiB" mibFormat="%stats.data.miB" gibFormat="%stats.data.giB"
+				<DataLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" byteFormat="%stats.data.bytes" kibFormat="%stats.data.kiB" mibFormat="%stats.data.miB" gibFormat="%stats.data.giB"
 						   dataInBytes="${controller.totalBytesDecrypted}"/>
 			</HBox>
+			<FormattedLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" format="%stats.totalReads" arg1="${controller.filesRead}"/>
 
-			<!--
-			<FormattedLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" format="%stats.totalMiBRead" arg1="${controller.totalBytesRead}"/>
-			<FormattedLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" format="%stats.totalMiBDecrypted" arg1="${controller.totalBytesDecrypted}"/>
-			-->
 		</VBox>
+
 	</VBox>
 
 	<!-- Write -->
@@ -101,6 +99,8 @@
 				<DataLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" byteFormat="%stats.data.bytes" kibFormat="%stats.data.kiB" mibFormat="%stats.data.miB" gibFormat="%stats.data.giB"
 						   dataInBytes="${controller.totalBytesEncrypted}"/>
 			</HBox>
+			<FormattedLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" format="%stats.totalWrites" arg1="${controller.filesWritten}"/>
+
 		</VBox>
 
 	</VBox>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 3e30c16fb..4a03ffb21 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -169,8 +169,8 @@ stats.totalMiBRead=Total Read:
 stats.totalMiBWritten=Total Written: 
 stats.totalMiBEncrypted=Total Encypted: 
 stats.totalMiBDecrypted=Total Decrypted: 
-stats.totalReads=Number of Reads: %s
-stats.totalWrites=Number of Writes: %s
+stats.totalReads=%s Files Read
+stats.totalWrites=%s Files Written
 stats.data.bytes=%s Bytes
 stats.data.kiB=%.1f KiB
 stats.data.miB=%.1f MiB

From 00dd67e345524df0cbaee2407d5fde296d2929ab Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Tue, 21 Jul 2020 15:16:53 +0200
Subject: [PATCH 14/33] Refactoring

---
 .../cryptomator/common/vaults/VaultStats.java | 20 +++++++++----------
 main/ui/src/main/resources/fxml/stats.fxml    |  6 +++---
 .../resources/fxml/vault_detail_unlocked.fxml |  1 -
 .../main/resources/i18n/strings.properties    |  4 ++--
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
index 7b83a8a8c..c3b3cc5ab 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
@@ -64,17 +64,17 @@ public class VaultStats {
 
 	private void updateStats(Optional<CryptoFileSystemStats> stats) {
 		assert Platform.isFxApplicationThread();
-		bytesPerSecondRead.set(stats.map(CryptoFileSystemStats::pollBytesRead).orElse(0l));
-		bytesPerSecondWritten.set(stats.map(CryptoFileSystemStats::pollBytesWritten).orElse(0l));
+		bytesPerSecondRead.set(stats.map(CryptoFileSystemStats::pollBytesRead).orElse(0L));
+		bytesPerSecondWritten.set(stats.map(CryptoFileSystemStats::pollBytesWritten).orElse(0L));
 		cacheHitRate.set(stats.map(this::getCacheHitRate).orElse(0.0));
-		bytesPerSecondDecrypted.set(stats.map(CryptoFileSystemStats::pollBytesDecrypted).orElse(0l));
-		bytesPerSecondEncrypted.set(stats.map(CryptoFileSystemStats::pollBytesEncrypted).orElse(0l));
-		toalBytesRead.set(stats.map(CryptoFileSystemStats::pollTotalBytesRead).orElse(0l));
-		toalBytesWritten.set(stats.map(CryptoFileSystemStats::pollTotalBytesWritten).orElse(0l));
-		totalBytesEncrypted.set(stats.map(CryptoFileSystemStats::pollTotalBytesEncrypted).orElse(0l));
-		totalBytesDecrypted.set(stats.map(CryptoFileSystemStats::pollTotalBytesDecrypted).orElse(0l));
-		filesRead.set(stats.map(CryptoFileSystemStats::pollAmountOfFilesRead).orElse(0l));
-		filesWritten.set(stats.map(CryptoFileSystemStats::pollAmountOfFilesWritten).orElse(0l));
+		bytesPerSecondDecrypted.set(stats.map(CryptoFileSystemStats::pollBytesDecrypted).orElse(0L));
+		bytesPerSecondEncrypted.set(stats.map(CryptoFileSystemStats::pollBytesEncrypted).orElse(0L));
+		toalBytesRead.set(stats.map(CryptoFileSystemStats::pollTotalBytesRead).orElse(0L));
+		toalBytesWritten.set(stats.map(CryptoFileSystemStats::pollTotalBytesWritten).orElse(0L));
+		totalBytesEncrypted.set(stats.map(CryptoFileSystemStats::pollTotalBytesEncrypted).orElse(0L));
+		totalBytesDecrypted.set(stats.map(CryptoFileSystemStats::pollTotalBytesDecrypted).orElse(0L));
+		filesRead.set(stats.map(CryptoFileSystemStats::pollAmountOfAccessesRead).orElse(0L));
+		filesWritten.set(stats.map(CryptoFileSystemStats::pollAmountOfAccessesWritten).orElse(0L));
 
 	}
 
diff --git a/main/ui/src/main/resources/fxml/stats.fxml b/main/ui/src/main/resources/fxml/stats.fxml
index 75482e2ab..97446ac70 100644
--- a/main/ui/src/main/resources/fxml/stats.fxml
+++ b/main/ui/src/main/resources/fxml/stats.fxml
@@ -16,7 +16,7 @@
 <HBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.stats.VaultStatisticsController"
-	  prefWidth="1000.0" spacing="12">
+	  prefWidth="800.0" spacing="12">
 	<padding>
 		<Insets topRightBottomLeft="12"/>
 	</padding>
@@ -36,7 +36,7 @@
 	</VBox>
 
 	<!-- Read -->
-	<VBox prefWidth="400" prefHeight="200">
+	<VBox prefWidth="300" prefHeight="300">
 		<HBox spacing="12" alignment="CENTER">
 			<Label styleClass="label-large" text="%stats.readDataLabel"/>
 			<ThrougputLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
@@ -71,7 +71,7 @@
 	</VBox>
 
 	<!-- Write -->
-	<VBox prefWidth="400" prefHeight="200">
+	<VBox prefWidth="300" prefHeight="300">
 		<HBox alignment="CENTER">
 			<Label styleClass="label-large" text="%stats.writtenDataLabel"/>
 			<ThrougputLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
diff --git a/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml b/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
index fbc257e56..9f360afcf 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
@@ -5,7 +5,6 @@
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import org.cryptomator.ui.controls.ThrougputLabel?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultDetailUnlockedController"
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 4a03ffb21..859186671 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -169,8 +169,8 @@ stats.totalMiBRead=Total Read:
 stats.totalMiBWritten=Total Written: 
 stats.totalMiBEncrypted=Total Encypted: 
 stats.totalMiBDecrypted=Total Decrypted: 
-stats.totalReads=%s Files Read
-stats.totalWrites=%s Files Written
+stats.totalReads=%s Number of Reads
+stats.totalWrites=%s Number of Writes
 stats.data.bytes=%s Bytes
 stats.data.kiB=%.1f KiB
 stats.data.miB=%.1f MiB

From 65de6fef9b3083dafc3cf5dc7f4967a3b4f07a22 Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Tue, 11 Aug 2020 17:32:39 +0200
Subject: [PATCH 15/33] Allowing only one io-stats window per vault to be open
 at the same time.

---
 .../java/org/cryptomator/common/vaults/Vault.java   | 13 +++++++++++++
 .../mainwindow/VaultDetailUnlockedController.java   |  8 +++++++-
 .../cryptomator/ui/stats/VaultStatisticsModule.java |  1 +
 3 files changed, 21 insertions(+), 1 deletion(-)

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 bc461c1d9..4a8d1e565 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
@@ -13,7 +13,9 @@ import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.binding.StringBinding;
+import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.LazyInitializer;
 import org.cryptomator.common.settings.VaultSettings;
@@ -66,6 +68,7 @@ public class Vault {
 	private final BooleanBinding unknownError;
 	private final StringBinding accessPoint;
 	private final BooleanBinding accessPointPresent;
+	private final BooleanProperty showingStats;
 
 	private volatile Volume volume;
 
@@ -88,6 +91,7 @@ public class Vault {
 		this.unknownError = Bindings.createBooleanBinding(this::isUnknownError, state);
 		this.accessPoint = Bindings.createStringBinding(this::getAccessPoint, state);
 		this.accessPointPresent = this.accessPoint.isNotEmpty();
+		this.showingStats = new SimpleBooleanProperty(false);
 	}
 
 	// ******************************************************************************
@@ -270,6 +274,15 @@ public class Vault {
 		}
 	}
 
+	public BooleanProperty showingStatsProperty() {
+		return showingStats;
+	}
+
+	public boolean isShowingStats() {
+		return accessPointPresent.get();
+	}
+
+
 	// ******************************************************************************
 	// Getter/Setter
 	// *******************************************************************************/
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
index 7f64cf7e5..93525a8b4 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
@@ -1,5 +1,6 @@
 package org.cryptomator.ui.mainwindow;
 
+import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.fxml.FXML;
@@ -37,7 +38,12 @@ public class VaultDetailUnlockedController implements FxController {
 
 	@FXML
 	public void showVaultStatistics() {
-		vaultStatisticsWindow.vault(vault.get()).build().showVaultStatisticsWindow();
+		//vaultStatisticsWindow.build()
+		BooleanProperty showingStats = vault.get().showingStatsProperty();
+		if (!showingStats.get()) {
+			vaultStatisticsWindow.vault(vault.get()).build().showVaultStatisticsWindow();
+			showingStats.setValue(true);
+		}
 	}
 
 	/* Getter/Setter */
diff --git a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java
index 1d3b1eeab..e3319a66a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java
@@ -53,6 +53,7 @@ abstract class VaultStatisticsModule {
 				}
 			}
 		});
+		stage.setOnCloseRequest(windowEvent -> vault.showingStatsProperty().setValue(false));
 		return stage;
 	}
 

From ee81dca71c8615b9ae8e1b5d1280a4bdf1e36f72 Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Wed, 26 Aug 2020 17:23:39 +0200
Subject: [PATCH 16/33] Nice implementation of only one stats window per vault

---
 .../VaultDetailUnlockedController.java         | 18 +++++++++++-------
 .../ui/stats/VaultStatisticsComponent.java     |  1 +
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
index 93525a8b4..dd386ed53 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
@@ -1,6 +1,8 @@
 package org.cryptomator.ui.mainwindow;
 
-import javafx.beans.property.BooleanProperty;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.fxml.FXML;
@@ -16,15 +18,22 @@ public class VaultDetailUnlockedController implements FxController {
 
 	private final ReadOnlyObjectProperty<Vault> vault;
 	private final VaultService vaultService;
+	private final LoadingCache<Vault, VaultStatisticsComponent> vaultStatisticsWindows;
 	private final VaultStatisticsComponent.Builder vaultStatisticsWindow;
 
 	@Inject
 	public VaultDetailUnlockedController(ObjectProperty<Vault> vault, VaultService vaultService, VaultStatisticsComponent.Builder vaultStatisticsWindow) {
 		this.vault = vault;
 		this.vaultService = vaultService;
+		this.vaultStatisticsWindows = CacheBuilder.newBuilder().build(CacheLoader.from(this::provideVaultStatisticsComponent));
+		//TODO make the binding a weak Binding via weakValues
 		this.vaultStatisticsWindow = vaultStatisticsWindow;
 	}
 
+	private VaultStatisticsComponent provideVaultStatisticsComponent(Vault vault) {
+		return vaultStatisticsWindow.vault(vault).build();
+	}
+
 	@FXML
 	public void revealAccessLocation() {
 		vaultService.reveal(vault.get());
@@ -38,12 +47,7 @@ public class VaultDetailUnlockedController implements FxController {
 
 	@FXML
 	public void showVaultStatistics() {
-		//vaultStatisticsWindow.build()
-		BooleanProperty showingStats = vault.get().showingStatsProperty();
-		if (!showingStats.get()) {
-			vaultStatisticsWindow.vault(vault.get()).build().showVaultStatisticsWindow();
-			showingStats.setValue(true);
-		}
+		vaultStatisticsWindows.getUnchecked(vault.get()).showVaultStatisticsWindow();
 	}
 
 	/* Getter/Setter */
diff --git a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsComponent.java b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsComponent.java
index 18c596793..8d48ef52e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsComponent.java
@@ -24,6 +24,7 @@ public interface VaultStatisticsComponent {
 		stage.setScene(scene().get());
 		stage.sizeToScene();
 		stage.show();
+		stage.requestFocus();
 	}
 
 	@Subcomponent.Builder

From 343794c1fee7a657a2b11c7c54ca5bfb93fd64f0 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Thu, 5 Nov 2020 17:03:35 +0100
Subject: [PATCH 17/33] Redo "Added UI error messages"

This reverts commit d331c302
---
 .../preferences/GeneralPreferencesController.java | 15 ++++++++++++++-
 .../RecoveryKeyCreationController.java            |  8 +++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
index 208605f51..4e551afce 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
@@ -1,12 +1,16 @@
 package org.cryptomator.ui.preferences;
 
+import dagger.Lazy;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.KeychainBackend;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.UiTheme;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
+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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -19,11 +23,13 @@ import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
 import javafx.geometry.NodeOrientation;
+import javafx.scene.Scene;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
+import javafx.stage.Stage;
 import javafx.util.StringConverter;
 import java.util.Arrays;
 import java.util.Optional;
@@ -37,6 +43,7 @@ public class GeneralPreferencesController implements FxController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(GeneralPreferencesController.class);
 
+	private final Stage window;
 	private final Settings settings;
 	private final boolean trayMenuSupported;
 	private final Optional<AutoStartStrategy> autoStartStrategy;
@@ -47,6 +54,8 @@ public class GeneralPreferencesController implements FxController {
 	private final Application application;
 	private final Environment environment;
 	private final Set<KeychainAccessProvider> keychainAccessProviders;
+	private final Lazy<Scene> preferencesScene;
+	private final ErrorComponent.Builder errorComponent;
 	public ChoiceBox<UiTheme> themeChoiceBox;
 	public ChoiceBox<KeychainBackend> keychainBackendChoiceBox;
 	public CheckBox startHiddenCheckbox;
@@ -57,7 +66,8 @@ public class GeneralPreferencesController implements FxController {
 	public RadioButton nodeOrientationRtl;
 
 	@Inject
-	GeneralPreferencesController(Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional<AutoStartStrategy> autoStartStrategy, Set<KeychainAccessProvider> keychainAccessProviders, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle, Application application, Environment environment) {
+	GeneralPreferencesController(@PreferencesWindow Stage window, Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional<AutoStartStrategy> autoStartStrategy, Set<KeychainAccessProvider> keychainAccessProviders, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle, Application application, Environment environment, @FxmlScene(FxmlFile.PREFERENCES) Lazy<Scene> preferencesScene, ErrorComponent.Builder errorComponent) {
+		this.window = window;
 		this.settings = settings;
 		this.trayMenuSupported = trayMenuSupported;
 		this.autoStartStrategy = autoStartStrategy;
@@ -68,6 +78,8 @@ public class GeneralPreferencesController implements FxController {
 		this.resourceBundle = resourceBundle;
 		this.application = application;
 		this.environment = environment;
+		this.preferencesScene = preferencesScene;
+		this.errorComponent = errorComponent;
 	}
 
 	@FXML
@@ -129,6 +141,7 @@ public class GeneralPreferencesController implements FxController {
 			toggleTask.setOnFailed(event -> {
 				autoStartCheckbox.setSelected(!enableAutoStart); // restore previous state
 				LOG.error("Failed to toggle autostart.", event.getSource().getException());
+				errorComponent.cause(event.getSource().getException()).window(window).returnToScene(preferencesScene.get()).build().showErrorScene();
 			});
 			executor.execute(toggleTask);
 		});
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
index de756d899..0e50c5e8a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
@@ -4,6 +4,7 @@ import dagger.Lazy;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
 import org.cryptomator.ui.common.Animations;
+import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
@@ -31,16 +32,20 @@ public class RecoveryKeyCreationController implements FxController {
 	private final ExecutorService executor;
 	private final RecoveryKeyFactory recoveryKeyFactory;
 	private final StringProperty recoveryKeyProperty;
+	private final Lazy<Scene> createScene;
+	private final ErrorComponent.Builder errorComponent;
 	public NiceSecurePasswordField passwordField;
 
 	@Inject
-	public RecoveryKeyCreationController(@RecoveryKeyWindow Stage window, @FxmlScene(FxmlFile.RECOVERYKEY_SUCCESS) Lazy<Scene> successScene, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey) {
+	public RecoveryKeyCreationController(@RecoveryKeyWindow Stage window, @FxmlScene(FxmlFile.RECOVERYKEY_SUCCESS) Lazy<Scene> successScene, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, @FxmlScene(FxmlFile.RECOVERYKEY_CREATE) Lazy<Scene> createScene, ErrorComponent.Builder errorComponent) {
 		this.window = window;
 		this.successScene = successScene;
 		this.vault = vault;
 		this.executor = executor;
 		this.recoveryKeyFactory = recoveryKeyFactory;
 		this.recoveryKeyProperty = recoveryKey;
+		this.createScene = createScene;
+		this.errorComponent = errorComponent;
 	}
 
 	@FXML
@@ -59,6 +64,7 @@ public class RecoveryKeyCreationController implements FxController {
 				Animations.createShakeWindowAnimation(window).play();
 			} else {
 				LOG.error("Creation of recovery key failed.", task.getException());
+				errorComponent.cause(task.getException()).window(window).returnToScene(createScene.get()).build().showErrorScene();
 			}
 		});
 		executor.submit(task);

From 313f8b36d2712d637362455cb974a07955c9b2f2 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Thu, 5 Nov 2020 17:11:35 +0100
Subject: [PATCH 18/33] Replaced dependency with call to getter

---
 .../ui/preferences/GeneralPreferencesController.java   | 10 ++--------
 .../ui/recoverykey/RecoveryKeyCreationController.java  |  6 ++----
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
index 4e551afce..496ada2ce 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
@@ -1,6 +1,5 @@
 package org.cryptomator.ui.preferences;
 
-import dagger.Lazy;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.KeychainBackend;
@@ -9,8 +8,6 @@ import org.cryptomator.common.settings.UiTheme;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
 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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,7 +20,6 @@ import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
 import javafx.geometry.NodeOrientation;
-import javafx.scene.Scene;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.RadioButton;
@@ -54,7 +50,6 @@ public class GeneralPreferencesController implements FxController {
 	private final Application application;
 	private final Environment environment;
 	private final Set<KeychainAccessProvider> keychainAccessProviders;
-	private final Lazy<Scene> preferencesScene;
 	private final ErrorComponent.Builder errorComponent;
 	public ChoiceBox<UiTheme> themeChoiceBox;
 	public ChoiceBox<KeychainBackend> keychainBackendChoiceBox;
@@ -66,7 +61,7 @@ public class GeneralPreferencesController implements FxController {
 	public RadioButton nodeOrientationRtl;
 
 	@Inject
-	GeneralPreferencesController(@PreferencesWindow Stage window, Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional<AutoStartStrategy> autoStartStrategy, Set<KeychainAccessProvider> keychainAccessProviders, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle, Application application, Environment environment, @FxmlScene(FxmlFile.PREFERENCES) Lazy<Scene> preferencesScene, ErrorComponent.Builder errorComponent) {
+	GeneralPreferencesController(@PreferencesWindow Stage window, Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional<AutoStartStrategy> autoStartStrategy, Set<KeychainAccessProvider> keychainAccessProviders, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle, Application application, Environment environment, ErrorComponent.Builder errorComponent) {
 		this.window = window;
 		this.settings = settings;
 		this.trayMenuSupported = trayMenuSupported;
@@ -78,7 +73,6 @@ public class GeneralPreferencesController implements FxController {
 		this.resourceBundle = resourceBundle;
 		this.application = application;
 		this.environment = environment;
-		this.preferencesScene = preferencesScene;
 		this.errorComponent = errorComponent;
 	}
 
@@ -141,7 +135,7 @@ public class GeneralPreferencesController implements FxController {
 			toggleTask.setOnFailed(event -> {
 				autoStartCheckbox.setSelected(!enableAutoStart); // restore previous state
 				LOG.error("Failed to toggle autostart.", event.getSource().getException());
-				errorComponent.cause(event.getSource().getException()).window(window).returnToScene(preferencesScene.get()).build().showErrorScene();
+				errorComponent.cause(event.getSource().getException()).window(window).returnToScene(window.getScene()).build().showErrorScene();
 			});
 			executor.execute(toggleTask);
 		});
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
index 0e50c5e8a..902f2cd50 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
@@ -32,19 +32,17 @@ public class RecoveryKeyCreationController implements FxController {
 	private final ExecutorService executor;
 	private final RecoveryKeyFactory recoveryKeyFactory;
 	private final StringProperty recoveryKeyProperty;
-	private final Lazy<Scene> createScene;
 	private final ErrorComponent.Builder errorComponent;
 	public NiceSecurePasswordField passwordField;
 
 	@Inject
-	public RecoveryKeyCreationController(@RecoveryKeyWindow Stage window, @FxmlScene(FxmlFile.RECOVERYKEY_SUCCESS) Lazy<Scene> successScene, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, @FxmlScene(FxmlFile.RECOVERYKEY_CREATE) Lazy<Scene> createScene, ErrorComponent.Builder errorComponent) {
+	public RecoveryKeyCreationController(@RecoveryKeyWindow Stage window, @FxmlScene(FxmlFile.RECOVERYKEY_SUCCESS) Lazy<Scene> successScene, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, ErrorComponent.Builder errorComponent) {
 		this.window = window;
 		this.successScene = successScene;
 		this.vault = vault;
 		this.executor = executor;
 		this.recoveryKeyFactory = recoveryKeyFactory;
 		this.recoveryKeyProperty = recoveryKey;
-		this.createScene = createScene;
 		this.errorComponent = errorComponent;
 	}
 
@@ -64,7 +62,7 @@ public class RecoveryKeyCreationController implements FxController {
 				Animations.createShakeWindowAnimation(window).play();
 			} else {
 				LOG.error("Creation of recovery key failed.", task.getException());
-				errorComponent.cause(task.getException()).window(window).returnToScene(createScene.get()).build().showErrorScene();
+				errorComponent.cause(task.getException()).window(window).returnToScene(window.getScene()).build().showErrorScene();
 			}
 		});
 		executor.submit(task);

From 3a5937b35fb6bd7ba92d8adf7f2f636e7e5d1d08 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Fri, 6 Nov 2020 17:09:44 +0100
Subject: [PATCH 19/33] Added runLater to implementation of
 ErrorComponent#showErrorScene()

---
 .../java/org/cryptomator/ui/common/ErrorComponent.java   | 9 +++++++++
 .../java/org/cryptomator/ui/unlock/UnlockWorkflow.java   | 4 +---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java
index 6a50ee44a..285270b4c 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java
@@ -4,6 +4,7 @@ import dagger.BindsInstance;
 import dagger.Subcomponent;
 
 import javax.annotation.Nullable;
+import javafx.application.Platform;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
@@ -16,6 +17,14 @@ public interface ErrorComponent {
 	Scene scene();
 
 	default void showErrorScene() {
+		if (Platform.isFxApplicationThread()) {
+			show();
+		} else {
+			Platform.runLater(this::show);
+		}
+	}
+
+	private void show() {
 		Stage stage = window();
 		stage.setScene(scene());
 		stage.show();
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
index 9b95103ad..8cb7e0752 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
@@ -209,9 +209,7 @@ public class UnlockWorkflow extends Task<Boolean> {
 
 	private void handleGenericError(Throwable e) {
 		LOG.error("Unlock failed for technical reasons.", e);
-		Platform.runLater(() -> {
-			errorComponent.cause(e).window(window).returnToScene(window.getScene()).build().showErrorScene();
-		});
+		errorComponent.cause(e).window(window).returnToScene(window.getScene()).build().showErrorScene();
 	}
 
 	private void wipePassword(char[] pw) {

From d26147a34afcd6254bef5ed724979581f130c379 Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Sun, 8 Nov 2020 20:51:47 +0100
Subject: [PATCH 20/33] bumped up depencency of cryptofs to 1.9.13

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

diff --git a/main/pom.xml b/main/pom.xml
index 5f0d7e5ea..c50476dd2 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -24,7 +24,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>1.9.12</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>1.9.13</cryptomator.cryptofs.version>
 		<cryptomator.jni.version>2.2.2</cryptomator.jni.version>
 		<cryptomator.fuse.version>1.2.3</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.1.15</cryptomator.dokany.version>

From 459f2ea2c3b335b6a83c31ff3b42825a42a47878 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 6 Nov 2020 17:42:45 +0100
Subject: [PATCH 21/33] Updating Dokany-nio-adapter dependency

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

diff --git a/main/pom.xml b/main/pom.xml
index ae8070a29..d52c5aa50 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -30,7 +30,7 @@
 		<cryptomator.integrations.mac.version>0.1.0-beta3</cryptomator.integrations.mac.version>
 		<cryptomator.integrations.linux.version>0.1.0-beta1</cryptomator.integrations.linux.version>
 		<cryptomator.fuse.version>1.2.5</cryptomator.fuse.version>
-		<cryptomator.dokany.version>1.1.15</cryptomator.dokany.version>
+		<cryptomator.dokany.version>1.2.0</cryptomator.dokany.version>
 		<cryptomator.webdav.version>1.0.12</cryptomator.webdav.version>
 
 		<!-- 3rd party dependencies -->

From 5b55318e5254078c642331a277a108ba3fb08129 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 6 Nov 2020 18:45:14 +0100
Subject: [PATCH 22/33] Bumping integrations-linux dependency, removing unused
 legacy property

closes #1308
---
 main/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index d52c5aa50..ba75f0da6 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -28,7 +28,7 @@
 		<cryptomator.integrations.version>0.1.6</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>0.1.0-beta1</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>0.1.0-beta3</cryptomator.integrations.mac.version>
-		<cryptomator.integrations.linux.version>0.1.0-beta1</cryptomator.integrations.linux.version>
+		<cryptomator.integrations.linux.version>0.1.0-beta2</cryptomator.integrations.linux.version>
 		<cryptomator.fuse.version>1.2.5</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.2.0</cryptomator.dokany.version>
 		<cryptomator.webdav.version>1.0.12</cryptomator.webdav.version>
@@ -36,7 +36,6 @@
 		<!-- 3rd party dependencies -->
 		<javafx.version>14</javafx.version>
 		<commons-lang3.version>3.11</commons-lang3.version>
-		<secret-service.version>1.1.0</secret-service.version>
 		<kdewallet.version>1.1.1</kdewallet.version>
 		<jwt.version>3.10.3</jwt.version>
 		<easybind.version>2.1.0</easybind.version>

From 2f8d4568fc7a23b853cb0ec76e5896a68cf1f5d8 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 6 Nov 2020 17:41:42 +0100
Subject: [PATCH 23/33] Updating CryptoFS Dependency.

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

diff --git a/main/pom.xml b/main/pom.xml
index ba75f0da6..633127b8c 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -24,7 +24,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>1.9.12</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>1.9.13</cryptomator.cryptofs.version>
 		<cryptomator.integrations.version>0.1.6</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>0.1.0-beta1</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>0.1.0-beta3</cryptomator.integrations.mac.version>

From bcea1a4b32738d650574745a8a2493396fb39a81 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Mon, 9 Nov 2020 11:17:52 +0100
Subject: [PATCH 24/33] Bumping dependencies: * javafx to 15 *
 webdav-nio-server to 1.0.13

---
 main/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index 633127b8c..58602a62d 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -31,10 +31,10 @@
 		<cryptomator.integrations.linux.version>0.1.0-beta2</cryptomator.integrations.linux.version>
 		<cryptomator.fuse.version>1.2.5</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.2.0</cryptomator.dokany.version>
-		<cryptomator.webdav.version>1.0.12</cryptomator.webdav.version>
+		<cryptomator.webdav.version>1.0.13</cryptomator.webdav.version>
 
 		<!-- 3rd party dependencies -->
-		<javafx.version>14</javafx.version>
+		<javafx.version>15</javafx.version>
 		<commons-lang3.version>3.11</commons-lang3.version>
 		<kdewallet.version>1.1.1</kdewallet.version>
 		<jwt.version>3.10.3</jwt.version>

From 48d0aa423c988b78fd10fe8c8d0226718bdeeb2e Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 9 Nov 2020 11:54:15 +0100
Subject: [PATCH 25/33] fixed getter name

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

diff --git a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java
index e3319a66a..14395af24 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsModule.java
@@ -38,7 +38,7 @@ abstract class VaultStatisticsModule {
 	@VaultStatisticsScoped
 	static Stage provideStage(StageFactory factory, ResourceBundle resourceBundle, @VaultStatisticsWindow Vault vault) {
 		Stage stage = factory.create();
-		stage.setTitle(String.format(resourceBundle.getString("stats.title"), vault.getDisplayableName()));
+		stage.setTitle(String.format(resourceBundle.getString("stats.title"), vault.getDisplayName()));
 		stage.setResizable(false);
 		var weakStage = new WeakReference<>(stage);
 		vault.stateProperty().addListener(new ChangeListener<>() {

From d24c478faac99f78bbee4a8bd1ddd4b5b814ae04 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 9 Nov 2020 12:01:38 +0100
Subject: [PATCH 26/33] more dependency updates

---
 main/pom.xml                                  | 17 +++---
 .../main/resources/license/THIRD-PARTY.txt    | 52 +++++++++----------
 2 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index 58602a62d..5989c3276 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -36,18 +36,17 @@
 		<!-- 3rd party dependencies -->
 		<javafx.version>15</javafx.version>
 		<commons-lang3.version>3.11</commons-lang3.version>
-		<kdewallet.version>1.1.1</kdewallet.version>
-		<jwt.version>3.10.3</jwt.version>
+		<jwt.version>3.11.0</jwt.version>
 		<easybind.version>2.1.0</easybind.version>
 		<guava.version>30.0-jre</guava.version>
-		<dagger.version>2.22</dagger.version>
+		<dagger.version>2.29.1</dagger.version>
 		<gson.version>2.8.6</gson.version>
 		<slf4j.version>1.7.30</slf4j.version>
 		<logback.version>1.2.3</logback.version>
 
 		<!-- test dependencies -->
-		<junit.jupiter.version>5.6.2</junit.jupiter.version>
-		<mockito.version>3.3.3</mockito.version>
+		<junit.jupiter.version>5.7.0</junit.jupiter.version>
+		<mockito.version>3.6.0</mockito.version>
 		<hamcrest.version>2.2</hamcrest.version>
 	</properties>
 
@@ -78,11 +77,6 @@
 			</dependency>
 
 			<!-- Cryptomator Libs -->
-			<dependency>
-				<groupId>org.cryptomator</groupId>
-				<artifactId>siv-mode</artifactId>
-				<version>1.4.0</version>
-			</dependency>
 			<dependency>
 				<groupId>org.cryptomator</groupId>
 				<artifactId>cryptofs</artifactId>
@@ -241,6 +235,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
@@ -381,7 +376,7 @@
 				<plugin>
 					<groupId>org.jacoco</groupId>
 					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>0.8.5</version>
+					<version>0.8.6</version>
 					<executions>
 						<execution>
 							<id>prepare-agent</id>
diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt
index 1389d25a1..dedb408c3 100644
--- a/main/ui/src/main/resources/license/THIRD-PARTY.txt
+++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt
@@ -19,7 +19,7 @@ Cryptomator uses 46 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.22 - https://github.com/google/dagger)
+			- Dagger (com.google.dagger:dagger:2.29.1 - 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)
 			- 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.0-jre - https://github.com/google/guava/guava)
@@ -28,19 +28,19 @@ Cryptomator uses 46 third-party dependencies under the following licenses:
 			- Apache Commons CLI (commons-cli:commons-cli:1.4 - http://commons.apache.org/proper/commons-cli/)
 			- Apache Commons IO (commons-io:commons-io:2.6 - http://commons.apache.org/proper/commons-io/)
 			- javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/)
-			- Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna)
-			- Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna)
+			- Java Native Access (net.java.dev.jna:jna:5.5.0 - https://github.com/java-native-access/jna)
+			- Java Native Access Platform (net.java.dev.jna:jna-platform:5.5.0 - https://github.com/java-native-access/jna)
 			- 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.13 - http://hc.apache.org/httpcomponents-core-ga)
 			- Jackrabbit WebDAV Library (org.apache.jackrabbit:jackrabbit-webdav:2.21.3 - http://jackrabbit.apache.org/jackrabbit-webdav/)
-			- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-			- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-			- Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-			- Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-			- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-			- Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-			- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-			- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+			- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.33.v20201020 - https://eclipse.org/jetty/jetty-http)
+			- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.33.v20201020 - https://eclipse.org/jetty/jetty-io)
+			- Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.33.v20201020 - https://eclipse.org/jetty/jetty-security)
+			- Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.33.v20201020 - https://eclipse.org/jetty/jetty-server)
+			- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.33.v20201020 - https://eclipse.org/jetty/jetty-servlet)
+			- Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.33.v20201020 - https://eclipse.org/jetty/jetty-util)
+			- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.33.v20201020 - https://eclipse.org/jetty/jetty-webapp)
+			- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.33.v20201020 - https://eclipse.org/jetty/jetty-xml)
         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/)
@@ -48,30 +48,30 @@ Cryptomator uses 46 third-party dependencies under the following licenses:
 			- 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 :: Http Utility (org.eclipse.jetty:jetty-http:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-			- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-			- Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-			- Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-			- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-			- Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-			- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-			- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+			- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.33.v20201020 - https://eclipse.org/jetty/jetty-http)
+			- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.33.v20201020 - https://eclipse.org/jetty/jetty-io)
+			- Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.33.v20201020 - https://eclipse.org/jetty/jetty-security)
+			- Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.33.v20201020 - https://eclipse.org/jetty/jetty-server)
+			- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.33.v20201020 - https://eclipse.org/jetty/jetty-servlet)
+			- Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.33.v20201020 - https://eclipse.org/jetty/jetty-util)
+			- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.33.v20201020 - https://eclipse.org/jetty/jetty-webapp)
+			- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.33.v20201020 - 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:3.1.0 - http://servlet-spec.java.net)
-			- javafx-base (org.openjfx:javafx-base:14 - https://openjdk.java.net/projects/openjfx/javafx-base/)
-			- javafx-controls (org.openjfx:javafx-controls:14 - https://openjdk.java.net/projects/openjfx/javafx-controls/)
-			- javafx-fxml (org.openjfx:javafx-fxml:14 - https://openjdk.java.net/projects/openjfx/javafx-fxml/)
-			- javafx-graphics (org.openjfx:javafx-graphics:14 - https://openjdk.java.net/projects/openjfx/javafx-graphics/)
+			- javafx-base (org.openjfx:javafx-base:15 - https://openjdk.java.net/projects/openjfx/javafx-base/)
+			- javafx-controls (org.openjfx:javafx-controls:15 - https://openjdk.java.net/projects/openjfx/javafx-controls/)
+			- javafx-fxml (org.openjfx:javafx-fxml:15 - https://openjdk.java.net/projects/openjfx/javafx-fxml/)
+			- javafx-graphics (org.openjfx:javafx-graphics:15 - https://openjdk.java.net/projects/openjfx/javafx-graphics/)
         LGPL 2.1:
 			- jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
-			- Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna)
-			- Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna)
+			- Java Native Access (net.java.dev.jna:jna:5.5.0 - https://github.com/java-native-access/jna)
+			- Java Native Access Platform (net.java.dev.jna:jna-platform:5.5.0 - https://github.com/java-native-access/jna)
         MIT License:
-			- java jwt (com.auth0:java-jwt:3.10.3 - https://github.com/auth0/java-jwt)
+			- java jwt (com.auth0:java-jwt:3.11.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.4 - no url defined)
 			- zxcvbn4j (com.nulab-inc:zxcvbn:1.3.0 - https://github.com/nulab/zxcvbn4j)

From d3fb90bf6d4aebffbef50f82b9d3dbd3d28a1f0d Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 9 Nov 2020 13:05:06 +0100
Subject: [PATCH 27/33] fixed NPE if winDriveLetter is null (on Linux/Mac)

---
 .../cryptomator/ui/vaultoptions/MountOptionsController.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
index 5d65107d0..b638ad889 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
@@ -162,7 +162,9 @@ public class MountOptionsController implements FxController {
 
 		@Override
 		public String toString(String driveLetter) {
-			if (occupiedDriveLetters.contains(driveLetter)) {
+			if (Strings.isNullOrEmpty(driveLetter)) {
+				return "";
+			} else if (occupiedDriveLetters.contains(driveLetter)) {
 				return driveLetter + ": (" + resourceBundle.getString("vaultOptions.mount.winDriveLetterOccupied") + ")";
 			} else {
 				return driveLetter + ":";

From 9a94b6f95e7d306acea46b830095c3b53548bbc5 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 9 Nov 2020 13:10:35 +0100
Subject: [PATCH 28/33] fixed typo

---
 .../ui/stats/VaultStatisticsController.java          | 12 ++++++------
 main/ui/src/main/resources/fxml/stats.fxml           |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
index 9397c2686..f0468c257 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
@@ -37,7 +37,7 @@ public class VaultStatisticsController implements FxController {
 	private final LongBinding bpsRead;
 	private final LongBinding bpsWritten;
 	private final DoubleBinding cacheHitRate;
-	private final DoubleBinding cacheHitDregrees;
+	private final DoubleBinding cacheHitDegrees;
 	private final DoubleBinding cacheHitPercentage;
 	private final LongBinding totalBytesRead;
 	private final LongBinding totalBytesWritten;
@@ -63,7 +63,7 @@ public class VaultStatisticsController implements FxController {
 		this.bpsRead = WeakBindings.bindLong(stats.bytesPerSecondReadProperty());
 		this.bpsWritten = WeakBindings.bindLong(stats.bytesPerSecondWrittenProperty());
 		this.cacheHitRate = WeakBindings.bindDouble(stats.cacheHitRateProperty());
-		this.cacheHitDregrees = cacheHitRate.multiply(-270);
+		this.cacheHitDegrees = cacheHitRate.multiply(-270);
 		this.cacheHitPercentage = cacheHitRate.multiply(100);
 		this.totalBytesRead = WeakBindings.bindLong(stats.toalBytesReadProperty());
 		this.totalBytesWritten = WeakBindings.bindLong(stats.toalBytesWrittenProperty());
@@ -163,12 +163,12 @@ public class VaultStatisticsController implements FxController {
 
 	public double getCacheHitPercentage() { return cacheHitPercentage.get(); }
 
-	public DoubleBinding cacheHitDregreesProperty() {
-		return cacheHitDregrees;
+	public DoubleBinding cacheHitDegreesProperty() {
+		return cacheHitDegrees;
 	}
 
-	public double getCacheHitDregrees() {
-		return cacheHitDregrees.get();
+	public double getCacheHitDegrees() {
+		return cacheHitDegrees.get();
 	}
 
 	public LongBinding totalBytesReadProperty() { return totalBytesRead;}
diff --git a/main/ui/src/main/resources/fxml/stats.fxml b/main/ui/src/main/resources/fxml/stats.fxml
index 97446ac70..f4295a0d1 100644
--- a/main/ui/src/main/resources/fxml/stats.fxml
+++ b/main/ui/src/main/resources/fxml/stats.fxml
@@ -26,7 +26,7 @@
 		<StackPane>
 			<Group>
 				<Arc styleClass="cache-arc-background" centerX="100" centerY="100" radiusX="100" radiusY="100" startAngle="225" length="-270"/>
-				<Arc styleClass="cache-arc-foreground" centerX="100" centerY="100" radiusX="100" radiusY="100" startAngle="225" length="${controller.cacheHitDregrees}"/>
+				<Arc styleClass="cache-arc-foreground" centerX="100" centerY="100" radiusX="100" radiusY="100" startAngle="225" length="${controller.cacheHitDegrees}"/>
 			</Group>
 			<VBox StackPane.alignment="CENTER" alignment="CENTER">
 				<FormattedLabel styleClass="label-large" format="\%1.0f %%" arg1="${controller.cacheHitPercentage}"/>

From 4e9af1c71348300f7f46d462f73b1bcaf91fd3fd Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 9 Nov 2020 13:12:42 +0100
Subject: [PATCH 29/33] cleanup

---
 .../ui/stats/VaultStatisticsController.java    | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
index f0468c257..b149f9559 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
@@ -1,11 +1,16 @@
 package org.cryptomator.ui.stats;
 
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.common.vaults.VaultStats;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.WeakBindings;
+
+import javax.inject.Inject;
 import javafx.animation.Animation;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.beans.binding.DoubleBinding;
 import javafx.beans.binding.LongBinding;
-import javafx.beans.property.LongProperty;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
@@ -15,14 +20,7 @@ import javafx.scene.chart.XYChart.Data;
 import javafx.scene.chart.XYChart.Series;
 import javafx.stage.Stage;
 import javafx.util.Duration;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.common.vaults.VaultStats;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.WeakBindings;
-
-import javax.inject.Inject;
 import java.util.Arrays;
-import java.util.ResourceBundle;
 
 @VaultStatisticsScoped
 public class VaultStatisticsController implements FxController {
@@ -56,7 +54,7 @@ public class VaultStatisticsController implements FxController {
 	public NumberAxis writeChartYAxis;
 
 	@Inject
-	public VaultStatisticsController(@VaultStatisticsWindow Stage window, @VaultStatisticsWindow Vault vault, ResourceBundle resourceBundle) {
+	public VaultStatisticsController(@VaultStatisticsWindow Stage window, @VaultStatisticsWindow Vault vault) {
 		this.stats = vault.getStats();
 		this.readData = new Series<>();
 		this.writeData = new Series<>();
@@ -94,8 +92,6 @@ public class VaultStatisticsController implements FxController {
 
 	private class IoSamplingAnimationHandler implements EventHandler<ActionEvent> {
 
-		private static final double BYTES_TO_MEGABYTES_FACTOR = 1.0 / IO_SAMPLING_INTERVAL / 1024.0 / 1024.0;
-
 		private long step = IO_SAMPLING_STEPS;
 		private final Series<Number, Number> decryptedBytesRead;
 		private final Series<Number, Number> encryptedBytesWrite;

From 4f4ddbc3e06283cc83a9d2d1a7523d1adad6d47b Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 9 Nov 2020 13:49:28 +0100
Subject: [PATCH 30/33] allow GCing of Stats Window while remaining reusability
 and preventing opening multiple windows per vault

---
 .../VaultDetailUnlockedController.java          | 17 ++++++++---------
 .../ui/stats/VaultStatisticsComponent.java      | 14 ++++++++++++--
 .../ui/stats/VaultStatisticsController.java     | 11 ++++++-----
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
index 6c20e9490..1806d9e5e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
@@ -18,20 +18,19 @@ public class VaultDetailUnlockedController implements FxController {
 
 	private final ReadOnlyObjectProperty<Vault> vault;
 	private final VaultService vaultService;
-	private final LoadingCache<Vault, VaultStatisticsComponent> vaultStatisticsWindows;
-	private final VaultStatisticsComponent.Builder vaultStatisticsWindow;
+	private final LoadingCache<Vault, VaultStatisticsComponent> vaultStats;
+	private final VaultStatisticsComponent.Builder vaultStatsBuilder;
 
 	@Inject
-	public VaultDetailUnlockedController(ObjectProperty<Vault> vault, VaultService vaultService, VaultStatisticsComponent.Builder vaultStatisticsWindow) {
+	public VaultDetailUnlockedController(ObjectProperty<Vault> vault, VaultService vaultService, VaultStatisticsComponent.Builder vaultStatsBuilder) {
 		this.vault = vault;
 		this.vaultService = vaultService;
-		this.vaultStatisticsWindows = CacheBuilder.newBuilder().build(CacheLoader.from(this::provideVaultStatisticsComponent));
-		//TODO make the binding a weak Binding via weakValues
-		this.vaultStatisticsWindow = vaultStatisticsWindow;
+		this.vaultStats = CacheBuilder.newBuilder().weakValues().build(CacheLoader.from(this::buildVaultStats));
+		this.vaultStatsBuilder = vaultStatsBuilder;
 	}
 
-	private VaultStatisticsComponent provideVaultStatisticsComponent(Vault vault) {
-		return vaultStatisticsWindow.vault(vault).build();
+	private VaultStatisticsComponent buildVaultStats(Vault vault) {
+		return vaultStatsBuilder.vault(vault).build();
 	}
 
 	@FXML
@@ -47,7 +46,7 @@ public class VaultDetailUnlockedController implements FxController {
 
 	@FXML
 	public void showVaultStatistics() {
-		vaultStatisticsWindows.getUnchecked(vault.get()).showVaultStatisticsWindow();
+		vaultStats.getUnchecked(vault.get()).showVaultStatisticsWindow();
 	}
 
 	/* Getter/Setter */
diff --git a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsComponent.java b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsComponent.java
index 8d48ef52e..aa7b410c2 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsComponent.java
@@ -3,12 +3,22 @@ package org.cryptomator.ui.stats;
 import dagger.BindsInstance;
 import dagger.Lazy;
 import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 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;
+
+/**
+ * For each vault there can be up to one statistics component.
+ * <p>
+ * <b>Important:</b> Outside of {@link org.cryptomator.ui.stats}, this component should be weakly referenced,
+ * as it include memory-intensive UI nodes.
+ * <p>
+ * While the stats window is visible, this component is strongly referenced by the window's main controller.
+ * As soon as the window is closed, the full objectgraph becomes eligible for GC.
+ */
 @VaultStatisticsScoped
 @Subcomponent(modules = {VaultStatisticsModule.class})
 public interface VaultStatisticsComponent {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
index b149f9559..f8937e90f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/stats/VaultStatisticsController.java
@@ -28,6 +28,7 @@ public class VaultStatisticsController implements FxController {
 	private static final int IO_SAMPLING_STEPS = 30;
 	private static final double IO_SAMPLING_INTERVAL = 1;
 
+	private final VaultStatisticsComponent component; // keep a strong reference to the component (see component's javadoc)
 	private final VaultStats stats;
 	private final Series<Number, Number> readData;
 	private final Series<Number, Number> writeData;
@@ -54,7 +55,8 @@ public class VaultStatisticsController implements FxController {
 	public NumberAxis writeChartYAxis;
 
 	@Inject
-	public VaultStatisticsController(@VaultStatisticsWindow Stage window, @VaultStatisticsWindow Vault vault) {
+	public VaultStatisticsController(VaultStatisticsComponent component, @VaultStatisticsWindow Stage window, @VaultStatisticsWindow Vault vault) {
+		this.component = component;
 		this.stats = vault.getStats();
 		this.readData = new Series<>();
 		this.writeData = new Series<>();
@@ -77,11 +79,10 @@ public class VaultStatisticsController implements FxController {
 		ioAnimation.setCycleCount(Animation.INDEFINITE);
 		ioAnimation.play();
 
-		// make sure to stop animating,
+		// make sure to stop animating while window is closed
 		// otherwise a global timer (GC root) will keep a strong reference to animation
-		window.setOnHiding(evt -> {
-			ioAnimation.stop();
-		});
+		window.setOnHiding(evt -> ioAnimation.stop());
+		window.setOnShowing(evt -> ioAnimation.play());
 	}
 
 	@FXML

From b04d5669fb93f547bdbae26ad1052bbfe16f3c1d Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Mon, 9 Nov 2020 17:40:57 +0100
Subject: [PATCH 31/33] Format lables the same way

---
 main/ui/src/main/resources/i18n/strings.properties | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 0328e6a9b..a56bf38e7 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -175,12 +175,12 @@ stats.title=Statistics for %s
 stats.readDataLabel=Read Data
 stats.writtenDataLabel=Written Data
 stats.cacheHitRate=Cache Hit Rate
-stats.totalMiBRead=Total Read: 
-stats.totalMiBWritten=Total Written: 
-stats.totalMiBEncrypted=Total Encypted: 
-stats.totalMiBDecrypted=Total Decrypted: 
-stats.totalReads=%s Number of Reads
-stats.totalWrites=%s Number of Writes
+stats.totalMiBRead=Data Read:
+stats.totalMiBWritten=Data Written:
+stats.totalMiBEncrypted=Data Encypted:
+stats.totalMiBDecrypted=Data Decrypted:
+stats.totalReads=Total reads: %s
+stats.totalWrites=Total writes: %s
 stats.data.bytes=%s Bytes
 stats.data.kiB=%.1f KiB
 stats.data.miB=%.1f MiB

From e067b94aca29c28c1f9ffcc69a585f736cb35e97 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 9 Nov 2020 17:52:48 +0100
Subject: [PATCH 32/33] fixed labels

---
 main/ui/src/main/resources/fxml/stats.fxml    | 60 +++++--------------
 .../main/resources/i18n/strings.properties    | 39 ++++++++----
 2 files changed, 40 insertions(+), 59 deletions(-)

diff --git a/main/ui/src/main/resources/fxml/stats.fxml b/main/ui/src/main/resources/fxml/stats.fxml
index f4295a0d1..a2ef920b9 100644
--- a/main/ui/src/main/resources/fxml/stats.fxml
+++ b/main/ui/src/main/resources/fxml/stats.fxml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.DataLabel?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
+<?import org.cryptomator.ui.controls.ThrougputLabel?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.chart.AreaChart?>
 <?import javafx.scene.chart.NumberAxis?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.Cursor?>
+<?import javafx.scene.Group?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Arc?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<?import org.cryptomator.ui.controls.ThrougputLabel?>
-<?import javafx.scene.Group?>
-<?import org.cryptomator.ui.controls.DataLabel?>
 <HBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.stats.VaultStatisticsController"
@@ -36,12 +36,8 @@
 	</VBox>
 
 	<!-- Read -->
-	<VBox prefWidth="300" prefHeight="300">
-		<HBox spacing="12" alignment="CENTER">
-			<Label styleClass="label-large" text="%stats.readDataLabel"/>
-			<ThrougputLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
-							mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.bpsRead}"/>
-		</HBox>
+	<VBox prefWidth="300" prefHeight="300" spacing="6" alignment="CENTER">
+		<ThrougputLabel styleClass="label-large" idleFormat="%stats.read.throughput.idle" kibsFormat="%stats.read.throughput.kibs" mibsFormat="%stats.read.throughput.mibs" bytesPerSecond="${controller.bpsRead}"/>
 		<AreaChart fx:id="readChart" styleClass="io-stats" createSymbols="false" animated="false">
 			<xAxis>
 				<NumberAxis fx:id="readChartXAxis" styleClass="io-stats" autoRanging="false" forceZeroInRange="false" side="BOTTOM"/>
@@ -53,30 +49,14 @@
 				<Cursor fx:constant="DEFAULT"/>
 			</cursor>
 		</AreaChart>
-		<VBox spacing="12" alignment="CENTER">
-			<HBox alignment="CENTER">
-				<Label styleClass="label-large" text="%stats.totalMiBRead"/>
-				<DataLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" byteFormat="%stats.data.bytes" kibFormat="%stats.data.kiB" mibFormat="%stats.data.miB" gibFormat="%stats.data.giB"
-						   dataInBytes="${controller.totalBytesRead}"/>
-			</HBox>
-			<HBox alignment="CENTER">
-				<Label styleClass="label-large" text="%stats.totalMiBDecrypted"/>
-				<DataLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" byteFormat="%stats.data.bytes" kibFormat="%stats.data.kiB" mibFormat="%stats.data.miB" gibFormat="%stats.data.giB"
-						   dataInBytes="${controller.totalBytesDecrypted}"/>
-			</HBox>
-			<FormattedLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" format="%stats.totalReads" arg1="${controller.filesRead}"/>
-
-		</VBox>
-
+		<DataLabel byteFormat="%stats.read.total.data.none" kibFormat="%stats.read.total.data.kib" mibFormat="%stats.read.total.data.mib" gibFormat="%stats.read.total.data.gib" dataInBytes="${controller.totalBytesRead}"/>
+		<DataLabel byteFormat="%stats.decr.total.data.none" kibFormat="%stats.decr.total.data.kib" mibFormat="%stats.decr.total.data.mib" gibFormat="%stats.decr.total.data.gib" dataInBytes="${controller.totalBytesDecrypted}"/>
+		<FormattedLabel format="%stats.read.accessCount" arg1="${controller.filesRead}"/>
 	</VBox>
 
 	<!-- Write -->
-	<VBox prefWidth="300" prefHeight="300">
-		<HBox alignment="CENTER">
-			<Label styleClass="label-large" text="%stats.writtenDataLabel"/>
-			<ThrougputLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
-							mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.bpsWritten}"/>
-		</HBox>
+	<VBox prefWidth="300" prefHeight="300" spacing="6" alignment="CENTER">
+		<ThrougputLabel styleClass="label-large" idleFormat="%stats.write.throughput.idle" kibsFormat="%stats.write.throughput.kibs" mibsFormat="%stats.write.throughput.mibs" bytesPerSecond="${controller.bpsWritten}"/>
 		<AreaChart fx:id="writeChart" styleClass="io-stats" createSymbols="false" animated="false">
 			<xAxis>
 				<NumberAxis fx:id="writeChartXAxis" styleClass="io-stats" autoRanging="false" forceZeroInRange="false" side="BOTTOM"/>
@@ -88,20 +68,8 @@
 				<Cursor fx:constant="DEFAULT"/>
 			</cursor>
 		</AreaChart>
-		<VBox spacing="12" alignment="CENTER">
-			<HBox alignment="CENTER">
-				<Label styleClass="label-large" text="%stats.totalMiBWritten"/>
-				<DataLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" byteFormat="%stats.data.bytes" kibFormat="%stats.data.kiB" mibFormat="%stats.data.miB" gibFormat="%stats.data.giB"
-						   dataInBytes="${controller.totalBytesWritten}"/>
-			</HBox>
-			<HBox alignment="CENTER">
-				<Label styleClass="label-large" text="%stats.totalMiBEncrypted"/>
-				<DataLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" byteFormat="%stats.data.bytes" kibFormat="%stats.data.kiB" mibFormat="%stats.data.miB" gibFormat="%stats.data.giB"
-						   dataInBytes="${controller.totalBytesEncrypted}"/>
-			</HBox>
-			<FormattedLabel styleClass="label-large" alignment="CENTER_RIGHT" minWidth="60" format="%stats.totalWrites" arg1="${controller.filesWritten}"/>
-
-		</VBox>
-
+		<DataLabel byteFormat="%stats.write.total.data.none" kibFormat="%stats.write.total.data.kib" mibFormat="%stats.write.total.data.mib" gibFormat="%stats.write.total.data.gib" dataInBytes="${controller.totalBytesWritten}"/>
+		<DataLabel byteFormat="%stats.encr.total.data.none" kibFormat="%stats.encr.total.data.kib" mibFormat="%stats.encr.total.data.mib" gibFormat="%stats.encr.total.data.gib" dataInBytes="${controller.totalBytesEncrypted}"/>
+		<FormattedLabel format="%stats.write.accessCount" arg1="${controller.filesWritten}"/>
 	</VBox>
 </HBox>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 0328e6a9b..53fe9f847 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -172,20 +172,33 @@ preferences.about=About
 
 # Vault Statistics
 stats.title=Statistics for %s
-stats.readDataLabel=Read Data
-stats.writtenDataLabel=Written Data
 stats.cacheHitRate=Cache Hit Rate
-stats.totalMiBRead=Total Read: 
-stats.totalMiBWritten=Total Written: 
-stats.totalMiBEncrypted=Total Encypted: 
-stats.totalMiBDecrypted=Total Decrypted: 
-stats.totalReads=%s Number of Reads
-stats.totalWrites=%s Number of Writes
-stats.data.bytes=%s Bytes
-stats.data.kiB=%.1f KiB
-stats.data.miB=%.1f MiB
-stats.data.giB=%.1f GiB
-
+## Read
+stats.read.throughput.idle=Read: idle
+stats.read.throughput.kibs=Read: %.2f kiB/s
+stats.read.throughput.mibs=Read: %.2f MiB/s
+stats.read.total.data.none=Data read: -
+stats.read.total.data.kib=Data read: %.1f kiB
+stats.read.total.data.mib=Data read: %.1f MiB
+stats.read.total.data.gib=Data read: %.1f GiB
+stats.decr.total.data.none=Data decrypted: -
+stats.decr.total.data.kib=Data decrypted: %.1f kiB
+stats.decr.total.data.mib=Data decrypted: %.1f MiB
+stats.decr.total.data.gib=Data decrypted: %.1f GiB
+stats.read.accessCount=Total reads: %d
+## Write
+stats.write.throughput.idle=Write: idle
+stats.write.throughput.kibs=Write: %.2f kiB/s
+stats.write.throughput.mibs=Write: %.2f MiB/s
+stats.write.total.data.none=Data read: -
+stats.write.total.data.kib=Data written: %.1f kiB
+stats.write.total.data.mib=Data written: %.1f MiB
+stats.write.total.data.gib=Data written: %.1f GiB
+stats.encr.total.data.none=Data encrypted: -
+stats.encr.total.data.kib=Data encrypted: %.1f kiB
+stats.encr.total.data.mib=Data encrypted: %.1f MiB
+stats.encr.total.data.gib=Data encrypted: %.1f GiB
+stats.write.accessCount=Total writes: %d
 
 # Main Window
 main.closeBtn.tooltip=Close

From 73587437cb0ce3c39758d4e35f9c32f3d2e84775 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 10 Nov 2020 08:27:47 +0100
Subject: [PATCH 33/33] fixes #1400

---
 .../resources/fxml/vault_detail_unlocked.fxml  | 18 +++++++++++++++++-
 .../src/main/resources/i18n/strings.properties |  6 +++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml b/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
index 257d0fa3e..7a4d62952 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
@@ -34,5 +34,21 @@
 	</Button>
 
 	<Region VBox.vgrow="ALWAYS"/>
-	<Button styleClass="button-large" text="%main.vaultDetail.stats" minWidth="120" onAction="#showVaultStatistics"/>
+
+	<HBox alignment="BOTTOM_RIGHT">
+		<Button text="%main.vaultDetail.stats" minWidth="120" onAction="#showVaultStatistics" contentDisplay="BOTTOM">
+			<graphic>
+				<VBox spacing="6">
+					<HBox alignment="CENTER_RIGHT" spacing="6">
+						<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondRead"/>
+						<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps" mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.vault.stats.bytesPerSecondRead}"/>
+					</HBox>
+					<HBox alignment="CENTER_RIGHT" spacing="6">
+						<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondWritten"/>
+						<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps" mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.vault.stats.bytesPerSecondWritten}"/>
+					</HBox>
+				</VBox>
+			</graphic>
+		</Button>
+	</HBox>
 </VBox>
\ No newline at end of file
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 53fe9f847..18f3f33d9 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -227,12 +227,12 @@ main.vaultDetail.unlockedStatus=UNLOCKED
 main.vaultDetail.accessLocation=Your vault's contents are accessible here:
 main.vaultDetail.revealBtn=Reveal Drive
 main.vaultDetail.lockBtn=Lock
-main.vaultDetail.bytesPerSecondRead=read:
-main.vaultDetail.bytesPerSecondWritten=written:
+main.vaultDetail.bytesPerSecondRead=Read:
+main.vaultDetail.bytesPerSecondWritten=Write:
 main.vaultDetail.throughput.idle=idle
 main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
-main.vaultDetail.stats=Show Statistics
+main.vaultDetail.stats=Vault Statistics
 ### Missing
 main.vaultDetail.missing.info=Cryptomator could not find a vault at this path.
 main.vaultDetail.missing.recheck=Recheck