From 6c15cc6bf9e5bf53f041b389029b4a6cbd375ceb Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 23 Jul 2024 06:19:53 +0200 Subject: [PATCH] Android: Simplify removeForwardPort() There is no need to split the output into separate lines and search for port number in each line afterwards. Search for port number in the whole output instead. Change-Id: Id020bd5a73080be30b6cef47853e027235105ae3 Reviewed-by: Alessandro Portale --- src/plugins/android/androidrunnerworker.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index 45cf40d7abe..299ec6a4b99 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -761,22 +761,9 @@ void AndroidRunnerWorker::handleJdbSettled() void AndroidRunnerWorker::removeForwardPort(const QString &port) { - bool found = false; - SdkToolResult result = AndroidManager::runAdbCommand({"forward", "--list"}); - - QString string = result.stdOut(); - const auto lines = string.split('\n'); - for (const QString &line : lines) { - if (line.contains(port)) { - found = true; - break; - } - } - - if (found) { - QStringList removeForward{"forward", "--remove", port}; - runAdb(removeForward); - } + const SdkToolResult result = AndroidManager::runAdbCommand({"forward", "--list"}); + if (result.stdOut().contains(port)) + runAdb({"forward", "--remove", port}); } void AndroidRunnerWorker::onProcessIdChanged(const PidUserPair &pidUser)