When connecting devices, prioritize the use of transport_id

SharpAdb · Jun 5, 2024 · 5e3d826 · 5e3d826
1 parent 987a519
commit 5e3d826
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/AdvancedSharpAdbClient.Tests/Dummys/DummyAdbSocket.cs b/AdvancedSharpAdbClient.Tests/Dummys/DummyAdbSocket.cs
@@ -146,7 +146,10 @@ public void SetDevice(DeviceData device)
             // to a specific device
             if (device != null)
             {
-                SendAdbRequest($"host:transport:{device.Serial}");
+                if(!string.IsNullOrWhiteSpace(device.TransportId) && uint.TryParse(device.TransportId,out var tid))
+                    SendAdbRequest($"host:transport-id:{tid}");
+                else
+                    SendAdbRequest($"host:transport:{device.Serial}");
 
                 try
                 {

diff --git a/AdvancedSharpAdbClient/AdbSocket.Async.cs b/AdvancedSharpAdbClient/AdbSocket.Async.cs
@@ -262,7 +262,10 @@ public async Task SetDeviceAsync(DeviceData device, CancellationToken cancellati
             // to a specific device
             if (device != null)
             {
-                await SendAdbRequestAsync($"host:transport:{device.Serial}", cancellationToken).ConfigureAwait(false);
+                if(!string.IsNullOrWhiteSpace(device.TransportId) && uint.TryParse(device.TransportId,out var tid))
+                    await SendAdbRequestAsync($"host:transport-id:{tid}", cancellationToken).ConfigureAwait(false);
+                else
+                    await SendAdbRequestAsync($"host:transport:{device.Serial}", cancellationToken).ConfigureAwait(false);                
 
                 try
                 {

diff --git a/AdvancedSharpAdbClient/AdbSocket.cs b/AdvancedSharpAdbClient/AdbSocket.cs
@@ -401,7 +401,10 @@ public void SetDevice(DeviceData device)
             // to a specific device
             if (device != null)
             {
-                SendAdbRequest($"host:transport:{device.Serial}");
+                if(!string.IsNullOrWhiteSpace(device.TransportId) && uint.TryParse(device.TransportId,out var tid))
+                    SendAdbRequest($"host:transport-id:{tid}");
+                else
+                    SendAdbRequest($"host:transport:{device.Serial}");
 
                 try
                 {