IconJob: Send request through the accounts NAS

This helps tracking requests on the server

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>

diff --git a/src/gui/tray/notificationhandler.cpp b/src/gui/tray/notificationhandler.cpp
index 2bb4b7ef65a08e70e3ce4a46bd6c7c7abff28762..b21f7e8e1758cc4ad729bb23a83e8aed6145491a 100644 (file)
--- a/src/gui/tray/notificationhandler.cpp
+++ b/src/gui/tray/notificationhandler.cpp
@@ -113,7 +113,7 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j
         a._icon = json.value("icon").toString();
 
         if (!a._icon.isEmpty()) {
-            auto *iconJob = new IconJob(QUrl(a._icon));
+            auto *iconJob = new IconJob(_accountState->account(), QUrl(a._icon));
             iconJob->setProperty("activityId", a._id);
             connect(iconJob, &IconJob::jobFinished, this, &ServerNotificationHandler::slotIconDownloaded);
         }

diff --git a/src/libsync/iconjob.cpp b/src/libsync/iconjob.cpp
index 0c9017125866c87f389a6dd9279f8e632c546fa3..23a7ace7fb176fee64c0aa61cc962bb9fb8c0cb8 100644 (file)
--- a/src/libsync/iconjob.cpp
+++ b/src/libsync/iconjob.cpp
@@ -16,22 +16,23 @@
 
 namespace OCC {
 
-IconJob::IconJob(const QUrl &url, QObject *parent) :
-    QObject(parent)
+IconJob::IconJob(AccountPtr account, const QUrl &url, QObject *parent)
+    : QObject(parent)
 {
-    connect(&_accessManager, &QNetworkAccessManager::finished,
-            this, &IconJob::finished);
-
     QNetworkRequest request(url);
 #if (QT_VERSION >= 0x050600)
     request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
 #endif
-    _accessManager.get(request);
+    const auto reply = account->sendRawRequest(QByteArrayLiteral("GET"), url, request);
+    connect(reply, &QNetworkReply::finished, this, &IconJob::finished);
 }
 
-void IconJob::finished(QNetworkReply *reply)
+void IconJob::finished()
 {
-    reply->deleteLater();
+    const auto reply = qobject_cast<QNetworkReply *>(sender());
+    if (!reply) {
+        return;
+    }
     deleteLater();
 
     const auto networkError = reply->error();

diff --git a/src/libsync/iconjob.h b/src/libsync/iconjob.h
index 719ea3be4ac02884cbfa2ba185fd71d26960b8ef..dcb03695633099f73722e488b6de12cf95ac9ca5 100644 (file)
--- a/src/libsync/iconjob.h
+++ b/src/libsync/iconjob.h
@@ -15,6 +15,8 @@
 #ifndef ICONJOB_H
 #define ICONJOB_H
 
+#include "account.h"
+#include "accountfwd.h"
 #include "owncloudlib.h"
 
 #include <QObject>
@@ -33,17 +35,14 @@ class OWNCLOUDSYNC_EXPORT IconJob : public QObject
 {
     Q_OBJECT
 public:
-    explicit IconJob(const QUrl &url, QObject *parent = nullptr);
+    explicit IconJob(AccountPtr account, const QUrl &url, QObject *parent = nullptr);
 
 signals:
     void jobFinished(QByteArray iconData);
     void error(QNetworkReply::NetworkError errorType);
 
 private slots:
-    void finished(QNetworkReply *reply);
-
-private:
-    QNetworkAccessManager _accessManager;
+    void finished();
 };
 }
 

diff --git a/src/libsync/ocsprofileconnector.cpp b/src/libsync/ocsprofileconnector.cpp
index 5bda93cc449a6e0578af1db106d8529a54ba4943..c24d5f85f59ef452889806ba20686ae11b8ecfc6 100644 (file)
--- a/src/libsync/ocsprofileconnector.cpp
+++ b/src/libsync/ocsprofileconnector.cpp
@@ -145,7 +145,7 @@ void OcsProfileConnector::loadHovercardActionIcon(const std::size_t hovercardAct
 void OcsProfileConnector::startFetchIconJob(const std::size_t hovercardActionIndex)
 {
     const auto hovercardAction = _currentHovercard._actions[hovercardActionIndex];
-    const auto iconJob = new IconJob{hovercardAction._iconUrl, this};
+    const auto iconJob = new IconJob{_account, hovercardAction._iconUrl, this};
     connect(iconJob, &IconJob::jobFinished,
         [this, hovercardActionIndex](QByteArray iconData) { loadHovercardActionIcon(hovercardActionIndex, iconData); });
     connect(iconJob, &IconJob::error, this, [](QNetworkReply::NetworkError errorType) {