From 8498ad807829b0b273c8bbd1c01b04fa10146d72 Mon Sep 17 00:00:00 2001
From: SuisChan <Suis_chan@hotmail.com>
Date: Mon, 24 Jan 2022 12:52:15 +0100
Subject: [PATCH] Update connectivity.proto

---
 core/src/spclient.rs              |  6 +++---
 protocol/proto/connectivity.proto | 25 +++++++++++++++++--------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/core/src/spclient.rs b/core/src/spclient.rs
index 6217883e..7bfa1064 100644
--- a/core/src/spclient.rs
+++ b/core/src/spclient.rs
@@ -125,10 +125,10 @@ impl SpClient {
         let windows_data = platform_data.mut_windows();
         windows_data.set_os_version(10);
         windows_data.set_os_build(21370);
-        windows_data.set_unknown_value_4(2);
+        windows_data.set_platform_id(2);
         windows_data.set_unknown_value_6(9);
-        windows_data.set_unknown_value_7(332);
-        windows_data.set_unknown_value_8(34404);
+        windows_data.set_image_file_machine(332);
+        windows_data.set_pe_machine(34404);
         windows_data.set_unknown_value_10(true);
 
         let body = message.write_to_bytes()?;
diff --git a/protocol/proto/connectivity.proto b/protocol/proto/connectivity.proto
index 757f48c4..83440463 100644
--- a/protocol/proto/connectivity.proto
+++ b/protocol/proto/connectivity.proto
@@ -20,11 +20,14 @@ message PlatformSpecificData {
 }
 
 message NativeAndroidData {
-    int32 major_sdk_version = 1;
-    int32 minor_sdk_version = 2;
-    int32 patch_sdk_version = 3;
-    uint32 api_version = 4;
-    Screen screen_dimensions = 5;
+    Screen screen_dimensions = 1;
+    string android_version = 2;
+    int32 api_version = 3;
+    string device_name = 4;
+    string model_str = 5;
+    string vendor = 6;
+    string vendor_2 = 7;
+    int32 unknown_value_8 = 8;
 }
 
 message NativeIOSData {
@@ -38,10 +41,14 @@ message NativeIOSData {
 message NativeWindowsData {
     int32 os_version = 1;
     int32 os_build = 3;
-    int32 unknown_value_4 = 4;
+    // https://docs.microsoft.com/en-us/dotnet/api/system.platformid?view=net-6.0
+    int32 platform_id = 4;
+    int32 unknown_value_5 = 5;
     int32 unknown_value_6 = 6;
-    int32 unknown_value_7 = 7;
-    int32 unknown_value_8 = 8;
+    // https://docs.microsoft.com/en-us/dotnet/api/system.reflection.imagefilemachine?view=net-6.0
+    int32 image_file_machine = 7;
+    // https://docs.microsoft.com/en-us/dotnet/api/system.reflection.portableexecutable.machine?view=net-6.0
+    int32 pe_machine = 8;
     bool unknown_value_10 = 10;
 }
 
@@ -49,4 +56,6 @@ message Screen {
     int32 width = 1;
     int32 height = 2;
     int32 density = 3;
+    int32 unknown_value_4 = 4;
+    int32 unknown_value_5 = 5;
 }