From babe79f391d48797f503b93f69c9b713a8c2709c Mon Sep 17 00:00:00 2001 From: Antoine van Gelder Date: Tue, 2 Aug 2016 15:27:48 +0200 Subject: [PATCH 1/2] Add missing iPad Air and iPad Mini models --- src/ios-deploy/ios-deploy.m | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/ios-deploy/ios-deploy.m b/src/ios-deploy/ios-deploy.m index ed482188..72723b47 100644 --- a/src/ios-deploy/ios-deploy.m +++ b/src/ios-deploy/ios-deploy.m @@ -330,12 +330,24 @@ const CFStringRef get_device_hardware_name(const AMDeviceRef device) { GET_FRIENDLY_MODEL_NAME(model, "P101AP", "iPad 4") GET_FRIENDLY_MODEL_NAME(model, "P102AP", "iPad 4 (GSM)") GET_FRIENDLY_MODEL_NAME(model, "P103AP", "iPad 4 (CDMA)") + GET_FRIENDLY_MODEL_NAME(model, "J71AP", "iPad Air") + GET_FRIENDLY_MODEL_NAME(model, "J72AP", "iPad Air (GSM)") + GET_FRIENDLY_MODEL_NAME(model, "J73AP", "iPad Air (CDMA)") + GET_FRIENDLY_MODEL_NAME(model, "J81AP", "iPad Air 2") + GET_FRIENDLY_MODEL_NAME(model, "J82AP", "iPad Air 2 (GSM)") + GET_FRIENDLY_MODEL_NAME(model, "J83AP", "iPad Air 2 (CDMA)") // iPad Mini GET_FRIENDLY_MODEL_NAME(model, "P105AP", "iPad mini") GET_FRIENDLY_MODEL_NAME(model, "P106AP", "iPad mini (GSM)") GET_FRIENDLY_MODEL_NAME(model, "P107AP", "iPad mini (CDMA)") + GET_FRIENDLY_MODEL_NAME(model, "J85AP", "iPad mini 2") + GET_FRIENDLY_MODEL_NAME(model, "J86AP", "iPad mini 2 (GSM)") + GET_FRIENDLY_MODEL_NAME(model, "J87AP", "iPad mini 2 (CDMA)") + GET_FRIENDLY_MODEL_NAME(model, "J85MAP", "iPad mini 3") + GET_FRIENDLY_MODEL_NAME(model, "J86MAP", "iPad mini 3 (GSM)") + GET_FRIENDLY_MODEL_NAME(model, "J87MAP", "iPad mini 3 (CDMA)") // Apple TV From 25588767f2244b999b31f5e00365509d836fdaf2 Mon Sep 17 00:00:00 2001 From: Antoine van Gelder Date: Tue, 2 Aug 2016 15:32:37 +0200 Subject: [PATCH 2/2] Fixed: ios-deploy will exit when the detection timeout ends even if the device has been detected --- src/ios-deploy/ios-deploy.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ios-deploy/ios-deploy.m b/src/ios-deploy/ios-deploy.m index 72723b47..b5587cfe 100644 --- a/src/ios-deploy/ios-deploy.m +++ b/src/ios-deploy/ios-deploy.m @@ -1708,7 +1708,9 @@ void device_callback(struct am_device_notification_callback_info *info, void *ar } void timeout_callback(CFRunLoopTimerRef timer, void *info) { - if ((!found_device) && (!detect_only)) { + if (found_device && (!detect_only)) { + return; + } else if ((!found_device) && (!detect_only)) { if(best_device_match != NULL) { NSLogVerbose(@"Handling best device match."); handle_device(best_device_match);