rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix shadowing

This commit is contained in:
Nicolas Werner 2021-03-17 20:32:12 +01:00
parent 95bbc559fa
commit 21562eed75
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/MxcImageProvider.cpp
View File

@ -128,10 +128,11 @@ MxcImageProvider::download(const QString &id,
f.open(QIODevice::ReadOnly);
QByteArray fileData = f.readAll();
auto temp =
auto tempData =
mtx::crypto::to_string(mtx::crypto::decrypt_file(
fileData.toStdString(), encryptionInfo.value()));
auto data = QByteArray(temp.data(), (int)temp.size());
auto data =
QByteArray(tempData.data(), (int)tempData.size());
QImage image = utils::readImage(data);
image.setText("mxc url", "mxc://" + id);
if (!image.isNull()) {
@ -165,19 +166,21 @@ MxcImageProvider::download(const QString &id,
return;
}
auto temp = res;
auto tempData = res;
QFile f(fileInfo.absoluteFilePath());
if (!f.open(QIODevice::Truncate | QIODevice::WriteOnly)) {
then(id, QSize(), {}, "");
return;
}
f.write(temp.data(), temp.size());
f.write(tempData.data(), tempData.size());
f.close();
if (encryptionInfo) {
temp = mtx::crypto::to_string(mtx::crypto::decrypt_file(
temp, encryptionInfo.value()));
auto data = QByteArray(temp.data(), (int)temp.size());
tempData =
mtx::crypto::to_string(mtx::crypto::decrypt_file(
tempData, encryptionInfo.value()));
auto data =
QByteArray(tempData.data(), (int)tempData.size());
QImage image = utils::readImage(data);
image.setText("original filename",
QString::fromStdString(originalFilename));