From bd493d7e5ab1cc93bba175c95b5e30d5e4a25b75 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 26 Jul 2024 14:40:24 +0200
Subject: [PATCH] Android: Get rid of intentName arg

It's always empty string.

Change-Id: Id270e7fb128bfac414929e3eb611eb26beeb3624
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androiddebugsupport.cpp      |  2 +-
 src/plugins/android/androidqmltoolingsupport.cpp |  2 +-
 src/plugins/android/androidruncontrol.cpp        |  6 +++---
 src/plugins/android/androidrunner.cpp            | 15 +++++++--------
 src/plugins/android/androidrunner.h              |  3 +--
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp
index cb3d58a0682..21907120243 100644
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -86,7 +86,7 @@ public:
     {
         setId("AndroidDebugger");
         setLldbPlatform("remote-android");
-        m_runner = new AndroidRunner(runControl, {});
+        m_runner = new AndroidRunner(runControl);
         addStartDependency(m_runner);
     }
 
diff --git a/src/plugins/android/androidqmltoolingsupport.cpp b/src/plugins/android/androidqmltoolingsupport.cpp
index e89e9e0414a..063ec837b18 100644
--- a/src/plugins/android/androidqmltoolingsupport.cpp
+++ b/src/plugins/android/androidqmltoolingsupport.cpp
@@ -17,7 +17,7 @@ public:
     {
         setId("AndroidQmlToolingSupport");
 
-        auto runner = new AndroidRunner(runControl, {});
+        auto runner = new AndroidRunner(runControl);
         addStartDependency(runner);
 
         auto worker = runControl->createWorker(QmlDebug::runnerIdForRunMode(runControl->runMode()));
diff --git a/src/plugins/android/androidruncontrol.cpp b/src/plugins/android/androidruncontrol.cpp
index 60a239e3d97..023e14525c3 100644
--- a/src/plugins/android/androidruncontrol.cpp
+++ b/src/plugins/android/androidruncontrol.cpp
@@ -19,12 +19,12 @@ namespace Android::Internal {
 class AndroidRunSupport final : public AndroidRunner
 {
 public:
-    explicit AndroidRunSupport(RunControl *runControl, const QString &intentName = QString());
+    explicit AndroidRunSupport(RunControl *runControl);
     ~AndroidRunSupport() override;
 };
 
-AndroidRunSupport::AndroidRunSupport(RunControl *runControl, const QString &intentName)
-    : AndroidRunner(runControl, intentName)
+AndroidRunSupport::AndroidRunSupport(RunControl *runControl)
+    : AndroidRunner(runControl)
 {
     runControl->setIcon(Utils::Icons::RUN_SMALL_TOOLBAR);
 }
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index b8bce47b79d..6fe681b46e7 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -28,8 +28,9 @@ using namespace Utils;
 
 namespace Android::Internal {
 
-AndroidRunner::AndroidRunner(RunControl *runControl, const QString &intentName)
-    : RunWorker(runControl), m_target(runControl->target())
+AndroidRunner::AndroidRunner(RunControl *runControl)
+    : RunWorker(runControl)
+    , m_target(runControl->target())
 {
     setId("AndroidRunner");
     static const int metaTypes[] = {
@@ -39,15 +40,13 @@ AndroidRunner::AndroidRunner(RunControl *runControl, const QString &intentName)
     };
     Q_UNUSED(metaTypes)
 
-    QString intent = intentName;
-    if (intent.isEmpty())
-        intent = AndroidManager::packageName(m_target) + '/' + AndroidManager::activityName(m_target);
+    m_packageName = AndroidManager::packageName(m_target);
+    const QString intentName = m_packageName + '/' + AndroidManager::activityName(m_target);
 
-    m_packageName = intent.left(intent.indexOf('/'));
-    qCDebug(androidRunnerLog) << "Intent name:" << intent << "Package name" << m_packageName;
+    qCDebug(androidRunnerLog) << "Intent name:" << intentName << "Package name" << m_packageName;
 
     m_worker = new AndroidRunnerWorker(this, m_packageName);
-    m_worker->setIntentName(intent);
+    m_worker->setIntentName(intentName);
 
     m_worker->moveToThread(&m_thread);
     QObject::connect(&m_thread, &QThread::finished, m_worker, &QObject::deleteLater);
diff --git a/src/plugins/android/androidrunner.h b/src/plugins/android/androidrunner.h
index d7b257a5fdb..793b96654ad 100644
--- a/src/plugins/android/androidrunner.h
+++ b/src/plugins/android/androidrunner.h
@@ -23,8 +23,7 @@ class AndroidRunner : public ProjectExplorer::RunWorker
     Q_OBJECT
 
 public:
-    explicit AndroidRunner(ProjectExplorer::RunControl *runControl,
-                           const QString &intentName = QString());
+    explicit AndroidRunner(ProjectExplorer::RunControl *runControl);
     ~AndroidRunner() override;
 
     Utils::Port debugServerPort() const { return m_debugServerPort; } // GDB or LLDB