update// created request objects to store inportant information

silentdragon-lite.pro

@@ -79,6 +79,7 @@ SOURCES += \
     src/Model/ChatItem.cpp \
     src/Model/ContactRequestChatItem.cpp \
     src/Model/ContactItem.cpp \
+    src/Model/ContactRequest.cpp \
     src/Chat/Helper/ChatIDGenerator.cpp \
     src/Chat/Chat.cpp \
     src/FileSystem/FileSystem.cpp \

src/Model/ContactRequest.cpp

@@ -0,0 +1,67 @@
+// Copyright 2019-2020 The Hush developers
+// GPLv3
+
+#include "ContactRequest.h"
+
+ContactRequest::ContactRequest() {}
+
+ContactRequest::ContactRequest(QString sender, QString receiver, QString memo, QString cid)
+{
+    _senderAddress = sender;
+    _receiverAddress = receiver;
+    _memo = memo;
+    _cid = cid;
+}
+
+QString ContactRequest::getSenderAddress()
+{
+    return _senderAddress;
+}
+
+QString ContactRequest::getReceiverAddress()
+{
+    return _receiverAddress;
+}
+
+QString ContactRequest::getMemo()
+{
+    return _memo;
+}
+
+QString ContactRequest::getCid()
+{
+    return _cid;
+}
+
+void ContactRequest::setSenderAddress(QString address)
+{
+    _senderAddress = address;
+}
+
+void ContactRequest::setReceiverAddress(QString address)
+{
+    _receiverAddress = address;
+}
+
+void ContactRequest::setMemo(QString memo)
+{
+    _memo = memo;
+}
+
+void ContactRequest::setCid(QString cid)
+{
+    _cid = cid;
+}
+
+QString ContactRequest::toString()
+{
+    return "sender: " + _senderAddress + " receiver: " + _receiverAddress + " memo: " + _memo + " cid: " + _cid; 
+}
+
+ContactRequest::~ContactRequest()
+{
+    _senderAddress = "";
+    _receiverAddress = "";
+    _memo = "";
+    _cid = "";
+}

src/Model/ContactRequest.h

@@ -0,0 +1,33 @@
+// Copyright 2019-2020 The Hush developers
+// GPLv3
+
+#ifndef CONTACTREQUEST_H
+#define CONTACTREQUEST_H
+
+#include <QString>
+using json = nlohmann::json;
+
+class ContactRequest
+{
+    private:
+        QString _senderAddress;
+        QString _receiverAddress;
+        QString _memo;
+        QString _cid;
+
+    public:
+        ContactRequest();
+        ContactRequest(QString sender, QString receiver, QString memo, QString cid);
+        QString getSenderAddress();
+        QString getReceiverAddress();
+        QString getMemo();
+        QString getCid();
+        void setSenderAddress(QString address);
+        void setReceiverAddress(QString contact);
+        void setMemo(QString memo);
+        void setCid(QString cid);
+        QString toString();
+        ~ContactRequest();
+};
+
+#endif

src/chatmodel.cpp

@@ -16,6 +16,8 @@
 
 using namespace std; 
 
