From c5a9926652651a1942e8bfd338fc8a6222285f10 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 9 Oct 2019 15:15:13 +0200
Subject: [PATCH] Added localizable labels to recovery key display window

---
 .../ui/recoverykey/RecoveryKeyCreationController.java    | 5 +++++
 .../ui/recoverykey/RecoveryKeyDisplayController.java     | 9 ++++++++-
 .../cryptomator/ui/recoverykey/RecoveryKeyModule.java    | 2 +-
 .../main/resources/fxml/addvault_new_recoverykey.fxml    | 5 ++---
 main/ui/src/main/resources/fxml/recoverykey_create.fxml  | 6 +++++-
 main/ui/src/main/resources/fxml/recoverykey_display.fxml | 9 ++++++---
 .../src/main/resources/fxml/vault_options_general.fxml   | 2 +-
 main/ui/src/main/resources/i18n/strings.properties       | 6 ++++++
 8 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
index 4135d2318..3ddb9dd27 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
@@ -63,4 +63,9 @@ public class RecoveryKeyCreationController implements FxController {
 		window.close();
 	}
 
+	/* Getter/Setter */
+
+	public Vault getVault() {
+		return vault;
+	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyDisplayController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyDisplayController.java
index b15978e3e..2d96d786f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyDisplayController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyDisplayController.java
@@ -4,6 +4,7 @@ import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
 import javafx.stage.Stage;
+import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
@@ -12,11 +13,13 @@ import javax.inject.Inject;
 public class RecoveryKeyDisplayController implements FxController {
 
 	private final Stage window;
+	private final Vault vault;
 	private final StringProperty recoveryKeyProperty;
 
 	@Inject
-	public RecoveryKeyDisplayController(@RecoveryKeyWindow Stage window, @RecoveryKeyWindow StringProperty recoveryKey) {
+	public RecoveryKeyDisplayController(@RecoveryKeyWindow Stage window, @RecoveryKeyWindow Vault vault, @RecoveryKeyWindow StringProperty recoveryKey) {
 		this.window = window;
+		this.vault = vault;
 		this.recoveryKeyProperty = recoveryKey;
 	}
 
@@ -27,6 +30,10 @@ public class RecoveryKeyDisplayController implements FxController {
 
 	/* Getter/Setter */
 
+	public Vault getVault() {
+		return vault;
+	}
+
 	public ReadOnlyStringProperty recoveryKeyProperty() {
 		return recoveryKeyProperty;
 	}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
index df8223314..261b50682 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
@@ -38,7 +38,7 @@ abstract class RecoveryKeyModule {
 	@RecoveryKeyScoped
 	static Stage provideStage(ResourceBundle resourceBundle, @Named("windowIcon") Optional<Image> windowIcon, @Named("keyRecoveryOwner") Stage owner) {
 		Stage stage = new Stage();
-		stage.setTitle("TODO keyRecovery.title"); // TODO localize
+		stage.setTitle(resourceBundle.getString("recoveryKey.title"));
 		stage.setResizable(false);
 		stage.initModality(Modality.WINDOW_MODAL);
 		stage.initOwner(owner);
diff --git a/main/ui/src/main/resources/fxml/addvault_new_recoverykey.fxml b/main/ui/src/main/resources/fxml/addvault_new_recoverykey.fxml
index c58436e69..9239fac8b 100644
--- a/main/ui/src/main/resources/fxml/addvault_new_recoverykey.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_new_recoverykey.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.TextArea?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 <VBox xmlns="http://javafx.com/javafx"
@@ -23,8 +23,7 @@
 
 		<Label text="%addvaultwizard.new.recoveryKeyInstruction" wrapText="true"/>
 
-		<!-- TODO use TextArea instead -->
-		<TextField editable="false" text="${controller.recoveryKey}"/>
+		<TextArea editable="false" text="${controller.recoveryKey}" wrapText="true"/>
 
 		<CheckBox fx:id="finalConfirmationCheckbox" text="%addvaultwizard.new.recoveryKeySavedCheckbox" wrapText="true"/>
 
diff --git a/main/ui/src/main/resources/fxml/recoverykey_create.fxml b/main/ui/src/main/resources/fxml/recoverykey_create.fxml
index da56bc993..c1c7299a1 100644
--- a/main/ui/src/main/resources/fxml/recoverykey_create.fxml
+++ b/main/ui/src/main/resources/fxml/recoverykey_create.fxml
@@ -5,6 +5,7 @@
 <?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
 <?import org.cryptomator.ui.controls.NiceSecurePasswordField?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
@@ -18,7 +19,10 @@
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
-		<NiceSecurePasswordField fx:id="passwordField" HBox.hgrow="ALWAYS"/>
+		<VBox spacing="6">
+			<FormattedLabel format="%recoveryKey.enterPassword.prompt" arg1="${controller.vault.displayableName}" wrapText="true"/>
+			<NiceSecurePasswordField fx:id="passwordField" HBox.hgrow="ALWAYS"/>
+		</VBox>
 
 		<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
 			<ButtonBar buttonMinWidth="120" buttonOrder="C+X">
diff --git a/main/ui/src/main/resources/fxml/recoverykey_display.fxml b/main/ui/src/main/resources/fxml/recoverykey_display.fxml
index d5f888398..65b3f5d66 100644
--- a/main/ui/src/main/resources/fxml/recoverykey_display.fxml
+++ b/main/ui/src/main/resources/fxml/recoverykey_display.fxml
@@ -9,6 +9,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.recoverykey.RecoveryKeyDisplayController"
@@ -27,9 +28,11 @@
 				<Circle styleClass="glyph-icon-primary" radius="24"/>
 				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="CHECK" glyphSize="24"/>
 			</StackPane>
-			
-			<!-- TODO use TextArea instead -->
-			<TextArea editable="false" text="${controller.recoveryKey}" wrapText="true"  HBox.hgrow="ALWAYS"/>
+
+			<VBox spacing="6" HBox.hgrow="ALWAYS">
+				<FormattedLabel format="%recoveryKey.display.message" arg1="${controller.vault.displayableName}" wrapText="true" VBox.vgrow="NEVER"/>
+				<TextArea editable="false" text="${controller.recoveryKey}" wrapText="true" VBox.vgrow="ALWAYS"/>
+			</VBox>
 		</HBox>
 
 		<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
diff --git a/main/ui/src/main/resources/fxml/vault_options_general.fxml b/main/ui/src/main/resources/fxml/vault_options_general.fxml
index cf72b60ed..59ea482ac 100644
--- a/main/ui/src/main/resources/fxml/vault_options_general.fxml
+++ b/main/ui/src/main/resources/fxml/vault_options_general.fxml
@@ -12,6 +12,6 @@
 	</padding>
 	<children>
 		<Button text="%vaultOptions.general.changePasswordBtn" onAction="#changePassword"/>
-		<Button text="TODO show recovery key" onAction="#showRecoveryKey"/>
+		<Button text="%vaultOptions.general.showRecoveryKeyBtn" onAction="#showRecoveryKey"/>
 	</children>
 </VBox>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 97b29266c..3693adf3b 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -146,11 +146,17 @@ wrongFileAlert.information=You have tried to add a file or folder that does not
 # Vault Options
 vaultOptions.general=General
 vaultOptions.general.changePasswordBtn=Change Password
+vaultOptions.general.showRecoveryKeyBtn=Display Recovery Key
 vaultOptions.mount=Mounting
 vaultOptions.mount.readonly=Read-Only
 vaultOptions.mount.driveName=Drive Name
 vaultOptions.mount.customMountFlags=Custom Mount Flags
 
+# Recovery Key
+recoveryKey.title=Recovery Key
+recoveryKey.enterPassword.prompt=Enter your password to show the recovery key for "%s":
+recoveryKey.display.message=Recovery Key for "%s":
+
 # Misc
 passwordStrength.messageLabel.0=Very weak
 passwordStrength.messageLabel.1=Weak