Merge branch 'dev' into pinned

1 files changed, 35 insertions, 17 deletions

diff --git a/lib/events/eventcontent.h b/lib/events/eventcontent.h
index 60d1f7b7..f609a603 100644
--- a/lib/events/eventcontent.h
+++ b/lib/events/eventcontent.h
@@ -12,6 +12,10 @@
 #include <QtCore/QUrl>
 #include <QtCore/QMetaType>
 
+#include "encryptedfile.h"
+
+class QFileInfo;
+
 namespace Quotient {
 namespace EventContent {
     /**
@@ -47,13 +51,14 @@ namespace EventContent {
     // but specific aggregation structure is altered. See doc comments to
     // each type for the list of available attributes.
 
-    // A quick classes inheritance structure follows:
+    // A quick classes inheritance structure follows (the definitions are
+    // spread across eventcontent.h and roommessageevent.h):
     // FileInfo
-    //   FileContent : UrlBasedContent<FileInfo, Thumbnail>
-    //   AudioContent : UrlBasedContent<FileInfo, Duration>
+    //   FileContent : UrlWithThumbnailContent<FileInfo>
+    //   AudioContent : PlayableContent<UrlBasedContent<FileInfo>>
     //   ImageInfo : FileInfo + imageSize attribute
-    //     ImageContent : UrlBasedContent<ImageInfo, Thumbnail>
-    //     VideoContent : UrlBasedContent<ImageInfo, Thumbnail, Duration>
+    //     ImageContent : UrlWithThumbnailContent<ImageInfo>
+    //     VideoContent : PlayableContent<UrlWithThumbnailContent<ImageInfo>>
 
     /**
      * A base/mixin class for structures representing an "info" object for
@@ -73,11 +78,15 @@ namespace EventContent {
      */
     class FileInfo {
     public:
-        explicit FileInfo(const QUrl& u, qint64 payloadSize = -1,
+        FileInfo() = default;
+        explicit FileInfo(const QFileInfo& fi);
+        explicit FileInfo(QUrl mxcUrl, qint64 payloadSize = -1,
                           const QMimeType& mimeType = {},
-                          const QString& originalFilename = {});
-        FileInfo(const QUrl& u, const QJsonObject& infoJson,
-                 const QString& originalFilename = {});
+                          Omittable<EncryptedFile> file = none,
+                          QString originalFilename = {});
+        FileInfo(QUrl mxcUrl, const QJsonObject& infoJson,
+                 const Omittable<EncryptedFile> &file,
+                 QString originalFilename = {});
 
         bool isValid() const;
 
@@ -98,6 +107,7 @@ namespace EventContent {
         QUrl url;
         qint64 payloadSize;
         QString originalName;
+        Omittable<EncryptedFile> file = none;
     };
 
     template <typename InfoT>
@@ -113,10 +123,14 @@ namespace EventContent {
      */
     class ImageInfo : public FileInfo {
     public:
-        explicit ImageInfo(const QUrl& u, qint64 fileSize = -1,
-                           QMimeType mimeType = {}, const QSize& imageSize = {},
+        ImageInfo() = default;
+        explicit ImageInfo(const QFileInfo& fi, QSize imageSize = {});
+        explicit ImageInfo(const QUrl& mxcUrl, qint64 fileSize = -1,
+                           const QMimeType& type = {}, QSize imageSize = {},
+                           const Omittable<EncryptedFile> &file = none,
                            const QString& originalFilename = {});
-        ImageInfo(const QUrl& u, const QJsonObject& infoJson,
+        ImageInfo(const QUrl& mxcUrl, const QJsonObject& infoJson,
+                  const Omittable<EncryptedFile> &encryptedFile,
                   const QString& originalFilename = {});
 
         void fillInfoJson(QJsonObject* infoJson) const;
@@ -134,8 +148,8 @@ namespace EventContent {
      */
     class Thumbnail : public ImageInfo {
     public:
-        Thumbnail() : ImageInfo(QUrl()) {} // To allow empty thumbnails
-        Thumbnail(const QJsonObject& infoJson);
+        Thumbnail() = default; // Allow empty thumbnails
+        Thumbnail(const QJsonObject& infoJson, const Omittable<EncryptedFile> &file = none);
         Thumbnail(const ImageInfo& info) : ImageInfo(info) {}
         using ImageInfo::ImageInfo;
 
@@ -148,13 +162,13 @@ namespace EventContent {
 
     class TypedBase : public Base {
     public:
-        explicit TypedBase(QJsonObject o = {}) : Base(std::move(o)) {}
         virtual QMimeType type() const = 0;
         virtual const FileInfo* fileInfo() const { return nullptr; }
         virtual FileInfo* fileInfo() { return nullptr; }
         virtual const Thumbnail* thumbnailInfo() const { return nullptr; }
 
     protected:
+        explicit TypedBase(QJsonObject o = {}) : Base(std::move(o)) {}
         using Base::Base;
     };
 
@@ -175,7 +189,7 @@ namespace EventContent {
         explicit UrlBasedContent(const QJsonObject& json)
             : TypedBase(json)
             , InfoT(QUrl(json["url"].toString()), json["info"].toObject(),
-                    json["filename"].toString())
+                    fromJson<Omittable<EncryptedFile>>(json["file"]), json["filename"].toString())
         {
             // A small hack to facilitate links creation in QML.
             originalJson.insert("mediaId", InfoT::mediaId());
@@ -189,7 +203,11 @@ namespace EventContent {
         void fillJson(QJsonObject* json) const override
         {
             Q_ASSERT(json);
-            json->insert("url", InfoT::url.toString());
+            if (!InfoT::file.has_value()) {
+                json->insert("url", InfoT::url.toString());
+            } else {
+                json->insert("file", Quotient::toJson(*InfoT::file));
+            }
             if (!InfoT::originalName.isEmpty())
                 json->insert("filename", InfoT::originalName);
             json->insert("info", toInfoJson<InfoT>(*this));