networking: QNetworkReply is owned by caller

diff --git a/src/plugins/localmonero/LocalMoneroApi.cpp b/src/plugins/localmonero/LocalMoneroApi.cpp
index d3c4b6e0944fe36e50c3ad3647848a1afd7d29d4..9ac000a14cc7c9c7fcdf76f32ad4a06df7a4188d 100644 (file)
--- a/src/plugins/localmonero/LocalMoneroApi.cpp
+++ b/src/plugins/localmonero/LocalMoneroApi.cpp
@@ -13,13 +13,13 @@ LocalMoneroApi::LocalMoneroApi(QObject *parent, Networking *network)
 
 void LocalMoneroApi::countryCodes() {
     QString url = QString("%1/countrycodes").arg(this->getBaseUrl());
-    QNetworkReply *reply = m_network->getJson(url);
+    QNetworkReply *reply = m_network->getJson(this, url);
     connect(reply, &QNetworkReply::finished, std::bind(&LocalMoneroApi::onResponse, this, reply, Endpoint::COUNTRY_CODES));
 }
 
 void LocalMoneroApi::currencies() {
     QString url = QString("%1/currencies").arg(this->getBaseUrl());
-    QNetworkReply *reply = m_network->getJson(url);
+    QNetworkReply *reply = m_network->getJson(this, url);
     connect(reply, &QNetworkReply::finished, std::bind(&LocalMoneroApi::onResponse, this, reply, Endpoint::CURRENCIES));
 }
 
@@ -30,7 +30,7 @@ void LocalMoneroApi::paymentMethods(const QString &countryCode) {
     } else {
         url = QString("%1/payment_methods/%2").arg(this->getBaseUrl(), countryCode);
     }
-    QNetworkReply *reply = m_network->getJson(url);
+    QNetworkReply *reply = m_network->getJson(this, url);
     connect(reply, &QNetworkReply::finished, std::bind(&LocalMoneroApi::onResponse, this, reply, Endpoint::PAYMENT_METHODS));
 }
 
@@ -38,7 +38,7 @@ void LocalMoneroApi::buyMoneroOnline(const QString &currencyCode, const QString
                                      const QString &paymentMethod, const QString &amount, int page)
 {
     QString url = this->getBuySellUrl(true, currencyCode, countryCode, paymentMethod, amount, page);
-    QNetworkReply *reply = m_network->getJson(url);
+    QNetworkReply *reply = m_network->getJson(this, url);
     connect(reply, &QNetworkReply::finished, std::bind(&LocalMoneroApi::onResponse, this, reply, Endpoint::BUY_MONERO_ONLINE));
 }
 
@@ -46,13 +46,13 @@ void LocalMoneroApi::sellMoneroOnline(const QString &currencyCode, const QString
                                       const QString &paymentMethod, const QString &amount, int page)
 {
     QString url = this->getBuySellUrl(false, currencyCode, countryCode, paymentMethod, amount, page);
-    QNetworkReply *reply = m_network->getJson(url);
+    QNetworkReply *reply = m_network->getJson(this, url);
     connect(reply, &QNetworkReply::finished, std::bind(&LocalMoneroApi::onResponse, this, reply, Endpoint::SELL_MONERO_ONLINE));
 }
 
 void LocalMoneroApi::accountInfo(const QString &username) {
     QString url = QString("%1/account_info/%2").arg(this->getBaseUrl(), username);
-    QNetworkReply *reply = m_network->getJson(url);
+    QNetworkReply *reply = m_network->getJson(this, url);
     connect(reply, &QNetworkReply::finished, std::bind(&LocalMoneroApi::onResponse, this, reply, Endpoint::ACCOUNT_INFO));
 }
 

diff --git a/src/utils/Networking.cpp b/src/utils/Networking.cpp
index a2fcbb4019c041b069def60bef5f7446de320bb1..6ad252487405106c587f9aecb8d2508ddaf7f881 100644 (file)
--- a/src/utils/Networking.cpp
+++ b/src/utils/Networking.cpp
@@ -16,7 +16,7 @@ void Networking::setUserAgent(const QString &userAgent) {
     this->m_userAgent = userAgent;
 }
 
