mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-22 12:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

small enhancements

Browse Source
This commit is contained in:
Jan-Peter Klein
2025-07-04 19:17:24 +02:00
parent 8089bcd0d0
commit 191d9473c0
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/cryptomator/common/vaults/VaultListManager.java
View File

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

4
src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/ChooseMasterkeyFileController.java
View File

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

2
src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
View File

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