Android: Get rid of forceReload arg

Split arg-rich reloadPackages() into refreshPackages() and
arg-less reloadPackages().

Change-Id: Icf9ee6c9a805732d9015a49c862d9ba411786c13
Reviewed-by: Alessandro Portale <[email protected]>

4 files changed, 21 insertions, 24 deletions

diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp
index f6d46acd833..1de5fc0c8ad 100644
--- a/src/plugins/android/androidsdkmanager.cpp
+++ b/src/plugins/android/androidsdkmanager.cpp
@@ -162,13 +162,12 @@ public:
     AndroidSdkPackageList filteredPackages(AndroidSdkPackage::PackageState state,
                                            AndroidSdkPackage::PackageType type)
     {
-        refreshSdkPackages();
+        m_sdkManager.refreshPackages();
         return Utils::filtered(m_allPackages, [state, type](const AndroidSdkPackage *p) {
             return p->state() & state && p->type() & type;
         });
     }
     const AndroidSdkPackageList &allPackages();
-    void refreshSdkPackages(bool forceReload = false);
 
     void parseCommonArguments(QPromise<QString> &promise);
     void updateInstalled(SdkCmdPromise &fi);
@@ -182,7 +181,6 @@ public:
 
     std::unique_ptr<QFutureWatcher<void>, decltype(&watcherDeleter)> m_activeOperation;
 
-private:
     QByteArray getUserInput() const;
     void clearUserInput();
     void reloadSdkPackages();
@@ -289,9 +287,15 @@ BuildToolsList AndroidSdkManager::filteredBuildTools(int minApiLevel,
     return result;
 }
 
-void AndroidSdkManager::reloadPackages(bool forceReload)
+void AndroidSdkManager::refreshPackages()
 {
-    m_d->refreshSdkPackages(forceReload);
+    if (androidConfig().sdkManagerToolPath() != m_d->lastSdkManagerPath)
+        reloadPackages();
+}
+
+void AndroidSdkManager::reloadPackages()
+{
+    m_d->reloadSdkPackages();
 }
 
 bool AndroidSdkManager::isBusy() const
@@ -370,7 +374,7 @@ AndroidSdkManagerPrivate::~AndroidSdkManagerPrivate()
 
 const AndroidSdkPackageList &AndroidSdkManagerPrivate::allPackages()
 {
-    refreshSdkPackages();
+    m_sdkManager.refreshPackages();
     return m_allPackages;
 }
 
@@ -402,14 +406,6 @@ void AndroidSdkManagerPrivate::reloadSdkPackages()
     emit m_sdkManager.packageReloadFinished();
 }
 
-void AndroidSdkManagerPrivate::refreshSdkPackages(bool forceReload)
-{
-    // Sdk path changed. Updated packages.
-    // QTC updates the package listing only
-    if (androidConfig().sdkManagerToolPath() != lastSdkManagerPath || forceReload)
-        reloadSdkPackages();
-}
-
 void AndroidSdkManagerPrivate::updateInstalled(SdkCmdPromise &promise)
 {
     promise.setProgressRange(0, 100);
diff --git a/src/plugins/android/androidsdkmanager.h b/src/plugins/android/androidsdkmanager.h
index 4c4d051af36..9e5a080684e 100644
--- a/src/plugins/android/androidsdkmanager.h
+++ b/src/plugins/android/androidsdkmanager.h
@@ -57,7 +57,8 @@ public:
     BuildToolsList filteredBuildTools(int minApiLevel,
                                       AndroidSdkPackage::PackageState state
                                       = AndroidSdkPackage::Installed);
-    void reloadPackages(bool forceReload = false);
+    void refreshPackages();
+    void reloadPackages();
     bool isBusy() const;
 
     bool packageListingSuccessful() const;
diff --git a/src/plugins/android/androidsdkmanagerwidget.cpp b/src/plugins/android/androidsdkmanagerwidget.cpp
index c990406ab99..2c41ab8c60b 100644
--- a/src/plugins/android/androidsdkmanagerwidget.cpp
+++ b/src/plugins/android/androidsdkmanagerwidget.cpp
@@ -232,7 +232,7 @@ AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidSdkManager *sdkManager,
             args.removeAll(obsoleteArg);
             androidConfig().setSdkManagerToolArgs(args);
        }
-        m_sdkManager->reloadPackages(true);
+        m_sdkManager->reloadPackages();
     });
 
     connect(channelCheckbox, &QComboBox::currentIndexChanged, this, [this](int index) {
@@ -261,7 +261,7 @@ AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidSdkManager *sdkManager,
                 androidConfig().setSdkManagerToolArgs(args);
             }
        }
-        m_sdkManager->reloadPackages(true);
+        m_sdkManager->reloadPackages();
     });
 }
 
@@ -511,7 +511,7 @@ void AndroidSdkManagerWidget::packageFutureFinished()
         case AndroidSdkManager::UpdatePackage:
             notifyOperationFinished();
             switchView(PackageListing);
-            m_sdkManager->reloadPackages(true);
+            m_sdkManager->reloadPackages();
             break;
         default:
             break;
@@ -520,7 +520,7 @@ void AndroidSdkManagerWidget::packageFutureFinished()
         m_currentOperation->deleteLater();
         m_currentOperation = nullptr;
         switchView(PackageListing);
-        m_sdkManager->reloadPackages(true);
+        m_sdkManager->reloadPackages();
     }
 }
 
@@ -566,7 +566,7 @@ void AndroidSdkManagerWidget::onSdkManagerOptions()
         QStringList arguments = dlg.sdkManagerArguments();
         if (arguments != androidConfig().sdkManagerToolArgs()) {
             androidConfig().setSdkManagerToolArgs(arguments);
-            m_sdkManager->reloadPackages(true);
+            m_sdkManager->reloadPackages();
         }
     }
 }
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index a286d138de8..b7472de0dc1 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -511,7 +511,7 @@ AndroidSettingsWidget::AndroidSettingsWidget()
                                  Tr::tr("Failed to create the SDK Tools path %1.")
                                  .arg("\n\"" + sdkPath.toUserOutput() + "\""));
         }
-        m_sdkManager.reloadPackages(true);
+        m_sdkManager.reloadPackages();
         updateUI();
         apply();
 
@@ -536,7 +536,7 @@ void AndroidSettingsWidget::showEvent(QShowEvent *event)
         validateJdk();
         // Reloading SDK packages (force) is still synchronous. Use zero timer
         // to let settings dialog open first.
-        QTimer::singleShot(0, this, [this] { m_sdkManager.reloadPackages(); });
+        QTimer::singleShot(0, &m_sdkManager, &AndroidSdkManager::refreshPackages);
         validateOpenSsl();
         m_isInitialReloadDone = true;
     }
@@ -608,7 +608,7 @@ void AndroidSettingsWidget::validateJdk()
     updateUI();
 
     if (m_isInitialReloadDone)
-        m_sdkManager.reloadPackages(true);
+        m_sdkManager.reloadPackages();
 }
 
 void AndroidSettingsWidget::validateOpenSsl()
@@ -635,7 +635,7 @@ void AndroidSettingsWidget::onSdkPathChanged()
         currentOpenSslPath = sdkPath.pathAppended("android_openssl");
     m_openSslPathChooser->setFilePath(currentOpenSslPath);
     // Package reload will trigger validateSdk.
-    m_sdkManager.reloadPackages();
+    m_sdkManager.refreshPackages();
 }
 
 void AndroidSettingsWidget::validateSdk()