aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJonah BrĂ¼chert <jbb@kaidan.im>2022-09-30 01:00:26 +0200
committerGitHub <noreply@github.com>2022-09-30 01:00:26 +0200
commit7c63b1481ba7e00aa627bf4b2e5d3f8f56cf43f6 (patch)
tree21228bc2366b4875574e8cb1dd59f25d5287c09c /src
parent68f167995e7ba71a6f2e556a7a0eab3d234e2d1a (diff)
HttpFileSharingProvider: Keep original filename when known (#480)
This is unfortunatly required for compatiblity with legacy clients, because they rely on the url to figure out the file type.
Diffstat (limited to 'src')
-rw-r--r--src/client/QXmppHttpFileSharingProvider.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/QXmppHttpFileSharingProvider.cpp b/src/client/QXmppHttpFileSharingProvider.cpp
index 5c3e356c..db4323d7 100644
--- a/src/client/QXmppHttpFileSharingProvider.cpp
+++ b/src/client/QXmppHttpFileSharingProvider.cpp
@@ -195,9 +195,10 @@ auto QXmppHttpFileSharingProvider::uploadFile(std::unique_ptr<QIODevice> data,
-> std::shared_ptr<QXmppUpload>
{
Q_ASSERT(d->manager);
+
auto upload = d->manager->uploadFile(
std::move(data),
- QXmppUtils::generateStanzaHash(10),
+ info.filename().value_or(QXmppUtils::generateStanzaHash(10)),
info.mediaType().value_or(QMimeDatabase().mimeTypeForName("application/octet-stream")),
info.size() ? info.size().value() : -1);