Android: Hide AndroidSdkDownloader::sdkDownloaderError() signal

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>

src/plugins/android/androidsdkdownloader.cpp

@@ -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

src/plugins/android/androidsdkdownloader.h

@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "androidconfigurations.h"
-
 #include <solutions/tasking/tasktreerunner.h>
 
 QT_BEGIN_NAMESPACE
@@ -26,11 +24,8 @@ public:
 
 signals:
     void sdkExtracted();
-    void sdkDownloaderError(const QString &error);
 
 private:
-    void logError(const QString &error);
-
     std::unique_ptr<QProgressDialog> m_progressDialog;
     Tasking::TaskTreeRunner m_taskTreeRunner;
 };

src/plugins/android/androidsettingswidget.cpp

@@ -500,9 +500,6 @@ AndroidSettingsWidget::AndroidSettingsWidget()
             this, [this] { m_sdkManagerWidget->exec(); });
     connect(sdkToolsAutoDownloadButton, &QAbstractButton::clicked,
             this, &AndroidSettingsWidget::downloadSdk);
-    connect(&m_sdkDownloader, &AndroidSdkDownloader::sdkDownloaderError, this, [this](const QString &error) {
-        QMessageBox::warning(this, AndroidSdkDownloader::dialogTitle(), error);
-    });
     connect(&m_sdkDownloader, &AndroidSdkDownloader::sdkExtracted, this, [this] {
         // Make sure the sdk path is created before installing packages
         const FilePath sdkPath = androidConfig().sdkLocation();