From 77552569563389c4cfce5b08f4238b4b04232f6f Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 12 Feb 2020 16:19:42 +0100 Subject: [PATCH] further additions to #1060 --- .../recovervault/RecoverVaultController.java | 33 ++++++++++++++++++- .../src/main/resources/fxml/recovervault.fxml | 9 +++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/recovervault/RecoverVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/recovervault/RecoverVaultController.java index f7d20fd92..304aeef07 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/recovervault/RecoverVaultController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/recovervault/RecoverVaultController.java @@ -1,9 +1,14 @@ package org.cryptomator.ui.recovervault; import dagger.Lazy; +import javafx.beans.Observable; +import javafx.beans.property.StringProperty; +import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.Scene; +import javafx.scene.control.TextArea; import javafx.stage.Stage; +import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; @@ -20,16 +25,42 @@ public class RecoverVaultController implements FxController { private final Stage window; private final Lazy successScene; + private final Vault vault; + private StringProperty recoveryKey; + + public TextArea textarea; @Inject - public RecoverVaultController(@RecoverVaultWindow Stage window, @FxmlScene(FxmlFile.RECOVER_VAULT) Lazy successScene) { + public RecoverVaultController(@RecoverVaultWindow Stage window, @FxmlScene(FxmlFile.RECOVER_VAULT) Lazy successScene, @RecoverVaultWindow Vault vault, @RecoverVaultWindow StringProperty recoveryKey) { this.window = window; this.successScene = successScene; + this.vault = vault; + this.recoveryKey = recoveryKey; } + @FXML + public void initialize() { + textarea.getParagraphs().addListener(this::updateRecoveryKeyProperty); + } + + + private void updateRecoveryKeyProperty(@SuppressWarnings("unused") Observable observable) { + recoveryKey.set(textarea.getText()); + } + + @FXML public void close() { window.close(); } + public void recoverData(ActionEvent actionEvent) { + //TODO: CryptoAPI call, show progress bar + } + + /* Getter/Setter */ + + public Vault getVault() { + return vault; + } } diff --git a/main/ui/src/main/resources/fxml/recovervault.fxml b/main/ui/src/main/resources/fxml/recovervault.fxml index 9b0a6bf71..ff640df24 100644 --- a/main/ui/src/main/resources/fxml/recovervault.fxml +++ b/main/ui/src/main/resources/fxml/recovervault.fxml @@ -4,6 +4,9 @@ + + + + + + +