Android: read SDK configuration from user editable path

By default, copy the sdk_definitions.json to Qt Creator user resource
path. The user can use that to make any updates if desired.

Add SdkDownloader instance as a member of AndroidSettingsWidget.

Change-Id: Ieabc9c6ddecbe63586f750b26bcf4ca990caee26
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/android/androidsdkdownloader.cpp b/src/plugins/android/androidsdkdownloader.cpp
index fdefe3ea35d..83ea197f779 100644
--- a/src/plugins/android/androidsdkdownloader.cpp
+++ b/src/plugins/android/androidsdkdownloader.cpp
@@ -42,9 +42,9 @@ namespace Internal {
  * @class SdkDownloader
  * @brief Download Android SDK tools package from within Qt Creator.
  */
-AndroidSdkDownloader::AndroidSdkDownloader(const QUrl &sdkUrl, const QByteArray &sha256) :
-    m_sdkUrl(sdkUrl), m_sha256(sha256)
+AndroidSdkDownloader::AndroidSdkDownloader()
 {
+    m_androidConfig = AndroidConfigurations::currentConfig();
     connect(&m_manager, &QNetworkAccessManager::finished, this, &AndroidSdkDownloader::downloadFinished);
 }
 
@@ -73,12 +73,12 @@ static void setSdkFilesExecPermission( const QString &sdkExtractPath)
 
 void AndroidSdkDownloader::downloadAndExtractSdk(const QString &jdkPath, const QString &sdkExtractPath)
 {
-    if (m_sdkUrl.isEmpty()) {
+    if (m_androidConfig.sdkToolsUrl().isEmpty()) {
         logError(tr("The SDK Tools download URL is empty."));
         return;
     }
 
-    QNetworkRequest request(m_sdkUrl);
+    QNetworkRequest request(m_androidConfig.sdkToolsUrl());
     m_reply = m_manager.get(request);
 
 #if QT_CONFIG(ssl)
@@ -131,7 +131,7 @@ bool AndroidSdkDownloader::verifyFileIntegrity()
     if (f.open(QFile::ReadOnly)) {
         QCryptographicHash hash(QCryptographicHash::Sha256);
         if (hash.addData(&f)) {
-            return hash.result() == m_sha256;
+            return hash.result() == m_androidConfig.getSdkToolsSha256();
         }
     }
     return false;