From ba34cfa9d59a05c3562297fc1270c7a4066882fc Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Mon, 10 Feb 2025 12:07:25 +0100 Subject: [PATCH] renamed to lastKnownKeyLoader --- .../cryptomator/common/settings/VaultSettings.java | 8 ++++---- .../common/settings/VaultSettingsJson.java | 4 ++-- .../java/org/cryptomator/common/vaults/Vault.java | 12 ++++++------ .../cryptomator/common/vaults/VaultListManager.java | 6 +++--- .../convertvault/HubToPasswordConvertController.java | 2 +- .../ui/sharevault/ShareVaultController.java | 2 +- .../ui/vaultoptions/VaultOptionsController.java | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/src/main/java/org/cryptomator/common/settings/VaultSettings.java index b211b356b..5112415b4 100644 --- a/src/main/java/org/cryptomator/common/settings/VaultSettings.java +++ b/src/main/java/org/cryptomator/common/settings/VaultSettings.java @@ -58,7 +58,7 @@ public class VaultSettings { public final StringExpression mountName; public final StringProperty mountService; public final IntegerProperty port; - public final StringProperty keyLoader; + public final StringProperty lastKnownKeyLoader; VaultSettings(VaultSettingsJson json) { this.id = json.id; @@ -75,7 +75,7 @@ public class VaultSettings { this.mountPoint = new SimpleObjectProperty<>(this, "mountPoint", json.mountPoint == null ? null : Path.of(json.mountPoint)); this.mountService = new SimpleStringProperty(this, "mountService", json.mountService); this.port = new SimpleIntegerProperty(this, "port", json.port); - this.keyLoader = new SimpleStringProperty(this, "keyLoader", json.keyLoader); + this.lastKnownKeyLoader = new SimpleStringProperty(this, "lastKnownKeyLoader", json.lastKnownKeyLoader); // mount name is no longer an explicit setting, see https://github.com/cryptomator/cryptomator/pull/1318 this.mountName = StringExpression.stringExpression(Bindings.createStringBinding(() -> { final String name; @@ -101,7 +101,7 @@ public class VaultSettings { } Observable[] observables() { - return new Observable[]{actionAfterUnlock, autoLockIdleSeconds, autoLockWhenIdle, displayName, maxCleartextFilenameLength, mountFlags, mountPoint, path, revealAfterMount, unlockAfterStartup, usesReadOnlyMode, port, mountService, keyLoader}; + return new Observable[]{actionAfterUnlock, autoLockIdleSeconds, autoLockWhenIdle, displayName, maxCleartextFilenameLength, mountFlags, mountPoint, path, revealAfterMount, unlockAfterStartup, usesReadOnlyMode, port, mountService, lastKnownKeyLoader}; } public static VaultSettings withRandomId() { @@ -132,7 +132,7 @@ public class VaultSettings { json.mountPoint = mountPoint.map(Path::toString).getValue(); json.mountService = mountService.get(); json.port = port.get(); - json.keyLoader = keyLoader.get(); + json.lastKnownKeyLoader = lastKnownKeyLoader.get(); return json; } diff --git a/src/main/java/org/cryptomator/common/settings/VaultSettingsJson.java b/src/main/java/org/cryptomator/common/settings/VaultSettingsJson.java index 61de7ae7b..870b74e07 100644 --- a/src/main/java/org/cryptomator/common/settings/VaultSettingsJson.java +++ b/src/main/java/org/cryptomator/common/settings/VaultSettingsJson.java @@ -48,8 +48,8 @@ class VaultSettingsJson { @JsonProperty("mountService") String mountService; - @JsonProperty("keyLoader") - String keyLoader; + @JsonProperty("lastKnownKeyLoader") + String lastKnownKeyLoader; @JsonProperty("port") int port = VaultSettings.DEFAULT_PORT; diff --git a/src/main/java/org/cryptomator/common/vaults/Vault.java b/src/main/java/org/cryptomator/common/vaults/Vault.java index 182372a56..7605b9f34 100644 --- a/src/main/java/org/cryptomator/common/vaults/Vault.java +++ b/src/main/java/org/cryptomator/common/vaults/Vault.java @@ -75,7 +75,7 @@ public class Vault { private final Mounter mounter; private final Settings settings; private final BooleanProperty showingStats; - private final StringBinding keyLoader; + private final StringBinding lastKnownKeyLoader; private final AtomicReference mountHandle = new AtomicReference<>(null); @@ -105,7 +105,7 @@ public class Vault { this.settings = settings; this.showingStats = new SimpleBooleanProperty(false); this.quickAccessEntry = new AtomicReference<>(null); - this.keyLoader = Bindings.createStringBinding(this::getKeyLoader, vaultSettings.keyLoader); + this.lastKnownKeyLoader = Bindings.createStringBinding(this::getLastKnownKeyLoader, vaultSettings.lastKnownKeyLoader); } // ****************************************************************************** @@ -342,12 +342,12 @@ public class Vault { return handle == null ? null : handle.mountObj().getMountpoint(); } - public StringBinding keyLoaderProperty() { - return keyLoader; + public StringBinding lastKnownKeyLoaderProperty() { + return lastKnownKeyLoader; } - public String getKeyLoader() { - return vaultSettings.keyLoader.get(); + public String getLastKnownKeyLoader() { + return vaultSettings.lastKnownKeyLoader.get(); } public StringBinding displayablePathProperty() { diff --git a/src/main/java/org/cryptomator/common/vaults/VaultListManager.java b/src/main/java/org/cryptomator/common/vaults/VaultListManager.java index b14c8457d..944c7573d 100644 --- a/src/main/java/org/cryptomator/common/vaults/VaultListManager.java +++ b/src/main/java/org/cryptomator/common/vaults/VaultListManager.java @@ -82,11 +82,11 @@ public class VaultListManager { private void setVaultScheme(Vault vault) { try { - var keyLoader = vault.getVaultSettings().keyLoader; - if (Objects.isNull(keyLoader.get())) { + var lastKnownKeyLoader = vault.getVaultSettings().lastKnownKeyLoader; + if (Objects.isNull(lastKnownKeyLoader.get())) { var vaultConfig = vault.getVaultConfigCache().get(); var keyIdScheme = vaultConfig.getKeyId().getScheme(); - keyLoader.set(keyIdScheme); + lastKnownKeyLoader.set(keyIdScheme); } } catch (NoSuchFileException e) { LOG.error("NoSuchFileException", e); diff --git a/src/main/java/org/cryptomator/ui/convertvault/HubToPasswordConvertController.java b/src/main/java/org/cryptomator/ui/convertvault/HubToPasswordConvertController.java index a02c7a0b9..dc95f7051 100644 --- a/src/main/java/org/cryptomator/ui/convertvault/HubToPasswordConvertController.java +++ b/src/main/java/org/cryptomator/ui/convertvault/HubToPasswordConvertController.java @@ -109,7 +109,7 @@ public class HubToPasswordConvertController implements FxController { .thenRunAsync(this::convertInternal, backgroundExecutorService) // .whenCompleteAsync((result, exception) -> { if (exception == null) { - vault.getVaultSettings().keyLoader.set(MasterkeyFileLoadingStrategy.SCHEME); + vault.getVaultSettings().lastKnownKeyLoader.set(MasterkeyFileLoadingStrategy.SCHEME); LOG.info("Conversion of vault {} succeeded.", vault.getPath()); window.setScene(successScene.get()); } else { diff --git a/src/main/java/org/cryptomator/ui/sharevault/ShareVaultController.java b/src/main/java/org/cryptomator/ui/sharevault/ShareVaultController.java index 37202d2de..6e386fd77 100644 --- a/src/main/java/org/cryptomator/ui/sharevault/ShareVaultController.java +++ b/src/main/java/org/cryptomator/ui/sharevault/ShareVaultController.java @@ -33,7 +33,7 @@ public class ShareVaultController implements FxController { this.window = window; this.application = application; this.vault = vault; - var vaultKeyLoader = vault.getVaultSettings().keyLoader.get(); + var vaultKeyLoader = vault.getVaultSettings().lastKnownKeyLoader.get(); this.hubVault = (vaultKeyLoader.equals(HubKeyLoadingStrategy.SCHEME_HUB_HTTP) || vaultKeyLoader.equals(HubKeyLoadingStrategy.SCHEME_HUB_HTTPS)); } diff --git a/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsController.java b/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsController.java index aa8bfcd9b..26d28a972 100644 --- a/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsController.java +++ b/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsController.java @@ -42,7 +42,7 @@ public class VaultOptionsController implements FxController { window.setOnShowing(this::windowWillAppear); selectedTabProperty.addListener(observable -> this.selectChosenTab()); tabPane.getSelectionModel().selectedItemProperty().addListener(observable -> this.selectedTabChanged()); - var vaultKeyLoader = vault.getVaultSettings().keyLoader.get(); + var vaultKeyLoader = vault.getVaultSettings().lastKnownKeyLoader.get(); if(!vaultKeyLoader.equals(MasterkeyFileLoadingStrategy.SCHEME)){ tabPane.getTabs().remove(keyTab); }