feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Hide AndroidSdkDownloader::sdkDownloaderError() signal

Browse Source 
Inbuild the handling of this signal inside the recipe.

Change-Id: I7152cb1a4568b63156fb72a768b658df5bef9997
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-04-22 18:51:40 +02:00
committed by Alessandro Portale
parent 41a278a030
commit 5f00584b38
3 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/android/androidsdkdownloader.cpp
View File

@@ -1,6 +1,7 @@
// Copyright (C) 2020 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "androidconfigurations.h"
#include "androidconstants.h"
#include "androidsdkdownloader.h"
#include "androidtr.h"
@@ -15,6 +16,7 @@
#include <QCryptographicHash>
#include <QLoggingCategory>
#include <QMessageBox>
#include <QProgressDialog>
#include <QStandardPaths>
@@ -24,6 +26,13 @@ using namespace Utils;
namespace { Q_LOGGING_CATEGORY(sdkDownloaderLog, "qtc.android.sdkDownloader", QtWarningMsg) }
namespace Android::Internal {
static void logError(const QString &error)
{
qCDebug(sdkDownloaderLog, "%s", error.toUtf8().data());
QMessageBox::warning(Core::ICore::dialogParent(), AndroidSdkDownloader::dialogTitle(), error);
}
/**
* @class SdkDownloader
* @brief Download Android SDK tools package from within Qt Creator.
@@ -123,7 +132,7 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
});
#if QT_CONFIG(ssl)
connect(reply, &QNetworkReply::sslErrors,
this, [this, reply](const QList<QSslError> &sslErrors) {
this, [reply](const QList<QSslError> &sslErrors) {
for (const QSslError &error : sslErrors)
qCDebug(sdkDownloaderLog, "SSL error: %s\n", qPrintable(error.errorString()));
logError(Tr::tr("Encountered SSL errors, download is aborted."));
@@ -132,7 +141,7 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
#endif
});
};
const auto onQueryDone = [this, storage](const NetworkQuery &query, DoneWith result) {
const auto onQueryDone = [storage](const NetworkQuery &query, DoneWith result) {
QNetworkReply *reply = query.reply();
QTC_ASSERT(reply, return);
const QUrl url = reply->url();
@@ -197,11 +206,4 @@ QString AndroidSdkDownloader::dialogTitle()
return Tr::tr("Download SDK Tools");
}
void AndroidSdkDownloader::logError(const QString &error)
{
qCDebug(sdkDownloaderLog, "%s", error.toUtf8().data());
QMetaObject::invokeMethod(this, [this, error] { emit sdkDownloaderError(error); },
Qt::QueuedConnection);
}
} // namespace Android::Internal