Merge pull request #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)
This commit is contained in:
Riccardo Spagni 2016-10-11 10:28:31 +02:00
commit d9b3f4a4fd
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
3 changed files with 6 additions and 3 deletions

View File

@ -36,7 +36,7 @@ import QtQuick.Controls.Styles 1.4
Dialog { Dialog {
id: root id: root
readonly property alias password: passwordInput.text property alias password: passwordInput.text
standardButtons: StandardButton.Ok + StandardButton.Cancel standardButtons: StandardButton.Ok + StandardButton.Cancel
ColumnLayout { ColumnLayout {
id: column id: column

View File

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

View File

@ -124,6 +124,9 @@ Rectangle {
// protecting wallet with password // protecting wallet with password
settings.wallet.setPassword(settings.wallet_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; // saving wallet_filename;
settings['wallet_filename'] = new_wallet_filename; settings['wallet_filename'] = new_wallet_filename;