From a58f415f064a34136545da3333f96d2e83b23b29 Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Sun, 2 Oct 2022 04:06:31 +0200
Subject: HttpFileProvider: Require HttpUploadManager as parameter

This is more explicit than taking the QXmppClient and asserting it has
an HttpUploadManager registered.
---
 src/client/QXmppHttpFileSharingProvider.cpp | 11 ++++-------
 src/client/QXmppHttpFileSharingProvider.h   |  8 ++------
 2 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'src/client')

diff --git a/src/client/QXmppHttpFileSharingProvider.cpp b/src/client/QXmppHttpFileSharingProvider.cpp
index 4b7cd37e..5a8904f7 100644
--- a/src/client/QXmppHttpFileSharingProvider.cpp
+++ b/src/client/QXmppHttpFileSharingProvider.cpp
@@ -5,7 +5,6 @@
 
 #include "QXmppHttpFileSharingProvider.h"
 
-#include "QXmppClient.h"
 #include "QXmppFileMetadata.h"
 #include "QXmppFutureUtils_p.h"
 #include "QXmppHttpUploadManager.h"
@@ -20,7 +19,7 @@ using namespace QXmpp::Private;
 ///
 /// \class QXmppHttpFileSharingProvider
 ///
-/// A file sharing provider that uses HTTP File Upload to upload the file.
+/// A file sharing provider that uses HTTP File Upload to upload and download files.
 ///
 /// \since QXmpp 1.5
 ///
@@ -34,15 +33,13 @@ public:
 
 ///
 /// \brief Create a QXmppHttpFileSharingProvider
-/// \param client
+/// \param manager
 /// \param netManager QNetworkAccessManager that can be reused all over your application.
 ///
-QXmppHttpFileSharingProvider::QXmppHttpFileSharingProvider(QXmppClient *client, QNetworkAccessManager *netManager)
+QXmppHttpFileSharingProvider::QXmppHttpFileSharingProvider(QXmppHttpUploadManager *manager, QNetworkAccessManager *netManager)
     : d(std::make_unique<QXmppHttpFileSharingProviderPrivate>())
 {
-    Q_ASSERT(client);
-    d->manager = client->findExtension<QXmppHttpUploadManager>();
-    Q_ASSERT(d->manager);
+    d->manager = manager;
     d->netManager = netManager;
 }
 
diff --git a/src/client/QXmppHttpFileSharingProvider.h b/src/client/QXmppHttpFileSharingProvider.h
index 64329659..ee601814 100644
--- a/src/client/QXmppHttpFileSharingProvider.h
+++ b/src/client/QXmppHttpFileSharingProvider.h
@@ -1,4 +1,5 @@
 // SPDX-FileCopyrightText: 2022 Jonah Brüchert <jbb@kaidan.im>
+// SPDX-FileCopyrightText: 2022 Linus Jahn <lnj@kaidan.im>
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
@@ -8,11 +9,6 @@
 #include "QXmppFileSharingProvider.h"
 #include "QXmppHttpFileSource.h"
 
-#include <any>
-#include <memory>
-
-class QXmppClient;
-class QIODevice;
 class QXmppHttpUploadManager;
 class QNetworkAccessManager;
 
@@ -25,7 +21,7 @@ public:
     using SourceType = QXmppHttpFileSource;
     /// \endcond
 
-    QXmppHttpFileSharingProvider(QXmppClient *client, QNetworkAccessManager *netManager);
+    QXmppHttpFileSharingProvider(QXmppHttpUploadManager *manager, QNetworkAccessManager *netManager);
     ~QXmppHttpFileSharingProvider() override;
 
     auto downloadFile(const std::any &source,
-- 
cgit v1.2.3