From b733a16cce4b539b17aa9d8d186cc2b4ecfa43b3 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Tue, 23 Jul 2024 06:40:22 +0200
Subject: [PATCH] Android: Avoid code repetition

Add extra args to removeForwardPort().

Change-Id: I3aed7974aff327f29db9f62e4714ba2696b81dd6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androidrunnerworker.cpp | 40 ++++++++-------------
 src/plugins/android/androidrunnerworker.h   |  2 +-
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp
index 299ec6a4b99..d84ecb9e06a 100644
--- a/src/plugins/android/androidrunnerworker.cpp
+++ b/src/plugins/android/androidrunnerworker.cpp
@@ -452,14 +452,9 @@ void AndroidRunnerWorker::asyncStartHelper()
 
     if (m_qmlDebugServices != QmlDebug::NoQmlDebugServices) {
         // currently forward to same port on device and host
-        const QString port = QString("tcp:%1").arg(m_qmlServer.port());
-        QStringList removeForward{{"forward", "--remove", port}};
-        removeForwardPort(port);
-        if (!runAdb({"forward", port, port})) {
-            emit remoteProcessFinished(Tr::tr("Failed to forward QML debugging ports."));
+        const QString port = "tcp:" + QString::number(m_qmlServer.port());
+        if (!removeForwardPort(port, port, "QML"))
             return;
-        }
-        m_afterFinishAdbCommands.push_back(removeForward.join(' '));
 
         const QString qmljsdebugger = QString("port:%1,block,services:%2")
                 .arg(m_qmlServer.port()).arg(QmlDebug::qmlDebugServices(m_qmlDebugServices));
@@ -601,16 +596,8 @@ void AndroidRunnerWorker::startDebuggerServer(const QString &packageDir,
         qCDebug(androidRunWorkerLog) << "Debugger process started";
         m_debugServerProcess->setObjectName("AndroidDebugServerProcess");
 
-        // TODO: Repeats 3 times, refactor...
-        const QString port = "tcp:" + m_localDebugServerPort.toString();
-        const QStringList removeForward{"forward", "--remove", port};
-        removeForwardPort(port);
-        if (!runAdb({"forward", port,
-                    "localfilesystem:" + gdbServerSocket})) {
-            emit remoteProcessFinished(Tr::tr("Failed to forward C++ debugging ports."));
-            return;
-        }
-        m_afterFinishAdbCommands.push_back(removeForward.join(' '));
+        removeForwardPort("tcp:" + m_localDebugServerPort.toString(),
+                          "localfilesystem:" + gdbServerSocket, "C++");
     }
 }
 
@@ -690,15 +677,9 @@ void AndroidRunnerWorker::asyncStop()
 
 void AndroidRunnerWorker::handleJdbWaiting()
 {
-    const QString port = "tcp:" + m_localJdbServerPort.toString();
-    const QStringList removeForward{"forward", "--remove", port};
-    removeForwardPort(port);
-    if (!runAdb({"forward", port,
-                "jdwp:" + QString::number(m_processPID)})) {
-        emit remoteProcessFinished(Tr::tr("Failed to forward JDB debugging ports."));
+    if (!removeForwardPort("tcp:" + m_localJdbServerPort.toString(),
+                           "jdwp:" + QString::number(m_processPID), "JDB"))
         return;
-    }
-    m_afterFinishAdbCommands.push_back(removeForward.join(' '));
 
     const FilePath jdbPath = AndroidConfig::openJDKLocation()
             .pathAppended("bin/jdb").withExecutableSuffix();
@@ -759,11 +740,18 @@ void AndroidRunnerWorker::handleJdbSettled()
     emit remoteProcessFinished(Tr::tr("Cannot attach JDB to the running application."));
 }
 
-void AndroidRunnerWorker::removeForwardPort(const QString &port)
+bool AndroidRunnerWorker::removeForwardPort(const QString &port, const QString &adbArg,
+                                            const QString &portType)
 {
     const SdkToolResult result = AndroidManager::runAdbCommand({"forward", "--list"});
     if (result.stdOut().contains(port))
         runAdb({"forward", "--remove", port});
+    if (runAdb({"forward", port, adbArg})) {
+        m_afterFinishAdbCommands.push_back("forward --remove " + port);
+        return true;
+    }
+    emit remoteProcessFinished(Tr::tr("Failed to forward %1 debugging ports.").arg(portType));
+    return false;
 }
 
 void AndroidRunnerWorker::onProcessIdChanged(const PidUserPair &pidUser)
diff --git a/src/plugins/android/androidrunnerworker.h b/src/plugins/android/androidrunnerworker.h
index 713f50e9b93..93cc002b747 100644
--- a/src/plugins/android/androidrunnerworker.h
+++ b/src/plugins/android/androidrunnerworker.h
@@ -58,7 +58,7 @@ private:
     void handleJdbWaiting();
     void handleJdbSettled();
 
-    void removeForwardPort(const QString &port);
+    bool removeForwardPort(const QString &port, const QString &adbArg, const QString &portType);
 
     void asyncStartHelper();
     void startNativeDebugging();