removed pr unrelated changes and code cleanup

This commit is contained in:
Jan-Peter Klein
2023-12-06 08:40:43 +01:00
parent 63bf0315c7
commit dce4c60881
4 changed files with 9 additions and 4 deletions

View File

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

View File

@@ -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();

View File

@@ -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() {

View File

@@ -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);
}