From 525a284f3e702596af3c2bd37d92340fa5ecb248 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Sat, 26 Mar 2022 19:06:17 +0200
Subject: [PATCH] Android: simplify
 AndroidSdkManagerWidget::installEssentials()

Remove an argument that doesn't need to be be provided explicitly
by the caller and can be done internally.

Change-Id: Ie225f847560b746ce9b8103ab38caca5caca1b0a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androidsdkmanagerwidget.cpp | 5 +++--
 src/plugins/android/androidsdkmanagerwidget.h   | 2 +-
 src/plugins/android/androidsettingswidget.cpp   | 7 ++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/plugins/android/androidsdkmanagerwidget.cpp b/src/plugins/android/androidsdkmanagerwidget.cpp
index 5539f36143b..c8129bf5d8c 100644
--- a/src/plugins/android/androidsdkmanagerwidget.cpp
+++ b/src/plugins/android/androidsdkmanagerwidget.cpp
@@ -206,7 +206,7 @@ AndroidSdkManagerWidget::~AndroidSdkManagerWidget()
     delete m_ui;
 }
 
-void AndroidSdkManagerWidget::installEssentials(const QString &extraMessage)
+void AndroidSdkManagerWidget::installEssentials()
 {
     m_sdkModel->selectMissingEssentials();
     if (!m_sdkModel->missingEssentials().isEmpty()) {
@@ -217,7 +217,8 @@ void AndroidSdkManagerWidget::installEssentials(const QString &extraMessage)
                                  .arg(Core::Constants::IDE_DISPLAY_NAME)
                                  .arg(m_sdkModel->missingEssentials().join("\", \"")));
     }
-    onApplyButton(extraMessage);
+    onApplyButton(tr("Android SDK installation is missing necessary packages. "
+                     "Do you want to install the missing packages?"));
 }
 
 void AndroidSdkManagerWidget::beginLicenseCheck()
diff --git a/src/plugins/android/androidsdkmanagerwidget.h b/src/plugins/android/androidsdkmanagerwidget.h
index f154d2a3a57..389b0dc0d13 100644
--- a/src/plugins/android/androidsdkmanagerwidget.h
+++ b/src/plugins/android/androidsdkmanagerwidget.h
@@ -80,7 +80,7 @@ public:
                             QWidget *parent = nullptr);
     ~AndroidSdkManagerWidget() override;
 
-    void installEssentials(const QString &extraMessage = {});
+    void installEssentials();
 
 signals:
     void updatingSdk();
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index 660c1113318..fbbb1bb83c2 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -515,11 +515,8 @@ void AndroidSettingsWidget::validateSdk()
                                                         PlatformSdkInstalledRow,
                                                         AllEssentialsInstalledRow});
     m_androidConfig.setSdkFullyConfigured(sdkToolsOk && componentsOk);
-    if (sdkToolsOk && !componentsOk) {
-        m_sdkManagerWidget->installEssentials(
-                    "Android SDK installation is missing necessary packages. "
-                    "Do you want to install the missing packages?");
-    }
+    if (sdkToolsOk && !componentsOk)
+        m_sdkManagerWidget->installEssentials();
 
     updateNdkList();
     updateUI();