Browse Source

removed pr unrelated changes and code cleanup

Jan-Peter Klein 1 year ago
parent
commit
dce4c60881

+ 0 - 1
src/main/java/org/cryptomator/common/vaults/Vault.java

@@ -147,7 +147,6 @@ public class Vault {
 		if (cryptoFileSystem.get() != null) {
 			throw new IllegalStateException("Already unlocked.");
 		}
-
 		CryptoFileSystem fs = createCryptoFileSystem(keyLoader);
 		boolean success = false;
 		try {

+ 3 - 1
src/main/java/org/cryptomator/common/vaults/VaultListManager.java

@@ -37,6 +37,7 @@ public class VaultListManager {
 
 	private static final Logger LOG = LoggerFactory.getLogger(VaultListManager.class);
 
+	private final AutoLocker autoLocker;
 	private final VaultComponent.Factory vaultComponentFactory;
 	private final ObservableList<Vault> vaultList;
 	private final String defaultVaultName;
@@ -48,9 +49,10 @@ public class VaultListManager {
 							VaultComponent.Factory vaultComponentFactory, //
 							ResourceBundle resourceBundle, Settings settings) {
 		this.vaultList = vaultList;
+		this.autoLocker = autoLocker;
 		this.vaultComponentFactory = vaultComponentFactory;
 		this.defaultVaultName = resourceBundle.getString("defaults.vault.vaultName");
-		
+
 		addAll(settings.directories);
 		vaultList.addListener(new VaultListChangeListener(settings.directories));
 		autoLocker.init();

+ 4 - 0
src/main/java/org/cryptomator/common/vaults/VaultModule.java

@@ -9,6 +9,8 @@ import dagger.Module;
 import dagger.Provides;
 import org.cryptomator.common.Nullable;
 import org.cryptomator.cryptofs.CryptoFileSystem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.inject.Named;
 import javafx.beans.property.ObjectProperty;
@@ -18,6 +20,8 @@ import java.util.concurrent.atomic.AtomicReference;
 @Module
 public class VaultModule {
 
+	private static final Logger LOG = LoggerFactory.getLogger(VaultModule.class);
+
 	@Provides
 	@PerVault
 	public AtomicReference<CryptoFileSystem> provideCryptoFileSystemReference() {

+ 2 - 2
src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java

@@ -133,8 +133,8 @@ public class UnlockWorkflow extends Task<Boolean> {
 		Throwable throwable = super.getException();
 		if(throwable instanceof IllegalMountPointException impe) {
 			handleIllegalMountPointError(impe);
-		} else if (throwable instanceof FuseRestartRequiredException fRRE) {
-			handleFuseRestartRequiredError(fRRE);
+		} else if (throwable instanceof FuseRestartRequiredException e) {
+			handleFuseRestartRequiredError(e);
 		} else {
 			handleGenericError(throwable);
 		}