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

renamed to lastKnownKeyLoader

Browse Source
This commit is contained in:
Jan-Peter Klein
2025-02-10 12:07:25 +01:00
parent b25b5bd5a3
commit ba34cfa9d5
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/cryptomator/common/settings/VaultSettings.java
View File

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

4
src/main/java/org/cryptomator/common/settings/VaultSettingsJson.java
View File

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

12
src/main/java/org/cryptomator/common/vaults/Vault.java
View File

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

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

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

2
src/main/java/org/cryptomator/ui/convertvault/HubToPasswordConvertController.java
View File

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

2
src/main/java/org/cryptomator/ui/sharevault/ShareVaultController.java
View File

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

2
src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsController.java
View File

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