diff options
author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2021-09-18 16:20:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-18 16:20:51 +0200 |
commit | f7e15e742f026c794b4e3419cc851a16a31e9f07 (patch) | |
tree | 6dcfb08c37e0ebd0ee498dc1e4e3e311c02a51d1 /lib/events/roommessageevent.cpp | |
parent | 88a51b85935d4de6c4bd58b6ece5d498241465fc (diff) | |
parent | fe9425f313e7c172095ff9355743427337b7ea78 (diff) | |
download | libquotient-f7e15e742f026c794b4e3419cc851a16a31e9f07.tar.gz libquotient-f7e15e742f026c794b4e3419cc851a16a31e9f07.zip |
Merge pull request #505 from TobiasFella/encryptedfile
Diffstat (limited to 'lib/events/roommessageevent.cpp')
-rw-r--r-- | lib/events/roommessageevent.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/events/roommessageevent.cpp b/lib/events/roommessageevent.cpp index 71f85363..9b46594e 100644 --- a/lib/events/roommessageevent.cpp +++ b/lib/events/roommessageevent.cpp @@ -145,21 +145,21 @@ TypedBase* contentFromFile(const QFileInfo& file, bool asGenericFile) auto mimeTypeName = mimeType.name(); if (mimeTypeName.startsWith("image/")) return new ImageContent(localUrl, file.size(), mimeType, - QImageReader(filePath).size(), + QImageReader(filePath).size(), none, file.fileName()); // duration can only be obtained asynchronously and can only be reliably // done by starting to play the file. Left for a future implementation. if (mimeTypeName.startsWith("video/")) return new VideoContent(localUrl, file.size(), mimeType, - QMediaResource(localUrl).resolution(), + QMediaResource(localUrl).resolution(), none, file.fileName()); if (mimeTypeName.startsWith("audio/")) - return new AudioContent(localUrl, file.size(), mimeType, + return new AudioContent(localUrl, file.size(), mimeType, none, file.fileName()); } - return new FileContent(localUrl, file.size(), mimeType, file.fileName()); + return new FileContent(localUrl, file.size(), mimeType, none, file.fileName()); } RoomMessageEvent::RoomMessageEvent(const QString& plainBody, |