-QNetworkReply* Networking::get(const QString &url) {
+QNetworkReply* Networking::get(QObject *parent, const QString &url) {
     if (config()->get(Config::offlineMode).toBool()) {
         return nullptr;
     }
@@ -27,10 +27,12 @@ QNetworkReply* Networking::get(const QString &url) {
     request.setUrl(QUrl(url));
     request.setRawHeader("User-Agent", m_userAgent.toUtf8());
 
-    return this->m_networkAccessManager->get(request);
+    QNetworkReply *reply = this->m_networkAccessManager->get(request);;
+    reply->setParent(parent);
+    return reply;
 }
 
-QNetworkReply* Networking::getJson(const QString &url) {
+QNetworkReply* Networking::getJson(QObject *parent, const QString &url) {
     if (config()->get(Config::offlineMode).toBool()) {
         return nullptr;
     }
@@ -42,10 +44,12 @@ QNetworkReply* Networking::getJson(const QString &url) {
     request.setRawHeader("User-Agent", m_userAgent.toUtf8());
     request.setRawHeader("Content-Type", "application/json");
 
-    return this->m_networkAccessManager->get(request);
+    QNetworkReply *reply = this->m_networkAccessManager->get(request);
+    reply->setParent(parent);
+    return reply;
 }
 
-QNetworkReply* Networking::postJson(const QString &url, const QJsonObject &data) {
+QNetworkReply* Networking::postJson(QObject *parent, const QString &url, const QJsonObject &data) {
     if (config()->get(Config::offlineMode).toBool()) {
         return nullptr;
     }
@@ -59,5 +63,8 @@ QNetworkReply* Networking::postJson(const QString &url, const QJsonObject &data)
 
     QJsonDocument doc(data);
     QByteArray bytes = doc.toJson();
-    return this->m_networkAccessManager->post(request, bytes);
+
+    QNetworkReply *reply = this->m_networkAccessManager->post(request, bytes);
+    reply->setParent(parent);
+    return reply;
 }

diff --git a/src/utils/Networking.h b/src/utils/Networking.h
index 88a0e318e136eaae7169d3da2079ee172efa821d..265237979f69fa018da75c70ec2529e379f55c7f 100644 (file)
--- a/src/utils/Networking.h
+++ b/src/utils/Networking.h
@@ -16,9 +16,9 @@ Q_OBJECT
 public:
     explicit Networking(QObject *parent = nullptr);
 
-    QNetworkReply* get(const QString &url);
-    QNetworkReply* getJson(const QString &url);
-    QNetworkReply* postJson(const QString &url, const QJsonObject &data);
+    QNetworkReply* get(QObject *parent, const QString &url);
+    QNetworkReply* getJson(QObject *parent, const QString &url);
+    QNetworkReply* postJson(QObject *parent, const QString &url, const QJsonObject &data);
     void setUserAgent(const QString &userAgent);
 
 private:

diff --git a/src/utils/daemonrpc.cpp b/src/utils/daemonrpc.cpp
index a6ff315b7e07d946bfed83b4f914ad89dc2b64d8..5555d0cdba40b121d39b059bb1f34ac8637bfcc5 100644 (file)
--- a/src/utils/daemonrpc.cpp
+++ b/src/utils/daemonrpc.cpp
@@ -17,7 +17,7 @@ void DaemonRpc::sendRawTransaction(const QString &tx_as_hex, bool do_not_relay,
     req["do_sanity_checks"] = do_sanity_checks;
 
     QString url = QString("%1/send_raw_transaction").arg(m_daemonAddress);
-    QNetworkReply *reply = m_network->postJson(url, req);
+    QNetworkReply *reply = m_network->postJson(this, url, req);
     connect(reply, &QNetworkReply::finished, [this, reply]{
         onResponse(reply, Endpoint::SEND_RAW_TRANSACTION);
     });
@@ -30,7 +30,7 @@ void DaemonRpc::getTransactions(const QStringList &txs_hashes, bool decode_as_js
     req["prune"] = prune;
 
     QString url = QString("%1/get_transactions").arg(m_daemonAddress);
-    QNetworkReply *reply = m_network->postJson(url, req);
+    QNetworkReply *reply = m_network->postJson(this, url, req);
     connect(reply, &QNetworkReply::finished, [this, reply]{
         onResponse(reply, Endpoint::GET_TRANSACTIONS);
     });