From b3cc723d298538c2b771b88b2a09b6fdbaeb35f8 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 4 Oct 2024 12:53:40 +0300 Subject: [PATCH] Android: move finished message from AndroidRunner to AndroidRunnerWorker 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 33022eec04a54c8ce87175d79738ea5c0abf7af0. Change-Id: Ieb02c4343d0f10d988372288715fe7fc2c85a643 Reviewed-by: Jarek Kobus --- src/plugins/android/androidrunner.cpp | 3 --- src/plugins/android/androidrunner.h | 1 - src/plugins/android/androidrunnerworker.cpp | 9 +++++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index fa6dc5a415f..f5febfc275a 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -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) diff --git a/src/plugins/android/androidrunner.h b/src/plugins/android/androidrunner.h index 0a6d6a0fedf..7ec2babb7b0 100644 --- a/src/plugins/android/androidrunner.h +++ b/src/plugins/android/androidrunner.h @@ -46,7 +46,6 @@ private: Utils::ProcessHandle m_pid; QmlDebug::QmlOutputParser m_outputParser; Tasking::TaskTreeRunner m_taskTreeRunner; - QString m_packageName; }; } // namespace Android::Internal diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index abc56ea13a1..4033a86d2ce 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -581,10 +581,11 @@ static ExecutableItem postDoneRecipe(const Storage &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 {