From df7983201f965ddfc7b73c2b605da239a9567ce5 Mon Sep 17 00:00:00 2001 From: quantum-x Date: Tue, 26 Aug 2025 18:16:18 +0300 Subject: [PATCH 1/2] Device selection fix Device selection (-s) must be directly after the ADB command. --- android_unpinner/vendor/platform_tools/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/android_unpinner/vendor/platform_tools/__init__.py b/android_unpinner/vendor/platform_tools/__init__.py index 6ba708e..906e582 100644 --- a/android_unpinner/vendor/platform_tools/__init__.py +++ b/android_unpinner/vendor/platform_tools/__init__.py @@ -16,10 +16,11 @@ def adb(cmd: str) -> subprocess.CompletedProcess[str]: """Helper function to call adb and capture stdout.""" - cmd = f"{adb_binary} {cmd}" if device: - cmd += f" -s {device}" + device_cmd = f" -s {device}" logging.debug(f"Using device: {device}") + + cmd = f"{adb_binary} {device_cmd} {cmd}" try: proc = subprocess.run( cmd, shell=True, check=True, capture_output=True, text=True From 2a0e5f88e86ebaf5fa926f48c87945d1f24a5820 Mon Sep 17 00:00:00 2001 From: quantum-x Date: Tue, 26 Aug 2025 18:32:19 +0300 Subject: [PATCH 2/2] Update __init__.py Corrected logic error relating to commands without a device. --- android_unpinner/vendor/platform_tools/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/android_unpinner/vendor/platform_tools/__init__.py b/android_unpinner/vendor/platform_tools/__init__.py index 906e582..e584349 100644 --- a/android_unpinner/vendor/platform_tools/__init__.py +++ b/android_unpinner/vendor/platform_tools/__init__.py @@ -17,10 +17,11 @@ def adb(cmd: str) -> subprocess.CompletedProcess[str]: """Helper function to call adb and capture stdout.""" if device: - device_cmd = f" -s {device}" + cmd = f"{adb_binary} -s {device} {cmd}" logging.debug(f"Using device: {device}") + else: + cmd = f"{adb_binary} -s {device} {cmd}" - cmd = f"{adb_binary} {device_cmd} {cmd}" try: proc = subprocess.run( cmd, shell=True, check=True, capture_output=True, text=True