summary refs log tree commit diff
path: root/src/ChatPage.h
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2019-12-05 15:31:53 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2019-12-05 15:31:53 +0100
commit43d7fe0d358edd1983257350817f7e76132c8dc8 (patch)
tree7f710c350bacb4ff427447ba6a0f2283a12424b2 /src/ChatPage.h
parentImplement decryption of images (diff)
downloadnheko-43d7fe0d358edd1983257350817f7e76132c8dc8.tar.xz
Implement sending encrypted files
Diffstat (limited to 'src/ChatPage.h')
-rw-r--r--src/ChatPage.h21
1 files changed, 5 insertions, 16 deletions
diff --git a/src/ChatPage.h b/src/ChatPage.h
index 1898f1a7..20e156af 100644
--- a/src/ChatPage.h
+++ b/src/ChatPage.h
@@ -18,7 +18,9 @@
 #pragma once
 
 #include <atomic>
+#include <boost/optional.hpp>
 #include <boost/variant.hpp>
+#include <mtx/common.hpp>
 #include <mtx/responses.hpp>
 
 #include <QFrame>
@@ -94,27 +96,14 @@ signals:
                                         const QPoint widgetPos);
 
         void uploadFailed(const QString &msg);
-        void imageUploaded(const QString &roomid,
+        void mediaUploaded(const QString &roomid,
                            const QString &filename,
+                           const boost::optional<mtx::crypto::EncryptedFile> &file,
                            const QString &url,
+                           const QString &mimeClass,
                            const QString &mime,
                            qint64 dsize,
                            const QSize &dimensions);
-        void fileUploaded(const QString &roomid,
-                          const QString &filename,
-                          const QString &url,
-                          const QString &mime,
-                          qint64 dsize);
-        void audioUploaded(const QString &roomid,
-                           const QString &filename,
-                           const QString &url,
-                           const QString &mime,
-                           qint64 dsize);
-        void videoUploaded(const QString &roomid,
-                           const QString &filename,
-                           const QString &url,
-                           const QString &mime,
-                           qint64 dsize);
 
         void contentLoaded();
         void closing();