Merge pull request #474 from francisjyap/patch-2

mxaddict · web-flow · commit aa4bbaaf7a82 · 2019-05-14T17:55:05.000+08:00
Added password prompt for CFund payment/proposal dialogs
diff --git a/src/qt/communityfundcreatepaymentrequestdialog.cpp b/src/qt/communityfundcreatepaymentrequestdialog.cpp
@@ -1,19 +1,21 @@
 #include "communityfundcreatepaymentrequestdialog.h"
-#include "ui_communityfundcreatepaymentrequestdialog.h"
 #include "communityfundsuccessdialog.h"
 #include "sendcommunityfunddialog.h"
+#include "ui_communityfundcreatepaymentrequestdialog.h"
 
 #include <QMessageBox>
+#include <string>
+
+#include "base58.h"
 #include "consensus/cfund.h"
-#include "main.h"
-#include "main.cpp"
 #include "guiconstants.h"
-#include "skinize.h"
 #include "guiutil.h"
+#include "main.cpp"
+#include "main.h"
+#include "skinize.h"
 #include "sync.h"
 #include "wallet/wallet.h"
-#include "base58.h"
-#include <string>
+#include "walletmodel.h"
 
 std::string random_str(size_t length)
 {
@@ -33,14 +35,20 @@ std::string random_str(size_t length)
 
 CommunityFundCreatePaymentRequestDialog::CommunityFundCreatePaymentRequestDialog(QWidget *parent) :
     QDialog(parent),
-    ui(new Ui::CommunityFundCreatePaymentRequestDialog)
+    ui(new Ui::CommunityFundCreatePaymentRequestDialog),
+    model(0)
 {
     ui->setupUi(this);
 
     connect(ui->pushButtonClose, SIGNAL(clicked()), this, SLOT(reject()));
     connect(ui->pushButtonSubmitPaymentRequest, SIGNAL(clicked()), SLOT(click_pushButtonSubmitPaymentRequest()));
 }
 
+void CommunityFundCreatePaymentRequestDialog::setModel(WalletModel *model)
+{
+    this->model = model;
+}
+
 bool CommunityFundCreatePaymentRequestDialog::validate()
 {
     bool isValid = true;
@@ -131,24 +139,10 @@ void CommunityFundCreatePaymentRequestDialog::click_pushButtonSubmitPaymentReque
         }
 
         // Ensure wallet is unlocked
-        if (pwalletMain->IsLocked()) {
-            QMessageBox msgBox(this);
-            std::string str = "Please unlock the wallet\n";
-            msgBox.setText(tr(str.c_str()));
-            msgBox.addButton(tr("Ok"), QMessageBox::AcceptRole);
-            msgBox.setIcon(QMessageBox::Warning);
-            msgBox.setWindowTitle("Error");
-            msgBox.exec();
-            return;
-        }
-        if (fWalletUnlockStakingOnly) {
-            QMessageBox msgBox(this);
-            std::string str = "Wallet is unlocked for staking only\n";
-            msgBox.setText(tr(str.c_str()));
-            msgBox.addButton(tr("Ok"), QMessageBox::AcceptRole);
-            msgBox.setIcon(QMessageBox::Warning);
-            msgBox.setWindowTitle("Error");
-            msgBox.exec();
+        WalletModel::UnlockContext ctx(model->requestUnlock());
+        if(!ctx.isValid())
+        {
+            // Unlock wallet was cancelled
             return;
         }
 
diff --git a/src/qt/communityfundcreatepaymentrequestdialog.h b/src/qt/communityfundcreatepaymentrequestdialog.h
@@ -1,9 +1,11 @@
 #ifndef COMMUNITYFUNDCREATEPAYMENTREQUESTDIALOG_H
 #define COMMUNITYFUNDCREATEPAYMENTREQUESTDIALOG_H
 
-#include <QDialog>
 #include "../qvalidatedplaintextedit.h"
 #include "uint256.h"
+#include "walletmodel.h"
+
+#include <QDialog>
 
 namespace Ui {
 class CommunityFundCreatePaymentRequestDialog;
@@ -17,8 +19,11 @@ class CommunityFundCreatePaymentRequestDialog : public QDialog
     explicit CommunityFundCreatePaymentRequestDialog(QWidget *parent = 0);
     ~CommunityFundCreatePaymentRequestDialog();
 
+    void setModel(WalletModel *model);
+
 private:
     Ui::CommunityFundCreatePaymentRequestDialog *ui;
+    WalletModel *model;
     bool validate();
     bool isActiveProposal(uint256 hash);
 
diff --git a/src/qt/communityfundcreateproposaldialog.cpp b/src/qt/communityfundcreateproposaldialog.cpp
@@ -1,25 +1,27 @@
 #include "communityfundcreateproposaldialog.h"
-#include "ui_communityfundcreateproposaldialog.h"
-#include "sendcommunityfunddialog.h"
 #include "communityfundsuccessdialog.h"
+#include "sendcommunityfunddialog.h"
+#include "ui_communityfundcreateproposaldialog.h"
 
-#include <QMessageBox>
-#include <QTextListFormat>
 #include <QDialog>
+#include <QMessageBox>
 #include <QSpinBox>
+#include <QTextListFormat>
+#include <string>
 
+#include "base58.h"
 #include "guiconstants.h"
 #include "guiutil.h"
-#include "sync.h"
-#include "wallet/wallet.h"
-#include "base58.h"
 #include "main.h"
-#include <string>
 #include "qvalidatedspinbox.h"
+#include "sync.h"
+#include "wallet/wallet.h"
+#include "walletmodel.h"
 
 CommunityFundCreateProposalDialog::CommunityFundCreateProposalDialog(QWidget *parent) :
     QDialog(parent),
-    ui(new Ui::CommunityFundCreateProposalDialog)
+    ui(new Ui::CommunityFundCreateProposalDialog),
+    model(0)
 {
     ui->setupUi(this);
     GUIUtil::setupAddressWidget(ui->lineEditNavcoinAddress, this);
@@ -57,6 +59,11 @@ CommunityFundCreateProposalDialog::CommunityFundCreateProposalDialog(QWidget *pa
     ui->labelWarning->setText(QString::fromStdString(warning));
 }
 
+void CommunityFundCreateProposalDialog::setModel(WalletModel *model)
+{
+    this->model = model;
+}
+
 // Validate input fields
 bool CommunityFundCreateProposalDialog::validate()
 {
@@ -103,6 +110,9 @@ void CommunityFundCreateProposalDialog::click_spinBox() {
 
 void CommunityFundCreateProposalDialog::click_pushButtonCreateProposal()
 {
+    if(!model)
+        return;
+
     if(this->validate())
     {
         LOCK2(cs_main, pwalletMain->cs_wallet);
@@ -147,24 +157,10 @@ void CommunityFundCreateProposalDialog::click_pushButtonCreateProposal()
         }
 
         // Ensure wallet is unlocked
-        if (pwalletMain->IsLocked()) {
-            QMessageBox msgBox(this);
-            std::string str = "Please unlock the wallet\n";
-            msgBox.setText(tr(str.c_str()));
-            msgBox.addButton(tr("Ok"), QMessageBox::AcceptRole);
-            msgBox.setIcon(QMessageBox::Warning);
-            msgBox.setWindowTitle("Error");
-            msgBox.exec();
-            return;
-        }
-        if (fWalletUnlockStakingOnly) {
-            QMessageBox msgBox(this);
-            std::string str = "Wallet is unlocked for staking only\n";
-            msgBox.setText(tr(str.c_str()));
-            msgBox.addButton(tr("Ok"), QMessageBox::AcceptRole);
-            msgBox.setIcon(QMessageBox::Warning);
-            msgBox.setWindowTitle("Error");
-            msgBox.exec();
+        WalletModel::UnlockContext ctx(model->requestUnlock());
+        if(!ctx.isValid())
+        {
+            // Unlock wallet was cancelled
             return;
         }
 
@@ -197,7 +193,6 @@ void CommunityFundCreateProposalDialog::click_pushButtonCreateProposal()
                 return;
             }
             else {
-
                 // User accepted making the proposal
                 // Parse NavCoin address
                 CScript CFContributionScript;
diff --git a/src/qt/communityfundcreateproposaldialog.h b/src/qt/communityfundcreateproposaldialog.h
@@ -1,8 +1,10 @@
 #ifndef COMMUNITYFUNDCREATEPROPOSALDIALOG_H
 #define COMMUNITYFUNDCREATEPROPOSALDIALOG_H
 
-#include <QDialog>
 #include "qvalidatedspinbox.h"
+#include "walletmodel.h"
+
+#include <QDialog>
 
 namespace Ui {
 class CommunityFundCreateProposalDialog;
@@ -16,14 +18,16 @@ class CommunityFundCreateProposalDialog : public QDialog
     explicit CommunityFundCreateProposalDialog(QWidget *parent = 0);
     ~CommunityFundCreateProposalDialog();
 
+    void setModel(WalletModel *model);
+
 private:
     Ui::CommunityFundCreateProposalDialog *ui;
+    WalletModel *model;
     bool validate();
 
 private Q_SLOTS:
     void click_pushButtonCreateProposal();
     void click_spinBox();
-
 };
 
 #endif // COMMUNITYFUNDCREATEPROPOSALDIALOG_H
diff --git a/src/qt/communityfundpage.cpp b/src/qt/communityfundpage.cpp
@@ -374,13 +374,15 @@ void CommunityFundPage::click_radioButtonExpired()
 void CommunityFundPage::click_pushButtonCreateProposal()
 {
     CommunityFundCreateProposalDialog dlg(this);
+    dlg.setModel(walletModel);
     dlg.exec();
     refresh(ui->radioButtonAll->isChecked(), viewing_proposals);
 }
 
 void CommunityFundPage::click_pushButtonCreatePaymentRequest()
 {
     CommunityFundCreatePaymentRequestDialog dlg(this);
+    dlg.setModel(walletModel);
     dlg.exec();
     refresh(ui->radioButtonAll->isChecked(), viewing_proposals);
 }

Original file line number	Diff line number	Diff line change
`@@ -374,13 +374,15 @@ void CommunityFundPage::click_radioButtonExpired()`
`374`	`374`	`void CommunityFundPage::click_pushButtonCreateProposal()`
`375`	`375`	`{`
`376`	`376`	`CommunityFundCreateProposalDialog dlg(this);`
	`377`	`+ dlg.setModel(walletModel);`
`377`	`378`	`dlg.exec();`
`378`	`379`	`refresh(ui->radioButtonAll->isChecked(), viewing_proposals);`
`379`	`380`	`}`
`380`	`381`
`381`	`382`	`void CommunityFundPage::click_pushButtonCreatePaymentRequest()`
`382`	`383`	`{`
`383`	`384`	`CommunityFundCreatePaymentRequestDialog dlg(this);`
	`385`	`+ dlg.setModel(walletModel);`
`384`	`386`	`dlg.exec();`
`385`	`387`	`refresh(ui->radioButtonAll->isChecked(), viewing_proposals);`
`386`	`388`	`}`