Move into a hardware vardict

And drop HWModelStr, which we so far have confirmed missing on iOS 15, 17, and 18. Co-authored-by: Håvard Sørbø <[email protected]>
frida · Jul 3, 2024 · d19c3fb · d19c3fb
1 parent ac889cb
commit d19c3fb
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/fruity/fruity-host-session.vala b/src/fruity/fruity-host-session.vala
@@ -250,9 +250,10 @@ namespace Frida {
 				os["build"] = properties.get_string ("BuildVersion");
 				parameters["os"] = os;
 
-				parameters["model"] = properties.get_string ("ProductType");
-				parameters["hwmodel"] = properties.get_string ("HWModelStr");
-				parameters["hwplatform"] = properties.get_string ("HardwarePlatform");
+				var hardware = new HashTable<string, Variant> (str_hash, str_equal);
+				hardware["id"] = properties.get_string ("ProductType");
+				hardware["platform"] = properties.get_string ("HardwarePlatform");
+				parameters["hardware"] = hardware;
 
 				parameters["platform"] = "darwin";