From 5c5c5059107728f6d447a89d06772cbbeecc3f26 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 26 Jun 2020 00:34:51 +0300 Subject: [PATCH] Android: validate jdk path at start and reload sdkmanager after that * Validate Jdk path at the start to avoid showing valide settings on empty path. * Reload sdkmanager after jdk path is changed to reflect changes. Change-Id: Ib5eafead9d4f695cf79c55b79866bd3269dadbd5 Reviewed-by: Alessandro Portale --- src/plugins/android/androidsettingswidget.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 951b40a2227..9cd90087ef5 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -319,6 +319,7 @@ void AndroidSettingsWidget::showEvent(QShowEvent *event) { Q_UNUSED(event) if (!m_isInitialReloadDone) { + validateJdk(); // Reloading SDK packages (force) is still synchronous. Use zero timer // to let settings dialog open first. QTimer::singleShot(0, std::bind(&AndroidSdkManager::reloadPackages, @@ -582,6 +583,9 @@ void AndroidSettingsWidget::validateJdk() m_javaSummary->setPointValid(JavaJdkValidRow, jdkPathExists && bin.exists()); updateUI(); + + if (m_isInitialReloadDone) + m_sdkManager.reloadPackages(true); } void AndroidSettingsWidget::validateOpenSsl()