fix: use the secure uninstall application (the old one is not working on wifi devices)

Author: DimitarTachev

IOSDeviceLib/Constants.h

@@ -24,6 +24,7 @@ static const unsigned kCFStringEncodingUTF8 = 0x08000100;
 static const unsigned kAMDNotFoundError = 0xe8000008;
 static const unsigned kAMDAPIInternalError = 0xe8000067;
 static const int kUSBInterfaceType = 1;
+static const int kWIFIInterfaceType = 2;
 static const unsigned kAppleServiceNotStartedErrorCode = 0xE8000063;
 static const unsigned kMountImageAlreadyMounted = 0xE8000076; // Note: This error code is actually named kAMDMobileImageMounterImageMountFailed but AppBuilder CLI and other sources think that getting this exit code during a mount is okay
 static const unsigned kIncompatibleSignature = 0xE8000033; // Note: This error code is actually named kAMDInvalidDiskImageError but CLI and other sources think that getting this exit code during a mount is okay
@@ -69,6 +70,7 @@ static const char *kResponseCommandType = "responseCommandType";
 static const char *kResponsePropertyName = "responsePropertyName";
 static const char *kShouldWaitForResponse = "shouldWaitForResponse";
 static const char *kCommandType = "commandType";
+static const char *kConnectionType = "connectionType";
 static const char *kTimeout = "timeout";
 static const char *kPort = "port";
 static const char *kHost = "host";

IOSDeviceLib/Declarations.h

@@ -168,7 +168,7 @@ typedef void(__cdecl *cfdictionary_get_keys_and_values)(CFDictionaryRef, const v
 typedef CFStringRef(__cdecl *cfstring_create_with_cstring)(void*, const char*, unsigned);
 typedef CFArrayRef(__cdecl *cfarray_create)(void*, const void**, long, void**);
 typedef unsigned(__cdecl *device_secure_operation_with_path)(int, const DeviceInfo*, CFURLRef, CFDictionaryRef, void(*f)(), int);
-typedef unsigned(__cdecl *device_secure_operation_with_bundle_id)(int, const DeviceInfo*, CFStringRef, int, void(*f)(), int);
+typedef unsigned(__cdecl *device_secure_operation_with_bundle_id)(ServiceConnRef connection, const DeviceInfo*, CFStringRef *bundleIdentifier, CFDictionaryRef *params, void (*installCallback)(CFDictionaryRef*, void *));
 typedef void(__cdecl *cfrelease)(CFStringRef);
 
 typedef CFDictionaryRef(__cdecl *cfdictionary_create)(void *, void*, void*, int, void*, void*);
@@ -276,8 +276,8 @@ extern "C"
 	unsigned AMDeviceCreateHouseArrestService(const DeviceInfo*, CFStringRef identifier, void * unknown, AFCConnectionRef * handle);
 	int AMDeviceGetConnectionID(const DeviceInfo*);
 	int AMDeviceGetInterfaceType(const DeviceInfo*);
+    unsigned AMDeviceSecureUninstallApplication(ServiceConnRef connection, const DeviceInfo*, CFStringRef bundleIdentifier, CFDictionaryRef params, void (*installCallback)(CFDictionaryRef*, void *));
 	unsigned AMDeviceUninstallApplication(HANDLE, CFStringRef, void*, void(*f)(), void*);
-	unsigned AMDeviceSecureUninstallApplication(int, const DeviceInfo*, CFStringRef, int, void(*f)(), int);
 	unsigned AMDeviceStartSession(const DeviceInfo*);
 	unsigned AMDeviceStopSession(const DeviceInfo*);
 	unsigned AMDeviceConnect(const DeviceInfo*);

IOSDeviceLib/IOSDeviceLib.cpp

@@ -134,6 +134,7 @@ int start_session(std::string& device_identifier)
 	{
 		const DeviceInfo* device_info = devices[device_identifier].device_info;
 		UNLOCK_MUTEX_AND_RETURN_IF_FAILED_RESULT(AMDeviceConnect(device_info), start_session_mutex);
+        assert(AMDeviceIsPaired(device_info));
 		UNLOCK_MUTEX_AND_RETURN_IF_FAILED_RESULT(AMDeviceValidatePairing(device_info), start_session_mutex);
 		UNLOCK_MUTEX_AND_RETURN_IF_FAILED_RESULT(AMDeviceStartSession(device_info), start_session_mutex);
 	}
@@ -242,6 +243,10 @@ void get_device_properties(std::string device_identifier, json &result)
 	result["deviceName"] = get_device_property_value(device_identifier, "DeviceName");
 	result["productVersion"] = get_device_property_value(device_identifier, kProductVersion);
 	result["deviceColor"] = get_device_property_value(device_identifier, "DeviceColor");
+    //    available values:
+    //    "BluetoothAddress","BoardId","CPUArchitecture","ChipID","DeviceClass",
+    //    "DeviceColor","DeviceName","FirmwareVersion","HardwareModel",
+    //    "ModelNumber","ProductType","ProductVersion","UniqueDeviceID","WiFiAddress"
 }
 
 inline bool has_complete_status(std::map<std::string, boost::any>& dict)
