From 010cce4133c3c35405cbaaae83e9a39a63428e02 Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Tue, 11 Oct 2016 00:19:11 +0200 Subject: [PATCH 1/3] settings page: Empty password field on seed view --- components/PasswordDialog.qml | 2 +- pages/Settings.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml index 9edf87fcdf..69a2ae9145 100644 --- 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 index d46186af51..973ff77341 100644 --- a/pages/Settings.qml +++ b/pages/Settings.qml @@ -76,7 +76,7 @@ Rectangle { memoTextInput.text = currentWallet.seed showSeedButton.visible = false } - + settingsPasswordDialog.password = "" } onRejected: { From e5b9a1b9d79500573f8ce2865fd515a8adae53b2 Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Tue, 11 Oct 2016 01:00:19 +0200 Subject: [PATCH 2/3] settings page: strict password check --- pages/Settings.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/Settings.qml b/pages/Settings.qml index 973ff77341..8e73b8fe24 100644 --- a/pages/Settings.qml +++ b/pages/Settings.qml @@ -72,7 +72,7 @@ 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 } From b8c07de8197c69f95681f27be4c86d5b5e5bdefa Mon Sep 17 00:00:00 2001 From: Jacob Brydolf Date: Tue, 11 Oct 2016 01:02:07 +0200 Subject: [PATCH 3/3] wizard: store password in appwindow session --- wizard/WizardMain.qml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml index 097fb58a3d..43200304d3 100644 --- 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;