diff --git a/src/main/java/org/cryptomator/common/vaults/VaultListManager.java b/src/main/java/org/cryptomator/common/vaults/VaultListManager.java index cb084359a..551988828 100644 --- a/src/main/java/org/cryptomator/common/vaults/VaultListManager.java +++ b/src/main/java/org/cryptomator/common/vaults/VaultListManager.java @@ -135,7 +135,7 @@ public class VaultListManager { private Vault create(VaultSettings vaultSettings) { var wrapper = new VaultConfigCache(vaultSettings); try { - var vaultState = determineVaultState(vaultSettings.path.get(), vaultSettings); + var vaultState = determineVaultState(vaultSettings.path.get()); if (vaultState == LOCKED) { //for legacy reasons: pre v8 vault do not have a config, but they are in the NEEDS_MIGRATION state wrapper.reloadConfig(); if (Objects.isNull(vaultSettings.lastKnownKeyLoader.get())) { @@ -169,15 +169,15 @@ public class VaultListManager { } public static VaultState.Value redetermineVaultState(Vault vault) { - VaultState state = vault.stateProperty(); + VaultState state = vault.stateProperty(); VaultState.Value previous = state.getValue(); - if (previous.equals(UNLOCKED)||previous.equals(PROCESSING)) { + if (previous.equals(UNLOCKED) || previous.equals(PROCESSING)) { return previous; } try { - VaultState.Value determined = determineVaultState(vault.getPath(), vault.getVaultSettings()); + VaultState.Value determined = determineVaultState(vault.getPath()); if (determined == LOCKED) { vault.getVaultConfigCache().reloadConfig(); @@ -193,7 +193,7 @@ public class VaultListManager { } } - public static VaultState.Value determineVaultState(Path pathToVault, VaultSettings vaultSettings) throws IOException { + public static VaultState.Value determineVaultState(Path pathToVault) throws IOException { Path pathToVaultConfig = pathToVault.resolve(VAULTCONFIG_FILENAME); Path pathToMasterkey = pathToVault.resolve(MASTERKEY_FILENAME); @@ -213,7 +213,6 @@ public class VaultListManager { return VAULT_CONFIG_MISSING; } - return checkDirStructure(pathToVault); } @@ -222,7 +221,7 @@ public class VaultListManager { case VAULT -> VaultState.Value.LOCKED; case UNRELATED -> VaultState.Value.MISSING; case MAYBE_LEGACY -> Migrators.get().needsMigration(pathToVault, VAULTCONFIG_FILENAME, MASTERKEY_FILENAME) ? // - NEEDS_MIGRATION // + VaultState.Value.NEEDS_MIGRATION // : VaultState.Value.MISSING; }; } diff --git a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/ChooseMasterkeyFileController.java b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/ChooseMasterkeyFileController.java index 722c780b4..4f6403e87 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/ChooseMasterkeyFileController.java +++ b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/ChooseMasterkeyFileController.java @@ -56,10 +56,10 @@ public class ChooseMasterkeyFileController implements FxController { restoreInsteadCheckBox.selectedProperty().addListener((_, _, newVal) -> { if (newVal) { chooseButton.setText(resourceBundle.getString("addvaultwizard.existing.restore")); - chooseButton.setOnAction(e -> restoreMasterkey()); + chooseButton.setOnAction(_ -> restoreMasterkey()); } else { chooseButton.setText(resourceBundle.getString("generic.button.choose")); - chooseButton.setOnAction(e -> proceed()); + chooseButton.setOnAction(_ -> proceed()); } }); } diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java index e836eff9c..d625d6662 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java @@ -289,7 +289,7 @@ public class VaultListController implements FxController { var wrapper = new VaultConfigCache(vaultSettings); Vault vault = vaultComponentFactory.create(vaultSettings, wrapper, LOCKED, null).vault(); try { - VaultListManager.determineVaultState(vault.getPath(), vaultSettings); + VaultListManager.determineVaultState(vault.getPath()); } catch (IOException e) { LOG.warn("Failed to determine vault state for {}", vaultSettings.path.get(), e); }