From dce4c608812724d4888cd5051a211125143d8ddc Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Wed, 6 Dec 2023 08:40:43 +0100 Subject: [PATCH] removed pr unrelated changes and code cleanup --- src/main/java/org/cryptomator/common/vaults/Vault.java | 1 - .../java/org/cryptomator/common/vaults/VaultListManager.java | 4 +++- src/main/java/org/cryptomator/common/vaults/VaultModule.java | 4 ++++ src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/cryptomator/common/vaults/Vault.java b/src/main/java/org/cryptomator/common/vaults/Vault.java index d741ae5c4..ac913d316 100644 --- a/src/main/java/org/cryptomator/common/vaults/Vault.java +++ b/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 { diff --git a/src/main/java/org/cryptomator/common/vaults/VaultListManager.java b/src/main/java/org/cryptomator/common/vaults/VaultListManager.java index 6f0e30153..2399a5107 100644 --- a/src/main/java/org/cryptomator/common/vaults/VaultListManager.java +++ b/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 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(); diff --git a/src/main/java/org/cryptomator/common/vaults/VaultModule.java b/src/main/java/org/cryptomator/common/vaults/VaultModule.java index 276af9f96..c8853fa5b 100644 --- a/src/main/java/org/cryptomator/common/vaults/VaultModule.java +++ b/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 provideCryptoFileSystemReference() { diff --git a/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java index 98385f1d6..6be17ff26 100644 --- a/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java +++ b/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java @@ -133,8 +133,8 @@ public class UnlockWorkflow extends Task { 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); }