MxcReply: fix file download regression

Also: make Quotest actually test that the downloaded file contents are
the same as what has been uploaded.

Author: KitsuneRal

lib/mxcreply.cpp

@@ -47,18 +47,21 @@ MxcReply::MxcReply(QNetworkReply* reply, Room* room, const QString &eventId)
                 d->m_encryptedFile = *efm;
         }
     }
-    if (!d->m_encryptedFile)
 #endif
-        d->prepareForReading(this, d->m_reply);
-    // Above 3 lines: prepare for reading upfront if Quotient is built
-    // without E2EE or if it's built with E2EE but that specific payload has no
-    // associated encrypted file metadata
 }
 
 void MxcReply::setNetworkReply(QNetworkReply* newReply)
 {
     d->m_reply = newReply;
     d->m_reply->setParent(this);
+    // Prepare for reading upfront if Quotient is built without E2EE or if it's
+    // built with E2EE but that specific payload has no associated encrypted
+    // file metadata
+#ifdef Quotient_E2EE_ENABLED
+    if (!d->m_encryptedFile)
+#endif
+        d->prepareForReading(this, d->m_reply);
+
     connect(d->m_reply, &QNetworkReply::finished, this, [this] {
         setError(d->m_reply->error(), d->m_reply->errorString());
 #ifdef Quotient_E2EE_ENABLED

quotest/quotest.cpp

@@ -402,14 +402,16 @@ TEST_IMPL(sendReaction)
     return false;
 }
 
+static constexpr auto fileContent = "Test";
+
 TEST_IMPL(sendFile)
 {
     auto* tf = new QTemporaryFile;
     if (!tf->open()) {
         clog << "Failed to create a temporary file" << endl;
         FAIL_TEST();
     }
-    tf->write("Test");
+    tf->write(fileContent);
     tf->close();
     QFileInfo tfi { *tf };
     // QFileInfo::fileName brings only the file name; QFile::fileName brings
@@ -454,9 +456,11 @@ TEST_IMPL(sendFile)
 struct DownloadRunner {
     QUrl url;
 
-    using result_type = QNetworkReply::NetworkError;
+    using result_type = std::pair<QNetworkReply::NetworkError, bool>;
+
+    static constexpr result_type Success { QNetworkReply::NoError, true };
 
-    QNetworkReply::NetworkError operator()(int) const
+    result_type operator()(int) const
     {
         QEventLoop el;
         QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> reply {
@@ -466,10 +470,10 @@ struct DownloadRunner {
             reply.data(), &QNetworkReply::finished, &el, [&el] { el.exit(); },
             Qt::QueuedConnection);
         el.exec();
-        return reply->error();
+        return { reply->error(), reply->readAll() == fileContent };
     }
 
-    static QVector<QNetworkReply::NetworkError> run(const QUrl& url, int threads)
+    static QVector<result_type> run(const QUrl& url, int threads)
     {
         return QtConcurrent::blockingMapped(QVector<int>(threads),
                                             DownloadRunner{ url });
@@ -481,15 +485,15 @@ bool TestSuite::testDownload(const TestToken& thisTest, const QUrl& mxcUrl)
     // Testing direct media requests needs explicit allowance
     NetworkAccessManager::allowDirectMediaRequests(true);
     if (const auto result = DownloadRunner::run(mxcUrl, 1);
-        result.back() != QNetworkReply::NoError) {
+        result.back() != DownloadRunner::Success) {
         clog << "Direct media request to "
              << mxcUrl.toDisplayString().toStdString()
              << " was allowed but failed" << endl;
         FAIL_TEST();
     }
     NetworkAccessManager::allowDirectMediaRequests(false);
     if (const auto result = DownloadRunner::run(mxcUrl, 1);
-        result.back() == QNetworkReply::NoError) {
+        result.back() == DownloadRunner::Success) {
         clog << "Direct media request to "
              << mxcUrl.toDisplayString().toStdString()
              << " was disallowed but succeeded" << endl;
@@ -500,8 +504,8 @@ bool TestSuite::testDownload(const TestToken& thisTest, const QUrl& mxcUrl)
     const auto results = DownloadRunner::run(httpUrl, 3);
     // Move out actual test from the multithreaded code to help debugging
     FINISH_TEST(std::all_of(results.begin(), results.end(),
-                            [](QNetworkReply::NetworkError ne) {
-                                return ne == QNetworkReply::NoError;
+                            [](DownloadRunner::result_type result) {
+                                return result == DownloadRunner::Success;
                             }));
 }