* fixed: device deployment -- fails to pick exact device if multiple …

…is connected (MobiVM#759) also removing duplicates if both Network and USB connection available to same device (cherry picked from commit d2adb2f)
dkimitsa · Apr 12, 2024 · 6df4ce7 · 6df4ce7
1 parent b71d121
commit 6df4ce7
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 36 deletions.
diff --git a/compiler/libimobiledevice/src/main/java/org/robovm/libimobiledevice/AfcClient.java b/compiler/libimobiledevice/src/main/java/org/robovm/libimobiledevice/AfcClient.java
@@ -728,18 +728,16 @@ public static void main(String[] args) throws Exception {
             }
 
             if (deviceId == null) {
-                if (deviceId == null) {
-                    String[] udids = IDevice.listUdids();
-                    if (udids.length == 0) {
-                        System.err.println("No device connected");
-                        return;
-                    }
-                    if (udids.length > 1) {
-                        System.err.println("More than 1 device connected (" 
-                                + Arrays.asList(udids) + "). Using " + udids[0]);
-                    }
-                    deviceId = udids[0];
+                String[] udids = IDevice.listUdids();
+                if (udids.length == 0) {
+                    System.err.println("No device connected");
+                    return;
+                }
+                if (udids.length > 1) {
+                    System.err.println("More than 1 device connected ("
+                            + Arrays.asList(udids) + "). Using " + udids[0]);
                 }
+                deviceId = udids[0];
             }
 
             try (IDevice device = new IDevice(deviceId)) {

diff --git a/compiler/libimobiledevice/src/main/java/org/robovm/libimobiledevice/IDevice.java b/compiler/libimobiledevice/src/main/java/org/robovm/libimobiledevice/IDevice.java
@@ -17,7 +17,9 @@
 package org.robovm.libimobiledevice;
 
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.robovm.libimobiledevice.binding.*;
 
@@ -133,11 +135,11 @@ public static String[] listUdids() {
             checkResult(LibIMobileDevice.idevice_get_device_list_extended(devicesOut, countOut));
             IDeviceInfoArray devices = devicesOut.getValue();
             int count = countOut.getValue();
-            String[] udids = new String[count];
+            Set<String> udids = new LinkedHashSet<>();
             for (int i = 0; i < count; i++) {
-                udids[i] = devices.get(i).getUdid();
+                udids.add(devices.get(i).getUdid());
             }
-            return udids;
+            return udids.toArray(new String[0]);
         } catch (LibIMobileDeviceException e) {
         	if (e.getErrorCode() == IDeviceError.IDEVICE_E_NO_DEVICE.swigValue()) {
         		// This happens when usbmuxd isn't running

diff --git a/...r/libimobiledevice/src/main/java/org/robovm/libimobiledevice/InstallationProxyClient.java b/...r/libimobiledevice/src/main/java/org/robovm/libimobiledevice/InstallationProxyClient.java
@@ -331,18 +331,16 @@ public static void main(String[] args) throws Exception {
             }
 
             if (deviceId == null) {
-                if (deviceId == null) {
-                    String[] udids = IDevice.listUdids();
-                    if (udids.length == 0) {
-                        System.err.println("No device connected");
-                        return;
-                    }
-                    if (udids.length > 1) {
-                        System.err.println("More than 1 device connected (" 
-                                + Arrays.asList(udids) + "). Using " + udids[0]);
-                    }
-                    deviceId = udids[0];
+                String[] udids = IDevice.listUdids();
+                if (udids.length == 0) {
+                    System.err.println("No device connected");
+                    return;
+                }
+                if (udids.length > 1) {
+                    System.err.println("More than 1 device connected ("
+                            + Arrays.asList(udids) + "). Using " + udids[0]);
                 }
+                deviceId = udids[0];
             }
 
             try (IDevice device = new IDevice(deviceId)) {

diff --git a/.../libimobiledevice/src/main/java/org/robovm/libimobiledevice/MobileImageMounterClient.java b/.../libimobiledevice/src/main/java/org/robovm/libimobiledevice/MobileImageMounterClient.java
@@ -249,18 +249,16 @@ public static void main(String[] args) throws Exception {
             }
 
             if (deviceId == null) {
-                if (deviceId == null) {
-                    String[] udids = IDevice.listUdids();
-                    if (udids.length == 0) {
-                        System.err.println("No device connected");
-                        return;
-                    }
-                    if (udids.length > 1) {
-                        System.err.println("More than 1 device connected (" 
-                                + Arrays.asList(udids) + "). Using " + udids[0]);
-                    }
-                    deviceId = udids[0];
+                String[] udids = IDevice.listUdids();
+                if (udids.length == 0) {
+                    System.err.println("No device connected");
+                    return;
+                }
+                if (udids.length > 1) {
+                    System.err.println("More than 1 device connected ("
+                            + Arrays.asList(udids) + "). Using " + udids[0]);
                 }
+                deviceId = udids[0];
             }
 
             try (IDevice device = new IDevice(deviceId)) {

diff --git a/compiler/libimobiledevice/src/main/java/org/robovm/libimobiledevice/util/AppLauncher.java b/compiler/libimobiledevice/src/main/java/org/robovm/libimobiledevice/util/AppLauncher.java
@@ -144,6 +144,9 @@ private IDevice waitForDevice(String deviceUdid) throws Exception{
             if (udids.length == 1 && (deviceUdid == null || deviceUdid.equals(udids[0]))) {
                 // single device and it's a match
                 return new IDevice(udids[0]);
+            } else if (udids.length > 1 && deviceUdid != null && Arrays.asList(udids).contains(deviceUdid)) {
+                // multiple devices connected but specified is there
+                return new IDevice(deviceUdid);
             }
 
             String message;