[Refactor] Use isWalletUnlocked() to check valid in requestUnlock()

random-zebra · random-zebra · commit dee68e36f3a1 · 2020-03-23T09:16:37.000+01:00
diff --git a/src/qt/pivx/topbar.cpp b/src/qt/pivx/topbar.cpp
@@ -205,7 +205,6 @@ void TopBar::openPassPhraseDialog(AskPassphraseDialog::Mode mode, AskPassphraseD
 void TopBar::encryptWallet()
 {
     return openPassPhraseDialog(AskPassphraseDialog::Mode::Encrypt, AskPassphraseDialog::Context::Encrypt);
-
 }
 
 void TopBar::unlockWallet()
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
@@ -196,7 +196,7 @@ void WalletModel::updateStatus()
 bool WalletModel::isWalletUnlocked() const
 {
     EncryptionStatus status = getEncryptionStatus();
-    return status == Unencrypted || status == Unlocked;
+    return (status == Unencrypted || status == Unlocked);
 }
 
 bool WalletModel::isWalletLocked(bool fFullUnlocked) const
@@ -913,8 +913,7 @@ WalletModel::UnlockContext WalletModel::requestUnlock()
         Q_EMIT requireUnlock();
     }
     // If wallet is still locked, unlock was failed or cancelled, mark context as invalid
-    const WalletModel::EncryptionStatus status_after = getEncryptionStatus();
-    bool valid = (status_after != Locked && status_after != UnlockedForStaking);
+    bool valid = isWalletUnlocked();
 
     return UnlockContext(this, valid, status_before);
 }
@@ -929,9 +928,10 @@ WalletModel::UnlockContext::UnlockContext(WalletModel *_wallet, bool _valid, con
 
 WalletModel::UnlockContext::~UnlockContext()
 {
-    if (valid && relock) {
+    if (valid && relock && wallet) {
         if (was_status == Locked) wallet->setWalletLocked(true);
         else if (was_status == UnlockedForStaking) wallet->lockForStakingOnly();
+        wallet->updateStatus();
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,6 @@ void TopBar::openPassPhraseDialog(AskPassphraseDialog::Mode mode, AskPassphraseD`
`205`	`205`	`void TopBar::encryptWallet()`
`206`	`206`	`{`
`207`	`207`	`return openPassPhraseDialog(AskPassphraseDialog::Mode::Encrypt, AskPassphraseDialog::Context::Encrypt);`
`208`		`-`
`209`	`208`	`}`
`210`	`209`
`211`	`210`	`void TopBar::unlockWallet()`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ void WalletModel::updateStatus()`
`196`	`196`	`bool WalletModel::isWalletUnlocked() const`
`197`	`197`	`{`
`198`	`198`	`EncryptionStatus status = getEncryptionStatus();`
`199`		`- return status == Unencrypted \|\| status == Unlocked;`
	`199`	`+ return (status == Unencrypted \|\| status == Unlocked);`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`bool WalletModel::isWalletLocked(bool fFullUnlocked) const`
`@@ -913,8 +913,7 @@ WalletModel::UnlockContext WalletModel::requestUnlock()`
`913`	`913`	`Q_EMIT requireUnlock();`
`914`	`914`	`}`
`915`	`915`	`// If wallet is still locked, unlock was failed or cancelled, mark context as invalid`
`916`		`- const WalletModel::EncryptionStatus status_after = getEncryptionStatus();`
`917`		`- bool valid = (status_after != Locked && status_after != UnlockedForStaking);`
	`916`	`+ bool valid = isWalletUnlocked();`
`918`	`917`
`919`	`918`	`return UnlockContext(this, valid, status_before);`
`920`	`919`	`}`
`@@ -929,9 +928,10 @@ WalletModel::UnlockContext::UnlockContext(WalletModel *_wallet, bool _valid, con`
`929`	`928`
`930`	`929`	`WalletModel::UnlockContext::~UnlockContext()`
`931`	`930`	`{`
`932`		`- if (valid && relock) {`
	`931`	`+ if (valid && relock && wallet) {`
`933`	`932`	`if (was_status == Locked) wallet->setWalletLocked(true);`
`934`	`933`	`else if (was_status == UnlockedForStaking) wallet->lockForStakingOnly();`
	`934`	`+ wallet->updateStatus();`
`935`	`935`	`}`
`936`	`936`	`}`
`937`	`937`