Merge pull request mbg033#46

b8c07de wizard: store password in appwindow session (Jacob Brydolf) e5b9a1b settings page: strict password check (Jacob Brydolf) 010cce4 settings page: Empty password field on seed view (Jacob Brydolf)
Jaqueeee · Oct 11, 2016 · d9b3f4a · d9b3f4a
2 parents 6bbad6c + b8c07de
commit d9b3f4a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml
@@ -36,7 +36,7 @@ import QtQuick.Controls.Styles 1.4
 
 Dialog {
     id: root
-    readonly property alias password: passwordInput.text
+    property alias password: passwordInput.text
     standardButtons: StandardButton.Ok + StandardButton.Cancel
     ColumnLayout {
         id: column

diff --git a/pages/Settings.qml b/pages/Settings.qml
@@ -72,11 +72,11 @@ Rectangle {
         id: settingsPasswordDialog
         standardButtons: StandardButton.Ok  + StandardButton.Cancel
         onAccepted: {
-            if(appWindow.password == settingsPasswordDialog.password){
+            if(appWindow.password === settingsPasswordDialog.password){
                 memoTextInput.text = currentWallet.seed
                 showSeedButton.visible = false
             }
-
+            settingsPasswordDialog.password = ""
         }
         onRejected: {
 

diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml
@@ -124,6 +124,9 @@ Rectangle {
         // protecting wallet with password
         settings.wallet.setPassword(settings.wallet_password);
 
+        // Store password in session to be able to use password protected functions (e.g show seed)
+        appWindow.password = settings.wallet_password
+
         // saving wallet_filename;
         settings['wallet_filename'] = new_wallet_filename;