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

Android: Inline some redirections

Browse Source 
Get rid of onLicenseCheckResult() and runPendingCommand().
Gather all the continuations inside the packageFutureFinished().
This clears up the picture of what is happening.

Change-Id: I7d63fa7a628a0bdefb26677f04df97a0491668ab
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-05-02 14:11:14 +02:00
parent bbd2c81e61
commit b090401b78
2 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/android/androidsdkmanagerwidget.cpp
View File

@@ -393,17 +393,6 @@ void AndroidSdkManagerWidget::onOperationResult(int index)
m_outputEdit->ensureCursorVisible(); m_outputEdit->ensureCursorVisible();
} }
void AndroidSdkManagerWidget::onLicenseCheckResult(const AndroidSdkManager::OperationOutput& output)
{
if (output.success) {
// No assertion was found. Looks like all license are accepted. Go Ahead.
runPendingCommand();
} else {
// Run license workflow.
licenseWorkflow();
}
}
void AndroidSdkManagerWidget::addPackageFuture(const QFuture<AndroidSdkManager::OperationOutput> void AndroidSdkManagerWidget::addPackageFuture(const QFuture<AndroidSdkManager::OperationOutput>
&future) &future)
{ {
@@ -493,12 +482,24 @@ void AndroidSdkManagerWidget::packageFutureFinished()
m_currentOperation = nullptr; m_currentOperation = nullptr;
switch (type) { switch (type) {
case AndroidSdkManager::LicenseCheck: case AndroidSdkManager::LicenseCheck:
onLicenseCheckResult(output); if (output.success) {
// No assertion was found. Looks like all license are accepted. Go Ahead.
if (m_pendingCommand == AndroidSdkManager::UpdatePackages)
updatePackages(); // License workflow can only start when updating packages.
else if (m_pendingCommand == AndroidSdkManager::UpdateInstalled)
updateInstalled();
} else {
// Run license workflow.
licenseWorkflow();
}
break; break;
case AndroidSdkManager::LicenseWorkflow: case AndroidSdkManager::LicenseWorkflow:
m_sdkLicenseButtonBox->hide(); m_sdkLicenseButtonBox->hide();
m_sdkLicenseLabel->hide(); m_sdkLicenseLabel->hide();
runPendingCommand(); if (m_pendingCommand == AndroidSdkManager::UpdatePackages)
updatePackages(); // License workflow can only start when updating packages.
else if (m_pendingCommand == AndroidSdkManager::UpdateInstalled)
updateInstalled();
break; break;
case AndroidSdkManager::UpdateInstalled: case AndroidSdkManager::UpdateInstalled:
case AndroidSdkManager::UpdatePackages: case AndroidSdkManager::UpdatePackages:
@@ -542,16 +543,6 @@ void AndroidSdkManagerWidget::switchView(AndroidSdkManagerWidget::View view)
m_viewStack->setCurrentWidget(m_currentView == PackageListing ? m_packagesStack : m_outputStack); m_viewStack->setCurrentWidget(m_currentView == PackageListing ? m_packagesStack : m_outputStack);
} }
void AndroidSdkManagerWidget::runPendingCommand()
{
if (m_pendingCommand == AndroidSdkManager::UpdatePackages)
updatePackages(); // License workflow can only start when updating packages.
else if (m_pendingCommand == AndroidSdkManager::UpdateInstalled)
updateInstalled();
else
QTC_ASSERT(false, qCDebug(androidSdkMgrUiLog) << "Unexpected state: No pending command.");
}
void AndroidSdkManagerWidget::onSdkManagerOptions() void AndroidSdkManagerWidget::onSdkManagerOptions()
{ {
OptionsDialog dlg(m_sdkManager, androidConfig().sdkManagerToolArgs(), this); OptionsDialog dlg(m_sdkManager, androidConfig().sdkManagerToolArgs(), this);

2
src/plugins/android/androidsdkmanagerwidget.h
View File

@@ -78,7 +78,6 @@ private:
void onUpdateInstalled(); void onUpdateInstalled();
void onCancel(); void onCancel();
void onOperationResult(int index); void onOperationResult(int index);
void onLicenseCheckResult(const AndroidSdkManager::OperationOutput &output);
void onSdkManagerOptions(); void onSdkManagerOptions();
void addPackageFuture(const QFuture<AndroidSdkManager::OperationOutput> &future); void addPackageFuture(const QFuture<AndroidSdkManager::OperationOutput> &future);
void licenseCheck(); void licenseCheck();
@@ -89,7 +88,6 @@ private:
void packageFutureFinished(); void packageFutureFinished();
void cancelPendingOperations(); void cancelPendingOperations();
void switchView(View view); void switchView(View view);
void runPendingCommand();
AndroidSdkManager::CommandType m_pendingCommand = AndroidSdkManager::None; AndroidSdkManager::CommandType m_pendingCommand = AndroidSdkManager::None;
View m_currentView = PackageListing; View m_currentView = PackageListing;