@@ -259,11 +264,12 @@ void on_device_found(const DevicePointer* device_ptr, std::string device_identif
 		2 - wifi interface type
 	*/
 	int interface_type = AMDeviceGetInterfaceType(device_ptr->device_info);
-	if (interface_type == kUSBInterfaceType) {
+	if (interface_type == kUSBInterfaceType || interface_type == kWIFIInterfaceType) {
 		devices[device_identifier] = { device_ptr->device_info, nullptr };
 		result[kEventString] = eventString;
+        result[kConnectionType] = interface_type;
 		get_device_properties(device_identifier, result);
-	}
+    }
 }
 
 void device_notification_callback(const DevicePointer* device_ptr)
@@ -497,14 +503,16 @@ void uninstall_application(std::string application_identifier, std::string devic
 		return;
 	}
 
-	HANDLE socket = start_secure_service(device_identifier, kInstallationProxy, method_id, true, false).socket;
-	if (!socket)
+	ServiceInfo serviceInfo = start_secure_service(device_identifier, kInstallationProxy, method_id, true, false);
+	if (!serviceInfo.socket)
 	{
 		return;
 	}
 
 	CFStringRef appid_cfstring = create_CFString(application_identifier.c_str());
-	unsigned result = AMDeviceUninstallApplication(socket, appid_cfstring, NULL, [] {}, NULL);
+    DeviceInfo* deviceInfo = devices[device_identifier].device_info;
+    CFDictionaryRef params = CFDictionaryCreate(NULL, {}, {}, 0, NULL, NULL);
+    unsigned result = AMDeviceSecureUninstallApplication(serviceInfo.connection, deviceInfo, appid_cfstring, params, NULL);
 	CFRelease(appid_cfstring);
 
 	if (result)
@@ -1137,7 +1145,7 @@ void post_notification(std::string device_identifier, PostNotificationInfo post_
 void await_notification_response(std::string device_identifier, AwaitNotificationResponseInfo await_notification_response_info, std::string method_id)
 {
 	ServiceConnRef connection = serviceConnections[(int)await_notification_response_info.socket];
-	std::string invalid_connection_error_message = "Invalid connectionId: " + std::to_string(await_notification_response_info.socket);
+	std::string invalid_connection_error_message = "Invalid socket: " + std::to_string(await_notification_response_info.socket);
 	PRINT_ERROR_AND_RETURN_IF_FAILED_RESULT(connection == nullptr, invalid_connection_error_message.c_str(), device_identifier, method_id);
 
 	ServiceInfo currentNotificationProxy = devices[device_identifier].services[kNotificationProxy];

typings/interfaces.d.ts

@@ -10,6 +10,7 @@ declare global {
 			productType?: string;
 			productVersion?: string;
 			status?: string;
+			connectionType: number;
 		}
 
 		interface IDeviceId {