From 17166c45ac83d7887a9e283d45197bbd05e28ffc Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Wed, 3 Sep 2025 14:42:20 +0200 Subject: [PATCH] show correct message --- .../recoverykey/RecoveryKeyOnboardingController.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyOnboardingController.java b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyOnboardingController.java index c7f560466..74b4afc79 100644 --- a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyOnboardingController.java +++ b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyOnboardingController.java @@ -2,6 +2,8 @@ package org.cryptomator.ui.recoverykey; import dagger.Lazy; import org.cryptomator.common.recovery.RecoveryActionType; +import org.cryptomator.common.vaults.Vault; +import org.cryptomator.common.vaults.VaultState; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; @@ -32,6 +34,7 @@ import static org.cryptomator.common.recovery.RecoveryActionType.RESTORE_VAULT_C public class RecoveryKeyOnboardingController implements FxController { private final Stage window; + private final Vault vault; private final Lazy recoverykeyRecoverScene; private final Lazy recoverykeyExpertSettingsScene; private final ObjectProperty recoverType; @@ -58,11 +61,13 @@ public class RecoveryKeyOnboardingController implements FxController { @Inject public RecoveryKeyOnboardingController(@RecoveryKeyWindow Stage window, // + @RecoveryKeyWindow Vault vault, // @FxmlScene(FxmlFile.RECOVERYKEY_RECOVER) Lazy recoverykeyRecoverScene, // @FxmlScene(FxmlFile.RECOVERYKEY_EXPERT_SETTINGS) Lazy recoverykeyExpertSettingsScene, // @Named("recoverType") ObjectProperty recoverType, // ResourceBundle resourceBundle) { this.window = window; + this.vault = vault; window.setTitle(resourceBundle.getString("recoveryKey.recoverVaultConfig.title")); this.recoverykeyRecoverScene = recoverykeyRecoverScene; @@ -94,8 +99,10 @@ public class RecoveryKeyOnboardingController implements FxController { default -> window.setTitle(""); } - messageLabel.textProperty().bind(Bindings.createStringBinding( - () -> resourceBundle.getString("recoveryKey.recover.onBoarding.readThis"), recoverType)); + messageLabel.textProperty().bind(Bindings.createStringBinding(() -> + vault.getState() == VaultState.Value.ALL_MISSING + ? resourceBundle.getString("recoveryKey.recover.onBoarding.message") + : resourceBundle.getString("recoveryKey.recover.onBoarding.readThis"))); titleLabel.textProperty().bind(Bindings.createStringBinding(() -> recoverType.get() == RecoveryActionType.RESTORE_MASTERKEY