From 43d7fe0d358edd1983257350817f7e76132c8dc8 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Thu, 5 Dec 2019 15:31:53 +0100
Subject: Implement sending encrypted files

---
 src/timeline/TimelineViewManager.cpp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'src/timeline/TimelineViewManager.cpp')

diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index 25f72a6d..6e18d111 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -222,6 +222,7 @@ TimelineViewManager::queueEmoteMessage(const QString &msg)
 void
 TimelineViewManager::queueImageMessage(const QString &roomid,
                                        const QString &filename,
+                                       const boost::optional<mtx::crypto::EncryptedFile> &file,
                                        const QString &url,
                                        const QString &mime,
                                        uint64_t dsize,
@@ -234,27 +235,32 @@ TimelineViewManager::queueImageMessage(const QString &roomid,
         image.url           = url.toStdString();
         image.info.h        = dimensions.height();
         image.info.w        = dimensions.width();
+        image.file          = file;
         models.value(roomid)->sendMessage(image);
 }
 
 void
-TimelineViewManager::queueFileMessage(const QString &roomid,
-                                      const QString &filename,
-                                      const QString &url,
-                                      const QString &mime,
-                                      uint64_t dsize)
+TimelineViewManager::queueFileMessage(
+  const QString &roomid,
+  const QString &filename,
+  const boost::optional<mtx::crypto::EncryptedFile> &encryptedFile,
+  const QString &url,
+  const QString &mime,
+  uint64_t dsize)
 {
         mtx::events::msg::File file;
         file.info.mimetype = mime.toStdString();
         file.info.size     = dsize;
         file.body          = filename.toStdString();
         file.url           = url.toStdString();
+        file.file          = encryptedFile;
         models.value(roomid)->sendMessage(file);
 }
 
 void
 TimelineViewManager::queueAudioMessage(const QString &roomid,
                                        const QString &filename,
+                                       const boost::optional<mtx::crypto::EncryptedFile> &file,
                                        const QString &url,
                                        const QString &mime,
                                        uint64_t dsize)
@@ -264,12 +270,14 @@ TimelineViewManager::queueAudioMessage(const QString &roomid,
         audio.info.size     = dsize;
         audio.body          = filename.toStdString();
         audio.url           = url.toStdString();
+        audio.file          = file;
         models.value(roomid)->sendMessage(audio);
 }
 
 void
 TimelineViewManager::queueVideoMessage(const QString &roomid,
                                        const QString &filename,
+                                       const boost::optional<mtx::crypto::EncryptedFile> &file,
                                        const QString &url,
                                        const QString &mime,
                                        uint64_t dsize)
@@ -279,5 +287,6 @@ TimelineViewManager::queueVideoMessage(const QString &roomid,
         video.info.size     = dsize;
         video.body          = filename.toStdString();
         video.url           = url.toStdString();
+        video.file          = file;
         models.value(roomid)->sendMessage(video);
 }
-- 
cgit 1.5.1