From f6129173022e9e707f8fe51602cc00bcbeea88e7 Mon Sep 17 00:00:00 2001 From: StanleyCocos Date: Fri, 12 Sep 2025 11:32:31 +0800 Subject: [PATCH 1/3] feat(device_info_plus): add mapping for new Apple social security devices --- .../device_info_plus/DeviceIdentifiers.m | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/DeviceIdentifiers.m b/packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/DeviceIdentifiers.m index c0c99bc866..24410df671 100644 --- a/packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/DeviceIdentifiers.m +++ b/packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/DeviceIdentifiers.m @@ -97,7 +97,15 @@ + (NSString *)userKnownDeviceModel:(NSString *)identifier { return @"iPhone 16 Pro Max"; } else if ([identifier isEqualToString:@"iPhone17,5"]) { return @"iPhone 16e"; - // iPads + } else if ([identifier isEqualToString:@"iPhone18,1"]) { + return @"iPhone 17 Pro"; + } else if ([identifier isEqualToString:@"iPhone18,2"]) { + return @"iPhone 17 Pro Max"; + } else if ([identifier isEqualToString:@"iPhone18,3"]) { + return @"iPhone 17"; + } else if ([identifier isEqualToString:@"iPhone18,4"]) { + return @"iPhone Air"; + // iPads } else if ([identifier isEqualToString:@"iPad4,1"] || [identifier isEqualToString:@"iPad4,2"] || [identifier isEqualToString:@"iPad4,3"]) { @@ -165,15 +173,21 @@ + (NSString *)userKnownDeviceModel:(NSString *)identifier { } else if ([identifier isEqualToString:@"iPad6,7"] || [identifier isEqualToString:@"iPad6,8"]) { return @"iPad Pro 12-Inch"; - } else if ([identifier isEqualToString:@"iPad7,1"] || [identifier isEqualToString:@"iPad7,2"]) { + } else if ([identifier isEqualToString:@"iPad7,1"] || + [identifier isEqualToString:@"iPad7,2"]) { return @"iPad Pro 12-Inch 2"; - } else if ([identifier isEqualToString:@"iPad7,3"] || [identifier isEqualToString:@"iPad7,4"]) { + } else if ([identifier isEqualToString:@"iPad7,3"] || + [identifier isEqualToString:@"iPad7,4"]) { return @"iPad Pro 10-Inch"; - } else if ([identifier isEqualToString:@"iPad8,1"] || [identifier isEqualToString:@"iPad8,2"] || - [identifier isEqualToString:@"iPad8,3"] || [identifier isEqualToString:@"iPad8,4"]) { + } else if ([identifier isEqualToString:@"iPad8,1"] || + [identifier isEqualToString:@"iPad8,2"] || + [identifier isEqualToString:@"iPad8,3"] || + [identifier isEqualToString:@"iPad8,4"]) { return @"iPad Pro 11-Inch"; - } else if ([identifier isEqualToString:@"iPad8,5"] || [identifier isEqualToString:@"iPad8,6"] || - [identifier isEqualToString:@"iPad8,7"] || [identifier isEqualToString:@"iPad8,8"]) { + } else if ([identifier isEqualToString:@"iPad8,5"] || + [identifier isEqualToString:@"iPad8,6"] || + [identifier isEqualToString:@"iPad8,7"] || + [identifier isEqualToString:@"iPad8,8"]) { return @"iPad Pro 12-Inch 3"; } else if ([identifier isEqualToString:@"iPad8,9"] || [identifier isEqualToString:@"iPad8,10"]) { From 15afe30626a52dba2b62e0ca1f9d099e908c1c76 Mon Sep 17 00:00:00 2001 From: StanleyCocos Date: Fri, 12 Sep 2025 11:33:40 +0800 Subject: [PATCH 2/3] feat(device_info_plus): add mapping for new Apple social security devices --- .../Sources/device_info_plus/DeviceIdentifiers.m | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/DeviceIdentifiers.m b/packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/DeviceIdentifiers.m index 24410df671..6754600d06 100644 --- a/packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/DeviceIdentifiers.m +++ b/packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/DeviceIdentifiers.m @@ -97,13 +97,13 @@ + (NSString *)userKnownDeviceModel:(NSString *)identifier { return @"iPhone 16 Pro Max"; } else if ([identifier isEqualToString:@"iPhone17,5"]) { return @"iPhone 16e"; - } else if ([identifier isEqualToString:@"iPhone18,1"]) { + } else if ([identifier isEqualToString:@"iPhone18,3"]) { + return @"iPhone 17"; + } else if ([identifier isEqualToString:@"iPhone18,1"]) { return @"iPhone 17 Pro"; } else if ([identifier isEqualToString:@"iPhone18,2"]) { return @"iPhone 17 Pro Max"; - } else if ([identifier isEqualToString:@"iPhone18,3"]) { - return @"iPhone 17"; - } else if ([identifier isEqualToString:@"iPhone18,4"]) { + } else if ([identifier isEqualToString:@"iPhone18,4"]) { return @"iPhone Air"; // iPads } else if ([identifier isEqualToString:@"iPad4,1"] || From 9f0bab70a88edef5de1b752409649635aa297691 Mon Sep 17 00:00:00 2001 From: StanleyCocos Date: Fri, 12 Sep 2025 11:35:19 +0800 Subject: [PATCH 3/3] feat(device_info_plus): add mapping for new Apple social security devices --- .../Sources/device_info_plus/DeviceIdentifiers.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/DeviceIdentifiers.m b/packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/DeviceIdentifiers.m index 6754600d06..c644f82b4b 100644 --- a/packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/DeviceIdentifiers.m +++ b/packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/DeviceIdentifiers.m @@ -98,12 +98,12 @@ + (NSString *)userKnownDeviceModel:(NSString *)identifier { } else if ([identifier isEqualToString:@"iPhone17,5"]) { return @"iPhone 16e"; } else if ([identifier isEqualToString:@"iPhone18,3"]) { - return @"iPhone 17"; - } else if ([identifier isEqualToString:@"iPhone18,1"]) { + return @"iPhone 17"; + } else if ([identifier isEqualToString:@"iPhone18,1"]) { return @"iPhone 17 Pro"; } else if ([identifier isEqualToString:@"iPhone18,2"]) { return @"iPhone 17 Pro Max"; - } else if ([identifier isEqualToString:@"iPhone18,4"]) { + } else if ([identifier isEqualToString:@"iPhone18,4"]) { return @"iPhone Air"; // iPads } else if ([identifier isEqualToString:@"iPad4,1"] ||