thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Crete a proxy for media to uniquely match signal to the caller

Browse source
This commit is contained in:
Konstantinos Sideris 2018-03-07 21:23:57 +02:00
parent ea22bdce18
commit 39abf163b8
7 changed files with 57 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/MatrixClient.cc
View file

@ -738,13 +738,14 @@ MatrixClient::fetchUserAvatar(const QUrl &avatarUrl,
});
}
void
MatrixClient::downloadImage(const QString &event_id, const QUrl &url)
DownloadMediaProxy *
MatrixClient::downloadImage(const QUrl &url)
{
QNetworkRequest image_request(url);
auto reply = get(image_request);
connect(reply, &QNetworkReply::finished, this, [this, reply, event_id]() {
auto proxy = new DownloadMediaProxy;
connect(reply, &QNetworkReply::finished, this, [this, reply, proxy]() {
reply->deleteLater();
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
@ -762,17 +763,20 @@ MatrixClient::downloadImage(const QString &event_id, const QUrl &url)
QPixmap pixmap;
pixmap.loadFromData(img);
emit imageDownloaded(event_id, pixmap);
emit proxy->imageDownloaded(pixmap);
});
return proxy;
}
void
MatrixClient::downloadFile(const QString &event_id, const QUrl &url)
DownloadMediaProxy *
MatrixClient::downloadFile(const QUrl &url)
{
QNetworkRequest fileRequest(url);
auto reply = get(fileRequest);
connect(reply, &QNetworkReply::finished, this, [this, reply, event_id]() {
auto proxy = new DownloadMediaProxy;
connect(reply, &QNetworkReply::finished, this, [this, reply, proxy]() {
reply->deleteLater();
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
@ -788,8 +792,10 @@ MatrixClient::downloadFile(const QString &event_id, const QUrl &url)
if (data.size() == 0)
return;
emit fileDownloaded(event_id, data);
emit proxy->fileDownloaded(data);
});
return proxy;
}
void