feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Make sdkToolsUrl check a part of the recipe

Browse Source 
Change-Id: I37e1b9e49dbec8f7b12a90a32d54a23a7098b4b4
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2024-04-22 19:55:34 +02:00
committed by Alessandro Portale
parent 53c75898ee
commit b97434cca7
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/android/androidsdkdownloader.cpp
View File

@@ -87,11 +87,6 @@ static bool verifyFileIntegrity(const FilePath fileName, const QByteArray &sha25
void AndroidSdkDownloader::downloadAndExtractSdk()
{
if (androidConfig().sdkToolsUrl().isEmpty()) {
logError(Tr::tr("The SDK Tools download URL is empty."));
return;
}
struct StorageStruct
{
StorageStruct() {
@@ -108,6 +103,14 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
Storage<StorageStruct> storage;
const auto onSetup = [] {
if (androidConfig().sdkToolsUrl().isEmpty()) {
logError(Tr::tr("The SDK Tools download URL is empty."));
return SetupResult::StopWithError;
}
return SetupResult::Continue;
};
const auto onQuerySetup = [storage](NetworkQuery &query) {
query.setRequest(QNetworkRequest(androidConfig().sdkToolsUrl()));
query.setNetworkAccessManager(NetworkAccessManager::instance());
@@ -201,6 +204,7 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
parallel,
stopOnSuccessOrError,
Group {
onGroupSetup(onSetup),
NetworkQueryTask(onQuerySetup, onQueryDone),
UnarchiverTask(onUnarchiveSetup, onUnarchiverDone)
},