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: reuse QNetworkAccessManagers and pass cstr to lambda safely

This commit is contained in:
Michał Cieślak 2022-12-07 11:31:28 +01:00 committed by Michał
parent a7e82bfec7
commit 2307356a54
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vendor/DOtherSide/CMakeLists.txt vendored
View File

@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.2)
project(DOtherSide) project(DOtherSide)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
option(ENABLE_DOCS "Enable docs" ON) option(ENABLE_DOCS "Enable docs" ON)
option(ENABLE_TESTS "Enable tests" ON) option(ENABLE_TESTS "Enable tests" ON)
option(ENABLE_DYNAMIC_LIBS "Enable dynamic libraries" ON) option(ENABLE_DYNAMIC_LIBS "Enable dynamic libraries" ON)

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

@ -95,7 +95,9 @@ void register_meta_types()
} }
// jrainville: I'm not sure where to put this, but it works like so // jrainville: I'm not sure where to put this, but it works like so
static QTranslator *m_translator = new QTranslator(); namespace {
QTranslator g_translator;
}
class QMLNetworkAccessFactory : public QQmlNetworkAccessManagerFactory class QMLNetworkAccessFactory : public QQmlNetworkAccessManagerFactory
{ {
@ -251,9 +253,12 @@ void dos_qguiapplication_clipboard_setImage(const char* text)
void dos_qguiapplication_clipboard_setImageByUrl(const char* url) void dos_qguiapplication_clipboard_setImageByUrl(const char* url)
{ {
auto manager = new QNetworkAccessManager; static thread_local QNetworkAccessManager manager;
manager->setAutoDeleteReplies(true); manager.setAutoDeleteReplies(true);
QObject::connect(manager, &QNetworkAccessManager::finished, [manager](QNetworkReply *reply) {
QNetworkReply *reply = manager.get(QNetworkRequest(QUrl(url)));
QObject::connect(reply, &QNetworkReply::finished, [reply]() {
if(reply->error() == QNetworkReply::NoError) { if(reply->error() == QNetworkReply::NoError) {
QByteArray btArray = reply->readAll(); QByteArray btArray = reply->readAll();
QImage image; QImage image;
@ -264,10 +269,7 @@ void dos_qguiapplication_clipboard_setImageByUrl(const char* url)
else { else {
qWarning() << "dos_qguiapplication_clipboard_setImageByUrl: Downloading image failed!"; qWarning() << "dos_qguiapplication_clipboard_setImageByUrl: Downloading image failed!";
} }
manager->deleteLater();
}); });
manager->get(QNetworkRequest(QUrl(url)));
} }
void dos_qguiapplication_download_image(const char *imageSource, const char *filePath) void dos_qguiapplication_download_image(const char *imageSource, const char *filePath)
@ -287,12 +289,15 @@ void dos_qguiapplication_download_image(const char *imageSource, const char *fil
void dos_qguiapplication_download_imageByUrl(const char *url, const char *filePath) void dos_qguiapplication_download_imageByUrl(const char *url, const char *filePath)
{ {
auto manager = new QNetworkAccessManager; static thread_local QNetworkAccessManager manager;
manager->setAutoDeleteReplies(true); manager.setAutoDeleteReplies(true);
QObject::connect(manager, &QNetworkAccessManager::finished, [manager, filePath](QNetworkReply *reply) {
QNetworkReply *reply = manager.get(QNetworkRequest(QUrl(url)));
QObject::connect(reply, &QNetworkReply::finished, [reply, path = QString(filePath)]() mutable {
if(reply->error() == QNetworkReply::NoError) { if(reply->error() == QNetworkReply::NoError) {
// Extract file path that can be used to save the image // Extract file path that can be used to save the image
QString fileL = QString(filePath).replace(QRegExp("^(file:/{2})|(qrc:/{2})|(http:/{2})"), ""); path.replace(QRegExp("^(file:/{2})|(qrc:/{2})|(http:/{2})"), "");
// Get current Date/Time information to use in naming of the image file // Get current Date/Time information to use in naming of the image file
QString dateTimeString = QDateTime::currentDateTime().toString("dd-MM-yyyy_hh-mm-ss"); QString dateTimeString = QDateTime::currentDateTime().toString("dd-MM-yyyy_hh-mm-ss");
@ -302,15 +307,12 @@ void dos_qguiapplication_download_imageByUrl(const char *url, const char *filePa
QImage image; QImage image;
image.loadFromData(btArray); image.loadFromData(btArray);
Q_ASSERT(!image.isNull()); Q_ASSERT(!image.isNull());
image.save(QString(fileL) + "/image_" + dateTimeString + ".png"); image.save(path + "/image_" + dateTimeString + ".png");
} }
else { else {
qWarning() << "dos_qguiapplication_download_imageByUrl: Downloading image failed!"; qWarning() << "dos_qguiapplication_download_imageByUrl: Downloading image failed!";
} }
manager->deleteLater();
}); });
manager->get(QNetworkRequest(QUrl(url)));
} }
void dos_qguiapplication_delete() void dos_qguiapplication_delete()
@ -415,11 +417,11 @@ void dos_qqmlapplicationengine_load_data(::DosQQmlApplicationEngine *vptr, const
void dos_qguiapplication_load_translation(::DosQQmlApplicationEngine *vptr, const char* translationPackage, bool shouldRetranslate) void dos_qguiapplication_load_translation(::DosQQmlApplicationEngine *vptr, const char* translationPackage, bool shouldRetranslate)
{ {
if (!m_translator->isEmpty()) { if (!g_translator.isEmpty()) {
QGuiApplication::removeTranslator(m_translator); QGuiApplication::removeTranslator(&g_translator);
} }
if (m_translator->load(translationPackage)) { if (g_translator.load(translationPackage)) {
bool success = QGuiApplication::installTranslator(m_translator); bool success = QGuiApplication::installTranslator(&g_translator);
auto engine = static_cast<QQmlApplicationEngine *>(vptr); auto engine = static_cast<QQmlApplicationEngine *>(vptr);
if (shouldRetranslate) engine->retranslate(); if (shouldRetranslate) engine->retranslate();
} else { } else {