+ContactRequest contactRequest = ContactRequest();
+
 ChatModel::ChatModel(std::map<QString, ChatItem> chatItems)
 {
     this->chatItems = chatItems;
@@ -455,45 +457,38 @@ QString MainWindow::doSendChatTxValidations(Tx tx) {
     return "";
 }
 
-void::MainWindow::addContact() {
+void::MainWindow::addContact() 
-    
+{
- 
     Ui_Dialog request;
     QDialog dialog(this);
     request.setupUi(&dialog);
     Settings::saveRestore(&dialog);
+    bool sapling = true;
+    rpc->createNewZaddr(sapling, [=] (json reply) {
+        QString myAddr = QString::fromStdString(reply.get<json::array_t>()[0]);
+        request.myzaddr->setText(myAddr);
+        ui->listReceiveAddresses->insertItem(0, myAddr); 
+        ui->listReceiveAddresses->setCurrentIndex(0);
+        qDebug() << "new generated myAddr" << myAddr;
+    });
 
-        bool sapling = true;
+    QString cid = QUuid::createUuid().toString(QUuid::WithoutBraces);
-        rpc->createNewZaddr(sapling, [=] (json reply) {
+    request.cid->setText(cid);
-            QString myAddr = QString::fromStdString(reply.get<json::array_t>()[0]);
-            request.myzaddr->setText(myAddr);
-            ui->listReceiveAddresses->insertItem(0, myAddr); 
-            ui->listReceiveAddresses->setCurrentIndex(0);
-            qDebug() << "new generated myAddr" << myAddr;
-            });
                   
-            QString cid = QUuid::createUuid().toString(QUuid::WithoutBraces);
+    QObject::connect(request.sendRequestButton, &QPushButton::clicked, [&] () {
-            request.cid->setText(cid);
+        QString cid = request.cid->text();
-                  
+        QString addr = request.zaddr->text().trimmed();
-     QObject::connect(request.sendRequestButton, &QPushButton::clicked, [&] () {
+        QString getrequest = addr;
-
+        QString newLabel = request.labelRequest->text().trimmed();
-         
+        QString myAddr = request.myzaddr->text().trimmed();
-        
+        contactRequest.setSenderAddress(myAddr);
-            QString cid = request.cid->text();
+        contactRequest.setReceiverAddress(addr);
-            auto addr = request.zaddr->text().trimmed();
+        contactRequest.setMemo(newLabel);
-            QString getrequest = addr;
+        contactRequest.setCid(cid);
-            QString newLabel = request.labelRequest->text().trimmed();
+        QString avatar = QString(":/icons/res/") + request.comboBoxAvatar->currentText() + QString(".png");
-            auto myAddr = request.myzaddr->text().trimmed();
+        if (addr.isEmpty() || newLabel.isEmpty()) 
-
-    //        ChatModel->addSendRequest(myAddr, cid, addr);
-
-           
-            
-            QString avatar = QString(":/icons/res/") + request.comboBoxAvatar->currentText() + QString(".png");
-
-             if (addr.isEmpty() || newLabel.isEmpty()) 
         {
-             QMessageBox::critical(
+            QMessageBox::critical(
                 this, 
                 QObject::tr("Address or Label Error"), 
                 QObject::tr("Address or Label cannot be empty"), 
@@ -505,7 +500,7 @@ void::MainWindow::addContact() {
         // Test if address is valid.
         if (!Settings::isValidAddress(addr)) 
         {
-          QMessageBox::critical(
+            QMessageBox::critical(
                 this, 
                 QObject::tr("Address Format Error"), 
                 QObject::tr("%1 doesn't seem to be a valid hush address.").arg(addr), 
@@ -517,80 +512,53 @@ void::MainWindow::addContact() {
         ///////Todo: Test if label allready exist!
 
         ////// Success, so show it
-            AddressBook::getInstance()->addAddressLabel(newLabel, addr, myAddr, cid, avatar);
+        AddressBook::getInstance()->addAddressLabel(newLabel, addr, myAddr, cid, avatar);
-              QMessageBox::information(
+        QMessageBox::information(
-                this, 
+            this, 
-                QObject::tr("Added Contact"), 
+            QObject::tr("Added Contact"), 
-                QObject::tr("successfully added your new contact").arg(newLabel), 
+            QObject::tr("successfully added your new contact").arg(newLabel), 
-                QMessageBox::Ok
+            QMessageBox::Ok
-            );
+        );
-            return;
+        return;
-
-
     });
    
-
+    dialog.exec();
-  //   QObject::connect(request.sendRequestButton, &QPushButton::clicked, this, &MainWindow::ContactRequest);
+    rpc->refreshContacts(ui->listContactWidget);
-       
-   dialog.exec();
-       rpc->refreshContacts(
-            ui->listContactWidget
-            
-        );
 }
 
 
 
 // Create a Tx for a contact Request 
-Tx MainWindow::createTxForSafeContactRequest() {
+Tx MainWindow::createTxForSafeContactRequest() 
-   
-Tx tx; 
-
 {
-             
+    Tx tx; 
-  {
+    CAmount totalAmt;
-       CAmount totalAmt;
+    QString amtStr = "0";
-        QString amtStr = "0";
+    CAmount amt;  
-        CAmount amt;  
+    amt = CAmount::fromDecimalString("0");
-
+    totalAmt = totalAmt + amt;
-         
+    for(auto &c : AddressBook::getInstance()->getAllAddressLabels())
-            amt = CAmount::fromDecimalString("0");
+    {
-            totalAmt = totalAmt + amt;
+        if (ui->contactNameMemo->text().trimmed() == c.getName()) 
-
+        {
-        
-            for(auto &c : AddressBook::getInstance()->getAllAddressLabels())
-
-            if (ui->contactNameMemo->text().trimmed() == c.getName()) {
-     
             QString cid = c.getCid();
             QString myAddr = c.getMyAddress();
             QString type = "Cont";
             QString addr = c.getPartnerAddress();
+            qDebug() << contactRequest.toString();
+            QString hmemo= createHeaderMemo(type,cid,myAddr);
+            QString memo = ui->memoTxtChat->toPlainText().trimmed();
+            // ui->memoSizeChat->setLenDisplayLabel();// Todo -> activate lendisplay for chat
      
-     
+            tx.toAddrs.push_back(ToFields{addr, amt, hmemo});
-        QString hmemo= createHeaderMemo(type,cid,myAddr);
+            tx.toAddrs.push_back(ToFields{addr, amt, memo});
-        QString memo = ui->memoTxtChat->toPlainText().trimmed();
+            qDebug() << "pushback chattx";
-        
+            tx.fee = Settings::getMinerFee();
-
-       // ui->memoSizeChat->setLenDisplayLabel();// Todo -> activate lendisplay for chat
-     
-     tx.toAddrs.push_back(ToFields{addr, amt, hmemo});
-     tx.toAddrs.push_back(ToFields{addr, amt, memo});
-
-     
-
-         qDebug() << "pushback chattx";
-   
-    
-      tx.fee = Settings::getMinerFee();
-
         }
-}
+    }
-     return tx;
         
-     qDebug() << "RequestTx created";
+    return tx;
-
+    qDebug() << "RequestTx created";
-}
 }
 
 void MainWindow::ContactRequest() {

src/chatmodel.h

@@ -16,6 +16,7 @@
 #include "settings.h"
 #include "camount.h"
 #include "Model/ChatItem.h"
+#include "Model/ContactRequest.h"
 #include "Chat/Helper/ChatDelegator.h"
 #include "Chat/Helper/ChatIDGenerator.h"