foster/bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-04 13:55:23 -05:00
Code Issues Activity

qt, wallet: Remove unused AskPassphraseDialog::Decrypt

Browse source 
Co-authored-by: Sehyun Chung <sehyun@berkeley.edu>
This commit is contained in:
Hennadii Stepanov 2020-10-23 19:51:19 +03:00
parent 49984b44cf
commit 6e950118a3
No known key found for this signature in database
GPG key ID: 410108112E7EA81F
3 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/qt/askpassphrasedialog.cpp
View file

@ -58,14 +58,6 @@ AskPassphraseDialog::AskPassphraseDialog(Mode _mode, QWidget *parent, SecureStri
ui->passEdit3->hide(); ui->passEdit3->hide();
setWindowTitle(tr("Unlock wallet")); setWindowTitle(tr("Unlock wallet"));
break; break;
case Decrypt: // Ask passphrase
ui->warningLabel->setText(tr("This operation needs your wallet passphrase to decrypt the wallet."));
ui->passLabel2->hide();
ui->passEdit2->hide();
ui->passLabel3->hide();
ui->passEdit3->hide();
setWindowTitle(tr("Decrypt wallet"));
break;
case ChangePass: // Ask old passphrase + new passphrase x2 case ChangePass: // Ask old passphrase + new passphrase x2
setWindowTitle(tr("Change passphrase")); setWindowTitle(tr("Change passphrase"));
ui->warningLabel->setText(tr("Enter the old passphrase and new passphrase for the wallet.")); ui->warningLabel->setText(tr("Enter the old passphrase and new passphrase for the wallet."));
@ -176,17 +168,6 @@ void AskPassphraseDialog::accept()
QMessageBox::critical(this, tr("Wallet unlock failed"), e.what()); QMessageBox::critical(this, tr("Wallet unlock failed"), e.what());
} }
break; break;
case Decrypt:
if(!model->setWalletEncrypted(false, oldpass))
{
QMessageBox::critical(this, tr("Wallet decryption failed"),
tr("The passphrase entered for the wallet decryption was incorrect."));
}
else
{
QDialog::accept(); // Success
}
break;
case ChangePass: case ChangePass:
if(newpass1 == newpass2) if(newpass1 == newpass2)
{ {
@ -221,9 +202,6 @@ void AskPassphraseDialog::textChanged()
acceptable = !ui->passEdit2->text().isEmpty() && !ui->passEdit3->text().isEmpty(); acceptable = !ui->passEdit2->text().isEmpty() && !ui->passEdit3->text().isEmpty();
break; break;
case Unlock: // Old passphrase x1 case Unlock: // Old passphrase x1
case Decrypt:
acceptable = !ui->passEdit1->text().isEmpty();
break;
case ChangePass: // Old passphrase x1, new passphrase x2 case ChangePass: // Old passphrase x1, new passphrase x2
acceptable = !ui->passEdit1->text().isEmpty() && !ui->passEdit2->text().isEmpty() && !ui->passEdit3->text().isEmpty(); acceptable = !ui->passEdit1->text().isEmpty() && !ui->passEdit2->text().isEmpty() && !ui->passEdit3->text().isEmpty();
break; break;

1
src/qt/askpassphrasedialog.h
View file

@ -26,7 +26,6 @@ public:
Encrypt, /**< Ask passphrase twice and encrypt */ Encrypt, /**< Ask passphrase twice and encrypt */
Unlock, /**< Ask passphrase and unlock */ Unlock, /**< Ask passphrase and unlock */
ChangePass, /**< Ask old passphrase + new passphrase twice */ ChangePass, /**< Ask old passphrase + new passphrase twice */
Decrypt /**< Ask passphrase and decrypt wallet */
}; };
explicit AskPassphraseDialog(Mode mode, QWidget *parent, SecureString* passphrase_out = nullptr); explicit AskPassphraseDialog(Mode mode, QWidget *parent, SecureString* passphrase_out = nullptr);

2
src/qt/walletview.cpp
View file

@ -262,7 +262,7 @@ void WalletView::encryptWallet(bool status)
{ {
if(!walletModel) if(!walletModel)
return; return;
AskPassphraseDialog dlg(status ? AskPassphraseDialog::Encrypt : AskPassphraseDialog::Decrypt, this); AskPassphraseDialog dlg(AskPassphraseDialog::Encrypt, this);
dlg.setModel(walletModel); dlg.setModel(walletModel);
dlg.exec(); dlg.exec();