- Added throuput statistics

main/ui/src/main/java/org/cryptomator/ui/InitializeController.java

@@ -132,7 +132,6 @@ public class InitializeController implements Initializable {
 		OutputStream masterKeyOutputStream = null;
 		try {
 			masterKeyOutputStream = Files.newOutputStream(masterKeyPath, StandardOpenOption.WRITE, StandardOpenOption.CREATE_NEW);
-			directory.getCryptor().randomizeMasterKey();
 			directory.getCryptor().encryptMasterKey(masterKeyOutputStream, password);
 			encryptExistingContents();
 			directory.getCryptor().swipeSensitiveData();

main/ui/src/main/java/org/cryptomator/ui/UnlockedController.java

@@ -11,26 +11,44 @@ package org.cryptomator.ui;
 import java.net.URL;
 import java.util.ResourceBundle;
 
+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.fxml.Initializable;
+import javafx.scene.chart.LineChart;
+import javafx.scene.chart.NumberAxis;
+import javafx.scene.chart.XYChart.Data;
+import javafx.scene.chart.XYChart.Series;
 import javafx.scene.control.Label;
+import javafx.util.Duration;
 
+import org.cryptomator.crypto.CryptorIOSampling;
 import org.cryptomator.ui.model.Directory;
 
 public class UnlockedController implements Initializable {
 
+	private static final int IO_SAMPLING_STEPS = 100;
+	private static final double IO_SAMPLING_INTERVAL = 0.25;
 	private ResourceBundle rb;
 	private LockListener listener;
 	private Directory directory;
+	private Timeline ioAnimation;
 
 	@FXML
 	private Label messageLabel;
 
+	@FXML
+	private LineChart<Number, Number> ioGraph;
+
+	@FXML
+	private NumberAxis xAxis;
+
 	@Override
 	public void initialize(URL url, ResourceBundle rb) {
 		this.rb = rb;
-
 	}
 
 	@FXML
@@ -43,6 +61,60 @@ public class UnlockedController implements Initializable {
 		}
 	}
 
+	// ****************************************
+	// IO Graph
+	// ****************************************
+
+	private void startIoSampling(final CryptorIOSampling sampler) {
+		final Series<Number, Number> decryptedBytes = new Series<>();
+		decryptedBytes.setName("decrypted");
+		final Series<Number, Number> encryptedBytes = new Series<>();
+		encryptedBytes.setName("encrypted");
+
+		ioGraph.getData().add(decryptedBytes);
+		ioGraph.getData().add(encryptedBytes);
+
+		ioAnimation = new Timeline();
+		ioAnimation.getKeyFrames().add(new KeyFrame(Duration.seconds(IO_SAMPLING_INTERVAL), new IoSamplingAnimationHandler(sampler, decryptedBytes, encryptedBytes)));
+		ioAnimation.setCycleCount(Animation.INDEFINITE);
+		ioAnimation.play();
+	}
+
+	private class IoSamplingAnimationHandler implements EventHandler<ActionEvent> {
+
+		private static final double BYTES_TO_MEGABYTES_FACTOR = IO_SAMPLING_INTERVAL / 1024.0 / 1024.0;
+		private final CryptorIOSampling sampler;
+		private final Series<Number, Number> decryptedBytes;
+		private final Series<Number, Number> encryptedBytes;
+		private int step = 0;
+
+		public IoSamplingAnimationHandler(CryptorIOSampling sampler, Series<Number, Number> decryptedBytes, Series<Number, Number> encryptedBytes) {
+			this.sampler = sampler;
+			this.decryptedBytes = decryptedBytes;
+			this.encryptedBytes = encryptedBytes;
+		}
+
+		@Override
+		public void handle(ActionEvent event) {
+			step++;
+
+			final double decryptedMb = sampler.pollDecryptedBytes(true) * BYTES_TO_MEGABYTES_FACTOR;
+			decryptedBytes.getData().add(new Data<Number, Number>(step, decryptedMb));
+			if (decryptedBytes.getData().size() > IO_SAMPLING_STEPS) {
+				decryptedBytes.getData().remove(0);
+			}
+
+			final double encrypteddMb = sampler.pollEncryptedBytes(true) * BYTES_TO_MEGABYTES_FACTOR;
+			encryptedBytes.getData().add(new Data<Number, Number>(step, encrypteddMb));
+			if (encryptedBytes.getData().size() > IO_SAMPLING_STEPS) {
+				encryptedBytes.getData().remove(0);
+			}
+
+			xAxis.setLowerBound(step - IO_SAMPLING_STEPS);
+			xAxis.setUpperBound(step);
+		}
+	}
+
 	/* Getter/Setter */
 
 	public Directory getDirectory() {
@@ -53,6 +125,12 @@ public class UnlockedController implements Initializable {
 		this.directory = directory;
 		final String msg = String.format(rb.getString("unlocked.messageLabel.runningOnPort"), directory.getServer().getPort());
 		messageLabel.setText(msg);
+
+		if (directory.getCryptor() instanceof CryptorIOSampling) {
+			startIoSampling((CryptorIOSampling) directory.getCryptor());
+		} else {
+			ioGraph.setVisible(false);
+		}
 	}
 
 	public LockListener getListener() {

main/ui/src/main/java/org/cryptomator/ui/model/Directory.java

@@ -6,6 +6,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 
 import org.apache.commons.lang3.StringUtils;
+import org.cryptomator.crypto.Cryptor;
+import org.cryptomator.crypto.SamplingDecorator;
 import org.cryptomator.crypto.aes256.Aes256Cryptor;
 import org.cryptomator.ui.MainApplication;
 import org.cryptomator.ui.util.MasterKeyFilter;
@@ -26,7 +28,7 @@ public class Directory implements Serializable {
 	private static final Logger LOG = LoggerFactory.getLogger(Directory.class);
 
 	private final WebDAVServer server = new WebDAVServer();
-	private final Aes256Cryptor cryptor = new Aes256Cryptor();
+	private final Cryptor cryptor = SamplingDecorator.decorate(new Aes256Cryptor());
 	private final Path path;
 	private boolean unlocked;
 	private String unmountCommand;
@@ -97,7 +99,7 @@ public class Directory implements Serializable {
 		return path.getFileName().toString();
 	}
 
-	public Aes256Cryptor getCryptor() {
+	public Cryptor getCryptor() {
 		return cryptor;
 	}
 

main/ui/src/main/resources/localization.properties

@@ -36,6 +36,7 @@ unlock.messageLabel.startServerFailed=Starting WebDAV server failed.
 # unlocked.fxml
 unlocked.messageLabel.runningOnPort=Vault is accessible via WebDAV on local port %d.
 unlocked.button.lock=Lock vault
+unlocked.ioGraph.yAxis.label=Throughput (MiB/s)
 
 
 # tray icon

main/ui/src/main/resources/unlocked.fxml

@@ -14,6 +14,8 @@
 <?import javafx.scene.text.*?>
 <?import java.lang.String?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.chart.LineChart?>
+<?import javafx.scene.chart.NumberAxis?>
 
 
 <GridPane vgap="12.0" hgap="12.0" prefWidth="400.0" fx:controller="org.cryptomator.ui.UnlockedController" xmlns:fx="http://javafx.com/fxml">
@@ -32,6 +34,12 @@
 		
 		<!-- Row 1 -->
 		<Button text="%unlocked.button.lock" defaultButton="true" GridPane.rowIndex="1" GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.halignment="RIGHT" prefWidth="150.0" onAction="#closeVault" focusTraversable="false"/>
+		
+		<!-- Row 2 -->
+		<LineChart fx:id="ioGraph" GridPane.rowIndex="2" GridPane.columnIndex="0" GridPane.columnSpan="2" animated="false" createSymbols="false" prefHeight="300.0" legendVisible="true" legendSide="BOTTOM" verticalZeroLineVisible="false" verticalGridLinesVisible="false" horizontalGridLinesVisible="true">
+			<xAxis><NumberAxis fx:id="xAxis" forceZeroInRange="false" tickMarkVisible="false" minorTickVisible="false" tickLabelsVisible="false" autoRanging="false"/></xAxis>
+        	<yAxis><NumberAxis label="%unlocked.ioGraph.yAxis.label" autoRanging="true" forceZeroInRange="true" /></yAxis>
+		</LineChart>
 	</children>
 </GridPane>