diff --git a/ios-deploy.c b/ios-deploy.c index 3389d9b..5367281 100644 --- a/ios-deploy.c +++ b/ios-deploy.c @@ -1307,8 +1307,7 @@ int app_exists(AMDeviceRef device) CFDictionaryRef result = nil; check_error(AMDeviceLookupApplications(device, options, &result)); - CFDictionaryRef app_dict = CFDictionaryGetValue(result, cf_bundle_id); - bool appExists = (app_dict == NULL) ? false : true; + bool appExists = CFDictionaryContainsKey(result, cf_bundle_id); printf("%s", appExists ? "true\n" : "false\n"); CFRelease(cf_bundle_id); @@ -1319,6 +1318,33 @@ int app_exists(AMDeviceRef device) return -1; } +void list_bundle_id(AMDeviceRef device) +{ + AMDeviceConnect(device); + assert(AMDeviceIsPaired(device)); + check_error(AMDeviceValidatePairing(device)); + check_error(AMDeviceStartSession(device)); + + NSArray *a = [NSArray arrayWithObjects:@"CFBundleIdentifier", nil]; + NSDictionary *optionsDict = [NSDictionary dictionaryWithObject:a forKey:@"ReturnAttributes"]; + CFDictionaryRef options = (CFDictionaryRef)optionsDict; + CFDictionaryRef result = nil; + check_error(AMDeviceLookupApplications(device, options, &result)); + + CFIndex count; + count = CFDictionaryGetCount(result); + const void *keys[count]; + CFDictionaryGetKeysAndValues(result, keys, NULL); + for(int i = 0; i < count; ++i) { + CFStringRef test = (CFStringRef)keys[i]; + const char * key = CFStringGetCStringPtr((CFStringRef)keys[i], kCFStringEncodingASCII); + printf("%s\n", key); + } + + check_error(AMDeviceStopSession(device)); + check_error(AMDeviceDisconnect(device)); +} + void copy_file_callback(afc_connection* afc_conn_p, const char *name,int file) { const char *local_name=name; @@ -1570,6 +1596,8 @@ void handle_device(AMDeviceRef device) { exit(app_exists(device)); } else if (strcmp("uninstall_only", command) == 0) { uninstall_app(device); + } else if (strcmp("list_bundle_id", command) == 0) { + list_bundle_id(device); } exit(0); } @@ -1752,7 +1780,8 @@ void usage(const char* app) { " -D, --mkdir