Updated codestyle (#1388)

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2026-09-19 14:34:20 +00:00 · 2020-11-02 08:45:41 +01:00
parent f675bd5017
commit 2720a999d1
217 changed files with 999 additions and 1009 deletions
@@ -20,16 +20,16 @@ along with this program.  If not, see http://www.gnu.org/licenses/.

 Cryptomator uses ${dependencyMap?size} third-party dependencies under the following licenses:
 <#list licenseMap as e>
-	<#assign license = e.getKey()/>
-	<#assign projects = e.getValue()/>
-	<#if projects?size &gt; 0>
-	${license}:
-	<#list projects as project>
-		- ${artifactFormat(project)}
-	</#list>
-	</#if>
+    <#assign license = e.getKey()/>
+    <#assign projects = e.getValue()/>
+    <#if projects?size &gt; 0>
+        ${license}:
+        <#list projects as project>
+			- ${artifactFormat(project)}
+        </#list>
+    </#if>
 </#list>

 Cryptomator uses other third-party assets under the following licenses:
-	SIL OFL 1.1 License:
-		- Font Awesome 5.12.0 (https://fontawesome.com/)
+SIL OFL 1.1 License:
+- Font Awesome 5.12.0 (https://fontawesome.com/)
@@ -4,14 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
@@ -27,8 +19,14 @@ import org.cryptomator.ui.recoverykey.RecoveryKeyDisplayController;

 import javax.inject.Named;
 import javax.inject.Provider;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 import java.nio.file.Path;
-import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;

@@ -103,7 +101,7 @@ public abstract class AddVaultModule {
 	static Scene provideChooseExistingVaultScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) {
 		return fxmlLoaders.createScene(FxmlFile.ADDVAULT_EXISTING.getRessourcePathString());
 	}
-	
+
 	@Provides
 	@FxmlScene(FxmlFile.ADDVAULT_NEW_NAME)
 	@AddVaultWizardScoped
@@ -189,5 +187,5 @@ public abstract class AddVaultModule {
 	@IntoMap
 	@FxControllerKey(AddVaultSuccessController.class)
 	abstract FxController bindAddVaultSuccessController(AddVaultSuccessController controller);
-	
+
 }
@@ -1,14 +1,14 @@
 package org.cryptomator.ui.addvaultwizard;

-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.fxapp.FxApplication;

 import javax.inject.Inject;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
 import java.util.Optional;

@AddVaultWizardScoped
@@ -1,8 +1,6 @@
 package org.cryptomator.ui.addvaultwizard;

 import dagger.Lazy;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
@@ -10,6 +8,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
+import javafx.scene.Scene;
+import javafx.stage.Stage;

@AddVaultWizardScoped
 public class AddVaultWelcomeController implements FxController {
@@ -7,11 +7,12 @@ package org.cryptomator.ui.addvaultwizard;

 import dagger.Lazy;
 import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;

+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
@AddVaultWizardScoped
@Subcomponent(modules = {AddVaultModule.class})
 public interface AddVaultWizardComponent {
@@ -1,12 +1,6 @@
 package org.cryptomator.ui.addvaultwizard;

 import dagger.Lazy;
-import javafx.beans.property.ObjectProperty;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.stage.FileChooser;
-import javafx.stage.Stage;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
@@ -18,6 +12,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
+import javafx.beans.property.ObjectProperty;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.scene.image.Image;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -2,6 +2,15 @@ package org.cryptomator.ui.addvaultwizard;

 import com.tobiasdiez.easybind.EasyBind;
 import dagger.Lazy;
+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;
+
+import javax.inject.Inject;
+import javax.inject.Named;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.BooleanProperty;
@@ -17,15 +26,6 @@ import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.Stage;
-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;
-
-import javax.inject.Inject;
-import javax.inject.Named;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.FileAlreadyExistsException;
@@ -88,7 +88,7 @@ public class CreateNewVaultLocationController implements FxController {
 	}

 	private void vaultPathDidChange(Path newValue) {
-		if ( newValue != null && !Files.notExists(newValue)) {
+		if (newValue != null && !Files.notExists(newValue)) {
 			warningText.set(resourceBundle.getString("addvaultwizard.new.fileAlreadyExists"));
 		} else {
 			warningText.set(null);
@@ -1,6 +1,12 @@
 package org.cryptomator.ui.addvaultwizard;

 import dagger.Lazy;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
+
+import javax.inject.Inject;
+import javax.inject.Named;
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -11,12 +17,6 @@ import javafx.fxml.FXML;
 import javafx.scene.Scene;
 import javafx.scene.control.TextField;
 import javafx.stage.Stage;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlScene;
-
-import javax.inject.Inject;
-import javax.inject.Named;
 import java.nio.file.Path;
 import java.util.ResourceBundle;
 import java.util.regex.Pattern;
@@ -1,19 +1,6 @@
 package org.cryptomator.ui.addvaultwizard;

 import dagger.Lazy;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.binding.ObjectBinding;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.StringProperty;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.scene.control.ContentDisplay;
-import javafx.scene.control.Toggle;
-import javafx.scene.control.ToggleGroup;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.cryptofs.CryptoFileSystemProperties;
@@ -29,6 +16,19 @@ import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
 import javax.inject.Named;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.binding.ObjectBinding;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.StringProperty;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.scene.control.ContentDisplay;
+import javafx.scene.control.Toggle;
+import javafx.scene.control.ToggleGroup;
+import javafx.stage.Stage;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.channels.WritableByteChannel;
@@ -1,14 +1,14 @@
 package org.cryptomator.ui.addvaultwizard;

 import dagger.Lazy;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;

 import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;

 public class CreateNewVaultRecoveryKeyController implements FxController {

@@ -1,10 +1,9 @@
 package org.cryptomator.ui.addvaultwizard;

+import javax.inject.Inject;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-
-import javax.inject.Inject;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -6,7 +6,7 @@ import java.util.ResourceBundle;

@AddVaultWizardScoped
 public class ReadmeGenerator {
-	
+
 	// specs: https://web.archive.org/web/20190708132914/http://www.kleinlercher.at/tools/Windows_Protocols/Word2007RTFSpec9.pdf
 	private static final String RTF_HEADER = "{\\rtf1\\fbidis\\ansi\\uc0\\fs32\n";
 	private static final String RTF_FOOTER = "}";
@@ -22,7 +22,7 @@ public class ReadmeGenerator {
 	public ReadmeGenerator(ResourceBundle resourceBundle) {
 		this.resourceBundle = resourceBundle;
 	}
-	
+
 	public String createVaultStorageLocationReadmeRtf() {
 		return createDocument(List.of( //
 				String.format(HEADING, resourceBundle.getString("addvault.new.readme.storageLocation.1")), //
@@ -40,16 +40,15 @@ public class ReadmeGenerator {
 				String.format(resourceBundle.getString("addvault.new.readme.storageLocation.10"), HELP_URL)  //
 		));
 	}
-	
+
 	public String createVaultAccessLocationReadmeRtf() {
 		return createDocument(List.of( //
-				String.format(HEADING,resourceBundle.getString("addvault.new.readme.accessLocation.1")), //
+				String.format(HEADING, resourceBundle.getString("addvault.new.readme.accessLocation.1")), //
 				resourceBundle.getString("addvault.new.readme.accessLocation.2"), //
 				EMPTY_PAR, //
 				resourceBundle.getString("addvault.new.readme.accessLocation.3"), //
 				EMPTY_PAR, //
-				resourceBundle.getString("addvault.new.readme.accessLocation.4")
-		));
+				resourceBundle.getString("addvault.new.readme.accessLocation.4")));
 	}

 	// visible for testing
@@ -63,14 +62,14 @@ public class ReadmeGenerator {
 		sb.append(RTF_FOOTER);
 		return sb.toString();
 	}
-	
+
 	// visible for testing
 	String escapeNonAsciiChars(CharSequence input) {
 		StringBuilder sb = new StringBuilder();
 		appendEscaped(sb, input);
 		return sb.toString();
 	}
-	
+
 	private void appendEscaped(StringBuilder sb, CharSequence input) {
 		input.chars().forEachOrdered(c -> {
 			if (c < 128) {
@@ -80,7 +79,6 @@ public class ReadmeGenerator {
 			}
 		});
 	}
-	
-	
+

 }
@@ -3,13 +3,13 @@ package org.cryptomator.ui.changepassword;
 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 javax.inject.Named;
+import javafx.scene.Scene;
+import javafx.stage.Stage;

@ChangePasswordScoped
@Subcomponent(modules = {ChangePasswordModule.class})
@@ -1,12 +1,5 @@
 package org.cryptomator.ui.changepassword;

-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.ObjectProperty;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.CheckBox;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptofs.CryptoFileSystemProvider;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
@@ -21,6 +14,13 @@ import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
 import javax.inject.Named;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.stage.Stage;
 import java.io.IOException;
 import java.nio.CharBuffer;
 import java.util.Optional;
@@ -4,12 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 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.Modality;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
 import org.cryptomator.ui.common.FxController;
@@ -22,14 +16,17 @@ import org.cryptomator.ui.common.StageFactory;

 import javax.inject.Named;
 import javax.inject.Provider;
-import java.nio.CharBuffer;
-import java.util.List;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;

@Module
 abstract class ChangePasswordModule {
-	
+
 	@Provides
 	@ChangePasswordScoped
 	@Named("newPassword")
@@ -70,7 +67,7 @@ abstract class ChangePasswordModule {
 	@IntoMap
 	@FxControllerKey(ChangePasswordController.class)
 	abstract FxController bindUnlockController(ChangePasswordController controller);
-	
+
 	@Provides
 	@IntoMap
 	@FxControllerKey(NewPasswordController.class)
@@ -8,7 +8,7 @@ import javafx.stage.Window;
 import javafx.util.Duration;

 public class Animations {
-	
+
 	public static Timeline createShakeWindowAnimation(Window window) {
 		WritableValue<Double> writableWindowX = new WritableValue<>() {
 			@Override
@@ -1,5 +1,10 @@
 package org.cryptomator.ui.common;

+import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.settings.Settings;
+import org.cryptomator.ui.fxapp.FxApplicationScoped;
+
+import javax.inject.Inject;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.input.KeyCode;
@@ -7,11 +12,6 @@ import javafx.scene.input.KeyCodeCombination;
 import javafx.scene.input.KeyCombination;
 import javafx.stage.Stage;
 import javafx.stage.Window;
-import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.settings.Settings;
-import org.cryptomator.ui.fxapp.FxApplicationScoped;
-
-import javax.inject.Inject;
 import java.util.function.Function;

@FxApplicationScoped
@@ -2,10 +2,10 @@ package org.cryptomator.ui.common;

 import dagger.BindsInstance;
 import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;

 import javax.annotation.Nullable;
+import javafx.scene.Scene;
+import javafx.stage.Stage;

@Subcomponent(modules = {ErrorModule.class})
 public interface ErrorComponent {
@@ -1,12 +1,11 @@
 package org.cryptomator.ui.common;

-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Named;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;

 public class ErrorController implements FxController {

@@ -34,7 +33,7 @@ public class ErrorController implements FxController {
 	}

 	/* Getter/Setter */
-	
+
 	public boolean isPreviousScenePresent() {
 		return previousScene != null;
 	}
@@ -4,10 +4,10 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.scene.Scene;

 import javax.inject.Named;
 import javax.inject.Provider;
+import javafx.scene.Scene;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
@@ -1,10 +1,9 @@
 package org.cryptomator.ui.common;

+import javax.inject.Provider;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
-
-import javax.inject.Provider;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
@@ -1,9 +1,9 @@
 package org.cryptomator.ui.common;

-import javafx.scene.text.Font;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+import javafx.scene.text.Font;
 import java.io.IOException;
 import java.io.InputStream;

@@ -6,4 +6,5 @@
 package org.cryptomator.ui.common;

 public interface FxController {
+
 }
@@ -19,5 +19,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
@Retention(RUNTIME)
@MapKey
 public @interface FxControllerKey {
+
 	Class<? extends FxController> value();
 }
@@ -36,7 +36,7 @@ public enum FxmlFile {
 		this.ressourcePathString = ressourcePathString;
 	}

-	public String getRessourcePathString(){
+	public String getRessourcePathString() {
 		return ressourcePathString;
 	}
 }
@@ -1,6 +1,9 @@
 package org.cryptomator.ui.common;

 import com.tobiasdiez.easybind.EasyBind;
+import org.cryptomator.ui.controls.FontAwesome5IconView;
+import org.cryptomator.ui.controls.NiceSecurePasswordField;
+
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -9,9 +12,6 @@ import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
-import org.cryptomator.ui.controls.FontAwesome5IconView;
-import org.cryptomator.ui.controls.NiceSecurePasswordField;
-
 import java.util.ResourceBundle;

 public class NewPasswordController implements FxController {
@@ -2,7 +2,6 @@ package org.cryptomator.ui.common;

 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-
 import java.util.function.Consumer;

 public class StageFactory {
@@ -12,11 +11,11 @@ public class StageFactory {
 	public StageFactory(Consumer<Stage> initializer) {
 		this.initializer = initializer;
 	}
-	
+
 	public Stage create() {
 		return create(StageStyle.DECORATED);
 	}
-	
+
 	public Stage create(StageStyle stageStyle) {
 		Stage stage = new Stage(stageStyle);
 		initializer.accept(stage);
@@ -5,13 +5,13 @@
 *******************************************************************************/
 package org.cryptomator.ui.common;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import javafx.application.Platform;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
 import javafx.util.Duration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -4,7 +4,6 @@ import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -15,11 +14,11 @@ public class UserInteractionLock<E extends Enum> {
 	private final Condition condition = lock.newCondition();
 	private final BooleanProperty awaitingInteraction = new SimpleBooleanProperty();
 	private volatile E state;
-	
+
 	public UserInteractionLock(E initialValue) {
 		state = initialValue;
 	}
-	
+
 	public void interacted(E result) {
 		assert Platform.isFxApplicationThread();
 		lock.lock();
@@ -31,7 +30,7 @@ public class UserInteractionLock<E extends Enum> {
 			lock.unlock();
 		}
 	}
-	
+
 	public E awaitInteraction() throws InterruptedException {
 		assert !Platform.isFxApplicationThread();
 		lock.lock();
@@ -43,7 +42,7 @@ public class UserInteractionLock<E extends Enum> {
 			lock.unlock();
 		}
 	}
-	
+
 	public ReadOnlyBooleanProperty awaitingInteraction() {
 		return awaitingInteraction;
 	}
@@ -1,6 +1,5 @@
 package org.cryptomator.ui.common;

-import javafx.concurrent.Task;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.common.vaults.Volume;
@@ -10,6 +9,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
+import javafx.concurrent.Task;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
@@ -2,7 +2,6 @@ package org.cryptomator.ui.controls;

 import javafx.scene.control.TextField;
 import javafx.scene.control.TextFormatter;
-
 import java.util.regex.Pattern;

 public class AlphanumericTextField extends TextField {
@@ -9,6 +9,7 @@
 package org.cryptomator.ui.controls;

 import com.tobiasdiez.easybind.EasyBind;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.scene.SnapshotParameters;
@@ -19,14 +20,13 @@ import javafx.scene.input.DragEvent;
 import javafx.scene.input.Dragboard;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.TransferMode;
-
 import java.util.List;

 public class DraggableListCell<T> extends ListCell<T> {
-	
+
 	private static final String DROP_ABOVE_CLASS = "drop-above";
 	private static final String DROP_BELOW_CLASS = "drop-below";
-	
+
 	private final BooleanProperty dropAbove = new SimpleBooleanProperty();
 	private final BooleanProperty dropBelow = new SimpleBooleanProperty();

@@ -41,7 +41,7 @@ public class DraggableListCell<T> extends ListCell<T> {
 		EasyBind.includeWhen(getStyleClass(), DROP_ABOVE_CLASS, dropAbove);
 		EasyBind.includeWhen(getStyleClass(), DROP_BELOW_CLASS, dropBelow);
 	}
-	
+
 	private void setDropPositionStyleClass(double verticalCursorPosition) {
 		boolean isUpperHalf = verticalCursorPosition < this.getHeight() / 2.0;
 		if (isUpperHalf) {
@@ -52,7 +52,7 @@ public class DraggableListCell<T> extends ListCell<T> {
 			this.dropBelow.set(true);
 		}
 	}
-	
+
 	private void resetDropPositionStyleClasses() {
 		this.dropAbove.set(false);
 		this.dropBelow.set(false);
@@ -1,5 +1,7 @@
 package org.cryptomator.ui.controls;

+import org.cryptomator.ui.common.FontLoader;
+
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleDoubleProperty;
@@ -7,8 +9,6 @@ import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.text.Font;
 import javafx.scene.text.Text;
-import org.cryptomator.ui.common.FontLoader;
-
 import java.io.UncheckedIOException;

 /**
@@ -55,23 +55,23 @@ public class FontAwesome5IconView extends Text {
 		return glyph;
 	}

-	public void setGlyph(FontAwesome5Icon glyph) {
-		this.glyph.set(glyph == null ? DEFAULT_GLYPH : glyph);
-	}
-
 	public FontAwesome5Icon getGlyph() {
 		return glyph.get();
 	}

+	public void setGlyph(FontAwesome5Icon glyph) {
+		this.glyph.set(glyph == null ? DEFAULT_GLYPH : glyph);
+	}
+
 	public DoubleProperty glyphSizeProperty() {
 		return glyphSize;
 	}

-	public void setGlyphSize(double glyphSize) {
-		this.glyphSize.set(glyphSize);
-	}
-
 	public double getGlyphSize() {
 		return glyphSize.get();
 	}
+
+	public void setGlyphSize(double glyphSize) {
+		this.glyphSize.set(glyphSize);
+	}
 }
@@ -13,7 +13,7 @@ public class FormattedString {
 	private final ObjectProperty<Object> arg1 = new SimpleObjectProperty<>();
 	// add arg2, arg3, ... on demand
 	private final StringBinding value;
-	
+
 	public FormattedString() {
 		this.value = Bindings.createStringBinding(this::computeValue, format, arg1);
 	}
@@ -2,7 +2,6 @@ package org.cryptomator.ui.controls;

 import javafx.scene.control.TextField;
 import javafx.scene.control.TextFormatter;
-
 import java.util.regex.Pattern;

 public class NumericTextField extends TextField {
@@ -1,6 +1,7 @@
 package org.cryptomator.ui.controls;

 import com.tobiasdiez.easybind.EasyBind;
+
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -75,11 +76,11 @@ public class PasswordStrengthIndicator extends HBox {
 		return strength;
 	}

-	public void setStrength(int strength) {
-		this.strength.set(strength);
-	}
-
 	public int getStrength() {
 		return strength.get();
 	}
+
+	public void setStrength(int strength) {
+		this.strength.set(strength);
+	}
 }
@@ -9,6 +9,7 @@
 package org.cryptomator.ui.controls;

 import com.google.common.base.Strings;
+
 import javafx.beans.NamedArg;
 import javafx.beans.Observable;
 import javafx.beans.property.BooleanProperty;
@@ -26,7 +27,6 @@ import javafx.scene.input.KeyCodeCombination;
 import javafx.scene.input.KeyCombination;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.TransferMode;
-
 import java.awt.Toolkit;
 import java.nio.CharBuffer;
 import java.text.Normalizer;
@@ -3,14 +3,14 @@ package org.cryptomator.ui.forgetPassword;
 import dagger.BindsInstance;
 import dagger.Lazy;
 import dagger.Subcomponent;
-import javafx.beans.property.ReadOnlyBooleanProperty;
-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 javax.inject.Named;
+import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 import java.util.concurrent.CompletableFuture;

@ForgetPasswordScoped
@@ -1,8 +1,5 @@
 package org.cryptomator.ui.forgetPassword;

-import javafx.beans.property.BooleanProperty;
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.keychain.KeychainAccessException;
 import org.cryptomator.keychain.KeychainManager;
@@ -11,6 +8,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
+import javafx.beans.property.BooleanProperty;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
 import java.util.Optional;

@ForgetPasswordScoped
@@ -4,13 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ReadOnlyBooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-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;
@@ -21,7 +14,12 @@ import org.cryptomator.ui.common.StageFactory;

 import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;

@@ -58,7 +56,7 @@ abstract class ForgetPasswordModule {
 	@ForgetPasswordWindow
 	@ForgetPasswordScoped
 	abstract ReadOnlyBooleanProperty bindReadOnlyConfirmedProperty(@ForgetPasswordWindow BooleanProperty confirmedProperty);
-	
+
 	// ------------------

 	@Provides
@@ -2,13 +2,6 @@ package org.cryptomator.ui.fxapp;

 import com.tobiasdiez.easybind.EasyBind;
 import dagger.Lazy;
-import javafx.application.Application;
-import javafx.application.Platform;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.value.ObservableValue;
-import javafx.collections.ObservableSet;
-import javafx.stage.Stage;
 import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.UiTheme;
@@ -28,6 +21,13 @@ import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
 import javax.inject.Provider;
+import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.ObservableSet;
+import javafx.stage.Stage;
 import java.awt.desktop.QuitResponse;
 import java.util.Optional;

@@ -18,7 +18,7 @@ public interface FxApplicationComponent {

 	@Subcomponent.Builder
 	interface Builder {
-		
+
 		@BindsInstance
 		Builder trayMenuSupported(@Named("trayMenuSupported") boolean trayMenuSupported);

@@ -8,11 +8,6 @@ package org.cryptomator.ui.fxapp;
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
-import javafx.application.Application;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableSet;
-import javafx.scene.image.Image;
-import javafx.stage.Stage;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.StageFactory;
@@ -22,6 +17,11 @@ import org.cryptomator.ui.quit.QuitComponent;
 import org.cryptomator.ui.unlock.UnlockComponent;

 import javax.inject.Named;
+import javafx.application.Application;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableSet;
+import javafx.scene.image.Image;
+import javafx.stage.Stage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
@@ -53,7 +53,7 @@ abstract class FxApplicationModule {
 			throw new UncheckedIOException("Failed to load embedded resource.", e);
 		}
 	}
-	
+
 	@Provides
 	@FxApplicationScoped
 	static StageFactory provideStageFactory(@Named("windowIcons") List<Image> windowIcons, ObservableSet<Stage> visibleStages) {
@@ -1,5 +1,11 @@
 package org.cryptomator.ui.fxapp;

+import org.cryptomator.common.settings.Settings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.inject.Named;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -8,12 +14,6 @@ import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Worker;
 import javafx.concurrent.WorkerStateEvent;
 import javafx.util.Duration;
-import org.cryptomator.common.settings.Settings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
-import javax.inject.Named;
 import java.util.Comparator;
 import java.util.Optional;

@@ -80,7 +80,7 @@ public class UpdateChecker {
 	private void checkFailed(WorkerStateEvent event) {
 		LOG.warn("Error checking for updates", event.getSource().getException());
 	}
-	
+
 	/* Observable Properties */

 	public BooleanBinding checkingForUpdatesProperty() {
@@ -2,6 +2,12 @@ package org.cryptomator.ui.fxapp;

 import dagger.Module;
 import dagger.Provides;
+import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.settings.Settings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Named;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.SimpleStringProperty;
@@ -9,12 +15,6 @@ import javafx.beans.property.StringProperty;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
 import javafx.util.Duration;
-import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.settings.Settings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Named;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -4,11 +4,11 @@ import com.google.common.io.ByteStreams;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
-import javafx.concurrent.Task;
 import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+import javafx.concurrent.Task;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -2,14 +2,16 @@ package org.cryptomator.ui.launcher;

 import java.nio.file.Path;
 import java.util.Collection;
-import java.util.stream.Stream;

 public class AppLaunchEvent {

 	private final EventType type;
 	private final Collection<Path> pathsToOpen;

-	public enum EventType {REVEAL_APP, OPEN_FILE}
+	public enum EventType {
+		REVEAL_APP,
+		OPEN_FILE
+	}

 	public AppLaunchEvent(EventType type, Collection<Path> pathsToOpen) {
 		this.type = type;
@@ -1,6 +1,5 @@
 package org.cryptomator.ui.launcher;

-import javafx.application.Platform;
 import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.ui.fxapp.FxApplication;
 import org.slf4j.Logger;
@@ -9,6 +8,7 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
+import javafx.application.Platform;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.util.concurrent.BlockingQueue;
@@ -54,10 +54,10 @@ class AppLaunchEventHandler {
 		switch (event.getType()) {
 			case REVEAL_APP -> fxApplicationStarter.get(hasTrayIcon).thenAccept(FxApplication::showMainWindow);
 			case OPEN_FILE -> fxApplicationStarter.get(hasTrayIcon).thenRun(() -> {
-					Platform.runLater(() -> {
-						event.getPathsToOpen().forEach(this::addVault);
-					});
+				Platform.runLater(() -> {
+					event.getPathsToOpen().forEach(this::addVault);
 				});
+			});
 			default -> LOG.warn("Unsupported event type: {}", event.getType());
 		}
 	}
@@ -1,8 +1,5 @@
 package org.cryptomator.ui.launcher;

-import javafx.application.Platform;
-import javafx.beans.Observable;
-import javafx.collections.ObservableList;
 import org.cryptomator.common.ShutdownHook;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
@@ -14,6 +11,9 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
+import javafx.application.Platform;
+import javafx.beans.Observable;
+import javafx.collections.ObservableList;
 import java.awt.Desktop;
 import java.awt.EventQueue;
 import java.awt.desktop.AboutEvent;
@@ -1,6 +1,5 @@
 package org.cryptomator.ui.launcher;

-import javafx.application.Platform;
 import org.cryptomator.ui.fxapp.FxApplication;
 import org.cryptomator.ui.fxapp.FxApplicationComponent;
 import org.slf4j.Logger;
@@ -8,6 +7,7 @@ import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
 import javax.inject.Singleton;
+import javafx.application.Platform;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutorService;
@@ -1,6 +1,5 @@
 package org.cryptomator.ui.launcher;

-import javafx.collections.ObservableList;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.jni.JniException;
@@ -13,6 +12,7 @@ import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
 import javax.inject.Singleton;
+import javafx.collections.ObservableList;
 import java.awt.Desktop;
 import java.awt.SystemTray;
 import java.awt.desktop.AppReopenedListener;
@@ -9,7 +9,6 @@ import org.cryptomator.ui.traymenu.TrayMenuComponent;

 import javax.inject.Named;
 import javax.inject.Singleton;
-import java.util.Locale;
 import java.util.ResourceBundle;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
@@ -7,11 +7,12 @@ package org.cryptomator.ui.mainwindow;

 import dagger.Lazy;
 import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;

+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
@MainWindowScoped
@Subcomponent(modules = {MainWindowModule.class})
 public interface MainWindowComponent {
@@ -1,5 +1,14 @@
 package org.cryptomator.ui.mainwindow;

+import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.common.vaults.VaultListManager;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.wrongfilealert.WrongFileAlertComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
 import javafx.beans.Observable;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -10,15 +19,6 @@ import javafx.scene.input.DragEvent;
 import javafx.scene.input.TransferMode;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
-import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.common.vaults.VaultListManager;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.wrongfilealert.WrongFileAlertComponent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
@@ -4,12 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 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;
 import org.cryptomator.ui.addvaultwizard.AddVaultWizardComponent;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
@@ -18,15 +12,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.wrongfilealert.WrongFileAlertComponent;

-import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 import java.util.Map;
 import java.util.ResourceBundle;

@@ -1,16 +1,16 @@
 package org.cryptomator.ui.mainwindow;

 import dagger.Lazy;
-import javafx.scene.Scene;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyCodeCombination;
-import javafx.scene.input.KeyCombination;
-import javafx.stage.Stage;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.ui.common.DefaultSceneFactory;

 import javax.inject.Inject;
+import javafx.scene.Scene;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyCodeCombination;
+import javafx.scene.input.KeyCombination;
+import javafx.stage.Stage;

@MainWindowScoped
 public class MainWindowSceneFactory extends DefaultSceneFactory {
@@ -1,10 +1,5 @@
 package org.cryptomator.ui.mainwindow;

-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.fxml.FXML;
-import javafx.scene.layout.HBox;
-import javafx.stage.Stage;
 import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.ui.common.FxController;
@@ -17,6 +12,11 @@ import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
 import javax.inject.Named;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.fxml.FXML;
+import javafx.scene.layout.HBox;
+import javafx.stage.Stage;

@MainWindowScoped
 public class MainWindowTitleController implements FxController {
@@ -1,12 +1,12 @@
 package org.cryptomator.ui.mainwindow;

+import org.cryptomator.ui.common.FxController;
+
+import javax.inject.Inject;
 import javafx.fxml.FXML;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Region;
 import javafx.stage.Stage;
-import org.cryptomator.ui.common.FxController;
-
-import javax.inject.Inject;

@MainWindow
 public class ResizeController implements FxController {
@@ -1,11 +1,6 @@
 package org.cryptomator.ui.mainwindow;

 import com.tobiasdiez.easybind.EasyBind;
-import javafx.beans.binding.Binding;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.fxml.FXML;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.ui.common.FxController;
@@ -13,6 +8,11 @@ import org.cryptomator.ui.controls.FontAwesome5Icon;
 import org.cryptomator.ui.fxapp.FxApplication;

 import javax.inject.Inject;
+import javafx.beans.binding.Binding;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.fxml.FXML;

@MainWindowScoped
 public class VaultDetailController implements FxController {
@@ -1,12 +1,6 @@
 package org.cryptomator.ui.mainwindow;

 import com.tobiasdiez.easybind.EasyBind;
-import javafx.beans.binding.BooleanExpression;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.keychain.KeychainManager;
 import org.cryptomator.ui.common.FxController;
@@ -14,6 +8,12 @@ import org.cryptomator.ui.fxapp.FxApplication;
 import org.cryptomator.ui.vaultoptions.VaultOptionsComponent;

 import javax.inject.Inject;
+import javafx.beans.binding.BooleanExpression;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
 import java.util.Optional;

@MainWindowScoped
@@ -1,15 +1,15 @@
 package org.cryptomator.ui.mainwindow;

-import javafx.beans.property.ObjectProperty;
-import javafx.fxml.FXML;
-import javafx.stage.FileChooser;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.removevault.RemoveVaultComponent;

 import javax.inject.Inject;
+import javafx.beans.property.ObjectProperty;
+import javafx.fxml.FXML;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
 import java.io.File;
 import java.util.ResourceBundle;

@@ -1,13 +1,13 @@
 package org.cryptomator.ui.mainwindow;

-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.fxml.FXML;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.migration.MigrationComponent;

 import javax.inject.Inject;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.fxml.FXML;

@MainWindowScoped
 public class VaultDetailNeedsMigrationController implements FxController {
@@ -1,12 +1,12 @@
 package org.cryptomator.ui.mainwindow;

 import com.tobiasdiez.easybind.EasyBind;
-import javafx.beans.binding.Binding;
-import javafx.beans.property.ObjectProperty;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;

 import javax.inject.Inject;
+import javafx.beans.binding.Binding;
+import javafx.beans.property.ObjectProperty;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
@@ -1,13 +1,13 @@
 package org.cryptomator.ui.mainwindow;

-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.fxml.FXML;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.VaultService;

 import javax.inject.Inject;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.fxml.FXML;

@MainWindowScoped
 public class VaultDetailUnlockedController implements FxController {
@@ -1,15 +1,15 @@
 package org.cryptomator.ui.mainwindow;

 import com.tobiasdiez.easybind.EasyBind;
-import javafx.beans.binding.Binding;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.controls.FontAwesome5Icon;

 import javax.inject.Inject;
+import javafx.beans.binding.Binding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;

 // unscoped because each cell needs its own controller
 public class VaultListCellController implements FxController {
@@ -25,7 +25,7 @@ public class VaultListCellController implements FxController {
 	}

 	private FontAwesome5Icon getGlyphForVaultState(VaultState state) {
-		if(state != null){
+		if (state != null) {
 			return switch (state) {
 				case LOCKED -> FontAwesome5Icon.LOCK;
 				case PROCESSING -> FontAwesome5Icon.SPINNER;
@@ -1,16 +1,16 @@
 package org.cryptomator.ui.mainwindow;

+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.FXMLLoaderFactory;
+import org.cryptomator.ui.controls.DraggableListCell;
+
+import javax.inject.Inject;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.util.Callback;
-import org.cryptomator.ui.common.FXMLLoaderFactory;
-import org.cryptomator.ui.controls.DraggableListCell;
-import org.cryptomator.common.vaults.Vault;
-
-import javax.inject.Inject;
 import java.io.IOException;
 import java.io.UncheckedIOException;

@@ -33,7 +33,7 @@ public class VaultListCellFactory implements Callback<ListView<Vault>, ListCell<
 			throw new UncheckedIOException("Failed to load /fxml/vault_list_cell.fxml.", e);
 		}
 	}
-	
+
 	private static class Cell extends DraggableListCell<Vault> {

 		private final Parent node;
@@ -1,13 +1,6 @@
 package org.cryptomator.ui.mainwindow;

 import com.tobiasdiez.easybind.EasyBind;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.ObjectProperty;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.scene.control.ListView;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.ui.addvaultwizard.AddVaultWizardComponent;
@@ -17,6 +10,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.ListView;

@MainWindowScoped
 public class VaultListController implements FxController {
@@ -1,20 +1,20 @@
 package org.cryptomator.ui.mainwindow;

-import javafx.application.Application;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
+import javafx.application.Application;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;

@MainWindowScoped
 public class WelcomeController implements FxController {
-	
+
 	private static final Logger LOG = LoggerFactory.getLogger(WelcomeController.class);
 	private static final String GETTING_STARTED_URI = "https://docs.cryptomator.org/en/1.5/desktop/getting-started/";

@@ -42,5 +42,5 @@ public class WelcomeController implements FxController {
 	public boolean isNoVaultPresent() {
 		return noVaultPresent.get();
 	}
-	
+
 }
@@ -1,13 +1,6 @@
 package org.cryptomator.ui.migration;

 import dagger.Lazy;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.StringBinding;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.cryptofs.common.FileSystemCapabilityChecker;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
@@ -15,6 +8,13 @@ import org.cryptomator.ui.common.FxmlScene;

 import javax.inject.Inject;
 import javax.inject.Named;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.StringBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 import java.util.ResourceBundle;

@MigrationScoped
@@ -3,12 +3,13 @@ package org.cryptomator.ui.migration;
 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;
+
@MigrationScoped
@Subcomponent(modules = {MigrationModule.class})
 public interface MigrationComponent {
@@ -1,12 +1,12 @@
 package org.cryptomator.ui.migration;

-import javafx.fxml.FXML;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.fxapp.FxApplication;

 import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;

 public class MigrationImpossibleController implements FxController {

@@ -4,12 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 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.Modality;
-import javafx.stage.Stage;
 import org.cryptomator.cryptofs.common.FileSystemCapabilityChecker;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
@@ -22,7 +16,11 @@ import org.cryptomator.ui.mainwindow.MainWindow;

 import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;

@@ -47,7 +45,7 @@ abstract class MigrationModule {
 		stage.initOwner(owner);
 		return stage;
 	}
-	
+
 	@Provides
 	@Named("capabilityErrorCause")
 	@MigrationScoped
@@ -1,19 +1,6 @@
 package org.cryptomator.ui.migration;

 import dagger.Lazy;
-import javafx.application.Platform;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.ObjectBinding;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyDoubleProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.scene.control.ContentDisplay;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.cryptofs.FileNameTooLongException;
@@ -36,6 +23,19 @@ import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
 import javax.inject.Named;
+import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyDoubleProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.scene.control.ContentDisplay;
+import javafx.stage.Stage;
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
@@ -1,15 +1,15 @@
 package org.cryptomator.ui.migration;

 import dagger.Lazy;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;

 import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;

@MigrationScoped
 public class MigrationStartController implements FxController {
@@ -1,13 +1,13 @@
 package org.cryptomator.ui.migration;

-import javafx.fxml.FXML;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.fxapp.FxApplication;
 import org.cryptomator.ui.mainwindow.MainWindow;

 import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
 import java.util.Optional;

@MigrationScoped
@@ -19,6 +19,6 @@ public interface AutoStartStrategy {
 		public TogglingAutoStartFailedException(String message, Throwable cause) {
 			super(message, cause);
 		}
-		
+
 	}
 }
@@ -1,15 +1,15 @@
 package org.cryptomator.ui.preferences;

-import javafx.application.Application;
-import javafx.beans.value.ObservableValue;
-import javafx.fxml.FXML;
-import javafx.scene.control.TextArea;
 import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.UiTheme;
 import org.cryptomator.ui.common.FxController;

 import javax.inject.Inject;
+import javafx.application.Application;
+import javafx.beans.value.ObservableValue;
+import javafx.fxml.FXML;
+import javafx.scene.control.TextArea;

@PreferencesScoped
 public class DonationKeyPreferencesController implements FxController {
@@ -1,18 +1,5 @@
 package org.cryptomator.ui.preferences;

-import javafx.application.Application;
-import javafx.application.Platform;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.value.ObservableValue;
-import javafx.concurrent.Task;
-import javafx.fxml.FXML;
-import javafx.geometry.NodeOrientation;
-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.util.StringConverter;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.LicenseHolder;
@@ -27,6 +14,20 @@ import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
 import javax.inject.Named;
+import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.value.ObservableValue;
+import javafx.concurrent.Task;
+import javafx.fxml.FXML;
+import javafx.geometry.NodeOrientation;
+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.util.StringConverter;
+
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.Optional;
@@ -7,11 +7,12 @@ package org.cryptomator.ui.preferences;

 import dagger.Lazy;
 import dagger.Subcomponent;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
+
 import javafx.beans.property.ObjectProperty;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlScene;

@PreferencesScoped
@Subcomponent(modules = {PreferencesModule.class})
@@ -1,5 +1,11 @@
 package org.cryptomator.ui.preferences;

+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.fxapp.UpdateChecker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ObjectProperty;
 import javafx.fxml.FXML;
@@ -7,12 +13,6 @@ import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.fxapp.UpdateChecker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;

@PreferencesScoped
 public class PreferencesController implements FxController {
@@ -4,11 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 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 org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
 import org.cryptomator.ui.common.FxController;
@@ -17,9 +12,11 @@ import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 import org.cryptomator.ui.common.StageFactory;

-import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;

@@ -1,5 +1,10 @@
 package org.cryptomator.ui.preferences;

+import org.cryptomator.common.settings.Settings;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.fxapp.UpdateChecker;
+
+import javax.inject.Inject;
 import javafx.application.Application;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -8,17 +13,12 @@ import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ContentDisplay;
-import org.cryptomator.common.settings.Settings;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.fxapp.UpdateChecker;
-
-import javax.inject.Inject;

@PreferencesScoped
 public class UpdatesPreferencesController implements FxController {

 	private static final String DOWNLOADS_URI = "https://cryptomator.org/downloads";
-	
+
 	private final Application application;
 	private final Settings settings;
 	private final UpdateChecker updateChecker;
@@ -1,12 +1,5 @@
 package org.cryptomator.ui.preferences;

-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.scene.control.Button;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.TextField;
-import javafx.util.StringConverter;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.VolumeImpl;
@@ -15,6 +8,13 @@ import org.cryptomator.common.vaults.Volume;
 import org.cryptomator.ui.common.FxController;

 import javax.inject.Inject;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.scene.control.Button;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.TextField;
+import javafx.util.StringConverter;

 /**
 * TODO: if WebDAV is selected under Windows, show warning that specific mount options (like selecting a directory as mount point) are _not_ supported
@@ -8,11 +8,11 @@ package org.cryptomator.ui.quit;
 import dagger.BindsInstance;
 import dagger.Lazy;
 import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;

+import javafx.scene.Scene;
+import javafx.stage.Stage;
 import java.awt.desktop.QuitResponse;

@QuitScoped
@@ -1,11 +1,5 @@
 package org.cryptomator.ui.quit;

-import javafx.collections.ObservableList;
-import javafx.concurrent.Task;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.ContentDisplay;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.VaultService;
@@ -13,6 +7,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
+import javafx.collections.ObservableList;
+import javafx.concurrent.Task;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ContentDisplay;
+import javafx.stage.Stage;
 import java.awt.desktop.QuitResponse;
 import java.util.Collection;
 import java.util.concurrent.ExecutorService;
@@ -4,13 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyCodeCombination;
-import javafx.scene.input.KeyCombination;
-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;
@@ -19,9 +12,10 @@ import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 import org.cryptomator.ui.common.StageFactory;

-import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;

@@ -37,10 +37,10 @@ public class AutoCompleter {

 	/**
 	 * Find the index of the first word in {@link #dictionary} that starts with a given prefix.
-	 * 
+	 * <p>
 	 * This method performs an "unsuccessful" binary search (it doesn't return when encountering an exact match).
 	 * Instead it continues searching in the left half (which includes the exact match) until only one element is left.
-	 * 
+	 * <p>
 	 * If the dictionary doesn't contain a word "left" of the given prefix, this method returns an invalid index, though.
 	 *
 	 * @param begin Index of first element (inclusive)
@@ -3,15 +3,13 @@ package org.cryptomator.ui.recoverykey;
 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 javax.annotation.Nullable;
 import javax.inject.Named;
-import java.util.Optional;
+import javafx.scene.Scene;
+import javafx.stage.Stage;

@RecoveryKeyScoped
@Subcomponent(modules = {RecoveryKeyModule.class})
@@ -1,11 +1,6 @@
 package org.cryptomator.ui.recoverykey;

 import dagger.Lazy;
-import javafx.beans.property.StringProperty;
-import javafx.concurrent.Task;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
 import org.cryptomator.ui.common.Animations;
@@ -17,6 +12,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
+import javafx.beans.property.StringProperty;
+import javafx.concurrent.Task;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;

@@ -1,5 +1,9 @@
 package org.cryptomator.ui.recoverykey;

+import org.cryptomator.ui.common.FxController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import javafx.fxml.FXML;
 import javafx.print.PageLayout;
 import javafx.print.Printer;
@@ -13,14 +17,10 @@ import javafx.scene.text.FontWeight;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
 import javafx.stage.Stage;
-import org.cryptomator.ui.common.FxController;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ResourceBundle;

 public class RecoveryKeyDisplayController implements FxController {
-	
+
 	private static final Logger LOG = LoggerFactory.getLogger(RecoveryKeyDisplayController.class);

 	private final Stage window;
@@ -41,7 +41,7 @@ public class RecoveryKeyDisplayController implements FxController {
 		PrinterJob job = PrinterJob.createPrinterJob();
 		if (job != null && job.showPrintDialog(window)) {
 			PageLayout pageLayout = job.getJobSettings().getPageLayout();
-			
+
 			String headingText = String.format(localization.getString("recoveryKey.printout.heading"), vaultName);
 			Text heading = new Text(headingText);
 			heading.setFont(Font.font("serif", FontWeight.BOLD, 20));
@@ -18,14 +18,14 @@ import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
 public class RecoveryKeyFactory {

 	private static final byte[] PEPPER = new byte[0];
-	
+
 	private final WordEncoder wordEncoder;
-	
+
 	@Inject
 	public RecoveryKeyFactory(WordEncoder wordEncoder) {
 		this.wordEncoder = wordEncoder;
 	}
-	
+
 	public Collection<String> getDictionary() {
 		return wordEncoder.getWords();
 	}
@@ -62,6 +62,7 @@ public class RecoveryKeyFactory {

 	/**
 	 * Creates a completely new masterkey using a recovery key.
+	 *
 	 * @param vaultPath Path to the storage location of a vault
 	 * @param recoveryKey A recovery key for this vault
 	 * @param newPassword The new password used to encrypt the keys
@@ -80,6 +81,7 @@ public class RecoveryKeyFactory {

 	/**
 	 * Checks whether a String is a syntactically correct recovery key with a valid checksum
+	 *
 	 * @param recoveryKey A word sequence which might be a recovery key
 	 * @return <code>true</code> if this seems to be a legitimate recovery key
 	 */
@@ -92,7 +94,7 @@ public class RecoveryKeyFactory {
 			return false;
 		}
 	}
-	
+
 	private byte[] decodeRecoveryKey(String recoveryKey) throws IllegalArgumentException {
 		byte[] paddedKey = new byte[0];
 		try {
@@ -4,13 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.scene.Scene;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
@@ -24,6 +17,13 @@ import org.cryptomator.ui.common.StageFactory;

 import javax.inject.Named;
 import javax.inject.Provider;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;

@@ -48,7 +48,7 @@ abstract class RecoveryKeyModule {
 		stage.initOwner(owner);
 		return stage;
 	}
-	
+
 	@Provides
 	@RecoveryKeyWindow
 	@RecoveryKeyScoped
@@ -129,5 +129,5 @@ abstract class RecoveryKeyModule {
 	static FxController provideNewPasswordController(ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater, @Named("newPassword") ObjectProperty<CharSequence> password) {
 		return new NewPasswordController(resourceBundle, strengthRater, password);
 	}
-	
+
 }
@@ -3,6 +3,12 @@ package org.cryptomator.ui.recoverykey;
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Strings;
 import dagger.Lazy;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
+
+import javax.inject.Inject;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.StringProperty;
@@ -13,12 +19,6 @@ import javafx.scene.control.TextFormatter;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.stage.Stage;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlScene;
-
-import javax.inject.Inject;
 import java.util.Optional;

@RecoveryKeyScoped
@@ -1,17 +1,7 @@
 package org.cryptomator.ui.recoverykey;

 import dagger.Lazy;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.StringProperty;
-import javafx.concurrent.Task;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 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;
@@ -21,12 +11,20 @@ import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
 import javax.inject.Named;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.StringProperty;
+import javafx.concurrent.Task;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;

@RecoveryKeyScoped
 public class RecoveryKeyResetPasswordController implements FxController {
-	
+
 	private static final Logger LOG = LoggerFactory.getLogger(RecoveryKeyResetPasswordController.class);

 	private final Stage window;
@@ -40,7 +38,7 @@ public class RecoveryKeyResetPasswordController implements FxController {
 	private final ErrorComponent.Builder errorComponent;

 	@Inject
-	public RecoveryKeyResetPasswordController(@RecoveryKeyWindow Stage window, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, @Named("newPassword")ObjectProperty<CharSequence> newPassword, @FxmlScene(FxmlFile.RECOVERYKEY_RECOVER) Lazy<Scene> recoverScene, ErrorComponent.Builder errorComponent) {
+	public RecoveryKeyResetPasswordController(@RecoveryKeyWindow Stage window, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, @Named("newPassword") ObjectProperty<CharSequence> newPassword, @FxmlScene(FxmlFile.RECOVERYKEY_RECOVER) Lazy<Scene> recoverScene, ErrorComponent.Builder errorComponent) {
 		this.window = window;
 		this.vault = vault;
 		this.recoveryKeyFactory = recoveryKeyFactory;
@@ -88,7 +86,7 @@ public class RecoveryKeyResetPasswordController implements FxController {
 		}

 	}
-	
+
 	/* Getter/Setter */

 	public BooleanBinding invalidNewPasswordProperty() {
@@ -1,10 +1,10 @@
 package org.cryptomator.ui.recoverykey;

-import javafx.fxml.FXML;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.FxController;

 import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;

@RecoveryKeyScoped
 public class RecoveryKeySuccessController implements FxController {
@@ -12,7 +12,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -24,19 +23,19 @@ class WordEncoder {
 	private static final String DEFAULT_WORD_FILE = "/i18n/4096words_en.txt";
 	private static final int WORD_COUNT = 4096;
 	private static final char DELIMITER = ' ';
-	
+
 	private final List<String> words;
 	private final Map<String, Integer> indices;
-	
+
 	@Inject
 	public WordEncoder() {
 		this(DEFAULT_WORD_FILE);
 	}
-	
+
 	public List<String> getWords() {
 		return words;
 	}
-	
+
 	public WordEncoder(String wordFile) {
 		try (InputStream in = getClass().getResourceAsStream(wordFile); //
 			 Reader reader = new InputStreamReader(in, StandardCharsets.US_ASCII.newDecoder()); //
@@ -53,6 +52,7 @@ class WordEncoder {

 	/**
 	 * Encodes the given input as a sequence of words.
+	 *
 	 * @param input A multiple of three bytes
 	 * @return A String that can be {@link #decode(String) decoded} to the input again.
 	 * @throws IllegalArgumentException If input is not a multiple of three bytes
@@ -60,10 +60,10 @@ class WordEncoder {
 	public String encodePadded(byte[] input) {
 		Preconditions.checkArgument(input.length % 3 == 0, "input needs to be padded to a multipe of three");
 		StringBuilder sb = new StringBuilder();
-		for (int i = 0; i < input.length; i+=3) {
+		for (int i = 0; i < input.length; i += 3) {
 			byte b1 = input[i];
-			byte b2 = input[i+1];
-			byte b3 = input[i+2];
+			byte b2 = input[i + 1];
+			byte b3 = input[i + 2];
 			int firstWordIndex = (0xFF0 & (b1 << 4)) + (0x00F & (b2 >> 4)); // 0xFFF000
 			int secondWordIndex = (0xF00 & (b2 << 8)) + (0x0FF & b3); // 0x000FFF
 			assert firstWordIndex < WORD_COUNT;
@@ -79,6 +79,7 @@ class WordEncoder {

 	/**
 	 * Decodes a String that has previously been {@link #encodePadded(byte[]) encoded} to a word sequence.
+	 *
 	 * @param encoded The word sequence
 	 * @return Decoded bytes
 	 * @throws IllegalArgumentException If the encoded string doesn't consist of a multiple of two words or one of the words is unknown to this encoder.
@@ -87,9 +88,9 @@ class WordEncoder {
 		List<String> splitted = Splitter.on(DELIMITER).omitEmptyStrings().splitToList(Strings.nullToEmpty(encoded));
 		Preconditions.checkArgument(splitted.size() % 2 == 0, "%s needs to be a multiple of two words", encoded);
 		byte[] result = new byte[splitted.size() / 2 * 3];
-		for (int i = 0; i < splitted.size(); i+=2) {
+		for (int i = 0; i < splitted.size(); i += 2) {
 			String w1 = splitted.get(i);
-			String w2 = splitted.get(i+1);
+			String w2 = splitted.get(i + 1);
 			int firstWordIndex = indices.getOrDefault(w1, -1);
 			int secondWordIndex = indices.getOrDefault(w2, -1);
 			Preconditions.checkArgument(firstWordIndex != -1, "%s not in dictionary", w1);
@@ -97,12 +98,12 @@ class WordEncoder {
 			byte b1 = (byte) (0xFF & (firstWordIndex >> 4));
 			byte b2 = (byte) ((0xF0 & (firstWordIndex << 4)) + (0x0F & (secondWordIndex >> 8)));
 			byte b3 = (byte) (0xFF & secondWordIndex);
-			result[i/2*3] = b1;
-			result[i/2*3+1] = b2;
-			result[i/2*3+2] = b3;
+			result[i / 2 * 3] = b1;
+			result[i / 2 * 3 + 1] = b2;
+			result[i / 2 * 3 + 2] = b3;
 		}
 		return result;
 	}
-	
+

 }
@@ -3,12 +3,13 @@ package org.cryptomator.ui.removevault;
 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;
+
@RemoveVaultScoped
@Subcomponent(modules = {RemoveVaultModule.class})
 public interface RemoveVaultComponent {
@@ -1,14 +1,14 @@
 package org.cryptomator.ui.removevault;

-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;

@RemoveVaultScoped
 public class RemoveVaultController implements FxController {
@@ -4,13 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyCodeCombination;
-import javafx.scene.input.KeyCombination;
-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;
@@ -20,9 +13,10 @@ import org.cryptomator.ui.common.FxmlScene;
 import org.cryptomator.ui.common.StageFactory;
 import org.cryptomator.ui.mainwindow.MainWindow;

-import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;

@@ -1,14 +1,14 @@
 package org.cryptomator.ui.traymenu;

-import javafx.application.Platform;
-import javafx.beans.Observable;
-import javafx.collections.ObservableList;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.launcher.AppLifecycleListener;
 import org.cryptomator.ui.launcher.FxApplicationStarter;
 import org.cryptomator.ui.preferences.SelectedPreferencesTab;

 import javax.inject.Inject;
+import javafx.application.Platform;
+import javafx.beans.Observable;
+import javafx.collections.ObservableList;
 import java.awt.Menu;
 import java.awt.MenuItem;
 import java.awt.PopupMenu;
--- a/Show More
+++ b/Show More