Show iOS version and build version in "Device found" message (ios-con…

…trol#491) Show iOS version and build version in "Device found" message
amake · Dec 14, 2020 · 00a39c8 · 00a39c8
1 parent 944329c
commit 00a39c8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/ios-deploy/ios-deploy.m b/src/ios-deploy/ios-deploy.m
@@ -412,11 +412,13 @@ CFStringRef get_device_full_name(const AMDeviceRef device) {
     NSLogVerbose(@"Architecture Name: %@", arch_name);
     NSLogVerbose(@"Product Version: %@", product_version);
     NSLogVerbose(@"Build Version: %@", build_version);
+    if (build_version == 0)
+        build_version = CFStringCreateWithCString(NULL, "", kCFStringEncodingUTF8);
 
     if (device_name != NULL) {
-        full_name = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@ (%@, %@, %@, %@) a.k.a. '%@'"), device_udid, model, model_name, sdk_name, arch_name, device_name);
+        full_name = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@ (%@, %@, %@, %@, %@, %@) a.k.a. '%@'"), device_udid, model, model_name, sdk_name, arch_name, product_version, build_version, device_name);
     } else {
-        full_name = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@ (%@, %@, %@, %@)"), device_udid, model, model_name, sdk_name, arch_name);
+        full_name = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@ (%@, %@, %@, %@, %@, %@)"), device_udid, model, model_name, sdk_name, arch_name, product_version, build_version);
     }
 
     AMDeviceDisconnect(device);