status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: download image is saving to wrong folder 

this seems to only happen on some linux platform QPAs where the native
file/folder dialog is returning bogus target directory URL; anyways
manipulating the URL using a QRegExp is fragile, better use builtin QUrl
methods for that

Needed for fixing https://github.com/status-im/status-desktop/issues/9307
This commit is contained in:
Lukáš Tinkl 2023-01-26 14:40:13 +01:00 committed by Michał
parent 4119528eb2
commit e9bf6cdbde
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vendor/DOtherSide/lib/src/DOtherSide.cpp vendored
View File

@ -283,16 +283,16 @@ void dos_qguiapplication_clipboard_setImageByUrl(const char* url)
void dos_qguiapplication_download_image(const char *imageSource, const char *filePath)
{
// Extract file path that can be used to save the image
QString fileL = QString(filePath).replace(QRegExp("^(file:/{2})|(qrc:/{2})|(http:/{2})"), "");
const QString fileL = QUrl(filePath).toLocalFile();
// Get current Date/Time information to use in naming of the image file
QString dateTimeString = QDateTime::currentDateTime().toString("dd-MM-yyyy_hh-mm-ss");
const QString dateTimeString = QDateTime::currentDateTime().toString("dd-MM-yyyy_hh-mm-ss");
// Extract the image data to be able to load and save into a QImage
QByteArray btArray = QString(imageSource).split("base64,")[1].toUtf8();
const QByteArray btArray = QString(imageSource).split("base64,")[1].toUtf8();
QImage image;
image.loadFromData(QByteArray::fromBase64(btArray));
image.save(QString(fileL) + "/image_" + dateTimeString + ".png");
image.save(fileL + "/image_" + dateTimeString + ".png");
}
void dos_qguiapplication_download_imageByUrl(const char *url, const char *filePath)
@ -302,13 +302,10 @@ void dos_qguiapplication_download_imageByUrl(const char *url, const char *filePa
QNetworkReply *reply = manager.get(QNetworkRequest(QUrl(url)));
QObject::connect(reply, &QNetworkReply::finished, [reply, path = QString(filePath)]() mutable {
QObject::connect(reply, &QNetworkReply::finished, [reply, path = QUrl(filePath).toLocalFile()]() mutable {
if(reply->error() == QNetworkReply::NoError) {
// Extract file path that can be used to save the image
path.replace(QRegExp("^(file:/{2})|(qrc:/{2})|(http:/{2})"), "");
// Get current Date/Time information to use in naming of the image file
QString dateTimeString = QDateTime::currentDateTime().toString("dd-MM-yyyy_hh-mm-ss");
const QString dateTimeString = QDateTime::currentDateTime().toString("dd-MM-yyyy_hh-mm-ss");
// Extract the image data to be able to load and save into a QImage
QByteArray btArray = reply->readAll();