Skip to content

Commit 01d8946

Browse files
hebastoPiRK
authored andcommitted
qt, wallet: Remove unused AskPassphraseDialog::Decrypt
Summary: Co-authored-by: Sehyun Chung <sehyun@berkeley.edu> This is a backport of [[bitcoin-core/gui#109 | core-gui#109]] [1/3] bitcoin-core/gui@6e95011 Test Plan: `ninja all check-all` Reviewers: #bitcoin_abc, Fabien Reviewed By: #bitcoin_abc, Fabien Differential Revision: https://reviews.bitcoinabc.org/D10737
1 parent dbfb106 commit 01d8946

File tree

3 files changed

+2
-27
lines changed

3 files changed

+2
-27
lines changed

src/qt/askpassphrasedialog.cpp

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,6 @@ AskPassphraseDialog::AskPassphraseDialog(Mode _mode, QWidget *parent,
5656
ui->passEdit3->hide();
5757
setWindowTitle(tr("Unlock wallet"));
5858
break;
59-
case Decrypt: // Ask passphrase
60-
ui->warningLabel->setText(tr("This operation needs your wallet "
61-
"passphrase to decrypt the wallet."));
62-
ui->passLabel2->hide();
63-
ui->passEdit2->hide();
64-
ui->passLabel3->hide();
65-
ui->passEdit3->hide();
66-
setWindowTitle(tr("Decrypt wallet"));
67-
break;
6859
case ChangePass: // Ask old passphrase + new passphrase x2
6960
setWindowTitle(tr("Change passphrase"));
7061
ui->warningLabel->setText(tr(
@@ -186,15 +177,6 @@ void AskPassphraseDialog::accept() {
186177
e.what());
187178
}
188179
break;
189-
case Decrypt:
190-
if (!model->setWalletEncrypted(false, oldpass)) {
191-
QMessageBox::critical(this, tr("Wallet decryption failed"),
192-
tr("The passphrase entered for the "
193-
"wallet decryption was incorrect."));
194-
} else {
195-
QDialog::accept(); // Success
196-
}
197-
break;
198180
case ChangePass:
199181
if (newpass1 == newpass2) {
200182
if (model->changePassphrase(oldpass, newpass1)) {
@@ -225,10 +207,7 @@ void AskPassphraseDialog::textChanged() {
225207
acceptable = !ui->passEdit2->text().isEmpty() &&
226208
!ui->passEdit3->text().isEmpty();
227209
break;
228-
case Unlock: // Old passphrase x1
229-
case Decrypt:
230-
acceptable = !ui->passEdit1->text().isEmpty();
231-
break;
210+
case Unlock: // Old passphrase x1
232211
case ChangePass: // Old passphrase x1, new passphrase x2
233212
acceptable = !ui->passEdit1->text().isEmpty() &&
234213
!ui->passEdit2->text().isEmpty() &&

src/qt/askpassphrasedialog.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ class AskPassphraseDialog : public QDialog {
2626
Encrypt, /**< Ask passphrase twice and encrypt */
2727
Unlock, /**< Ask passphrase and unlock */
2828
ChangePass, /**< Ask old passphrase + new passphrase twice */
29-
Decrypt /**< Ask passphrase and decrypt wallet */
3029
};
3130

3231
explicit AskPassphraseDialog(Mode mode, QWidget *parent,

src/qt/walletview.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,7 @@ void WalletView::encryptWallet(bool status) {
350350
if (!walletModel) {
351351
return;
352352
}
353-
354-
AskPassphraseDialog dlg(status ? AskPassphraseDialog::Encrypt
355-
: AskPassphraseDialog::Decrypt,
356-
this);
353+
AskPassphraseDialog dlg(AskPassphraseDialog::Encrypt, this);
357354
dlg.setModel(walletModel);
358355
dlg.exec();
359356

0 commit comments

Comments
 (0)