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

Android: move finished message from AndroidRunner to AndroidRunnerWorker

Browse Source 
Not calling setFinished() when the app is terminated by the
user causes some issue and the app won't be able to restarted
again from the run button and a new deployment is needed. So
move the termination message to the worker where the "died"
message is at.

This amends 33022eec04.

Change-Id: Ieb02c4343d0f10d988372288715fe7fc2c85a643
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Assam Boudjelthia
2024-10-04 12:53:40 +03:00
parent 5954f9ba16
commit b3cc723d29
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androidrunner.cpp
View File

@@ -101,7 +101,6 @@ void AndroidRunner::start()
runnerRecipe(glueStorage)
};
m_taskTreeRunner.start(recipe);
m_packageName = AndroidManager::packageName(target);
}
void AndroidRunner::stop()
@@ -110,8 +109,6 @@ void AndroidRunner::stop()
return;
emit canceled();
appendMessage(Tr::tr("Android target \"%1\" terminated.").arg(m_packageName),
Utils::NormalMessageFormat);
}
void AndroidRunner::qmlServerPortReady(Port port)

1
src/plugins/android/androidrunner.h
View File

@@ -46,7 +46,6 @@ private:
Utils::ProcessHandle m_pid;
QmlDebug::QmlOutputParser m_outputParser;
Tasking::TaskTreeRunner m_taskTreeRunner;
QString m_packageName;
};
} // namespace Android::Internal

9
src/plugins/android/androidrunnerworker.cpp
View File

@@ -581,10 +581,11 @@ static ExecutableItem postDoneRecipe(const Storage<RunnerStorage> &storage)
const auto onDone = [storage] {
storage->m_processPID = -1;
storage->m_processUser = -1;
if (!storage->m_glue->wasCancelled()) {
storage->m_glue->setFinished(Tr::tr("Android target \"%1\" died.")
.arg(storage->m_packageName));
}
const QString package = storage->m_packageName;
const QString message = storage->m_glue->wasCancelled()
? Tr::tr("Android target \"%1\" terminated.").arg(package)
: Tr::tr("Android target \"%1\" died.").arg(package);
storage->m_glue->setFinished(message);
};
return Group {