fix: wrong carrier info with deprecated method (#400)

* fix: wrong carrier info with deprecated method * exit for loop early once a carrier is found * avoid re-init CTTelephonyNetworkInfo instance if exist
amplitude · Jun 15, 2022 · 2af05da · 2af05da
1 parent 55ee555
commit 2af05da
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 19 deletions.
diff --git a/Sources/Amplitude/AMPDeviceInfo.m b/Sources/Amplitude/AMPDeviceInfo.m
@@ -101,27 +101,49 @@ - (NSString *)model {
 }
 
 - (NSString *)carrier {
+    // unable to fetch carrier information
     if (!_carrier) {
-        Class CTTelephonyNetworkInfo = NSClassFromString(@"CTTelephonyNetworkInfo");
-        SEL subscriberCellularProvider = NSSelectorFromString(@"subscriberCellularProvider");
-        SEL carrierName = NSSelectorFromString(@"carrierName");
-        if (CTTelephonyNetworkInfo && subscriberCellularProvider && carrierName) {
-            networkInfo = [[NSClassFromString(@"CTTelephonyNetworkInfo") alloc] init];
-            id carrier = nil;
-            id (*imp1)(id, SEL) = (id (*)(id, SEL))[networkInfo methodForSelector:subscriberCellularProvider];
-            if (imp1) {
-                carrier = imp1(networkInfo, subscriberCellularProvider);
-            }
-            NSString *(*imp2)(id, SEL) = (NSString *(*)(id, SEL))[carrier methodForSelector:carrierName];
-            if (imp2) {
-                _carrier = imp2(carrier, carrierName);
+        _carrier = @"Unknown";
+    }
+
+    Class CTTelephonyNetworkInfo = NSClassFromString(@"CTTelephonyNetworkInfo");
+    if (!CTTelephonyNetworkInfo) {
+        return _carrier;
+    }
+    if (networkInfo == nil) {
+        networkInfo = [[CTTelephonyNetworkInfo alloc] init];
+    }
+    id carrier = nil;
+    SEL carrierName = NSSelectorFromString(@"carrierName");
+
+    // subscriberCellularProvider is deprecated after iOS 12.0
+    if (@available(iOS 12, *)) {
+        SEL serviceSubscriberCellularProviders = NSSelectorFromString(@"serviceSubscriberCellularProviders");
+        id carrierMap = nil;
+        id (*imp1)(id, SEL) = (id (*)(id, SEL))[networkInfo methodForSelector:serviceSubscriberCellularProviders];
+        if (imp1) {
+            carrierMap = imp1(networkInfo, serviceSubscriberCellularProviders);
+        }
+        SEL mobileNetworkCode = NSSelectorFromString(@"mobileNetworkCode");
+        for (NSString* key in carrierMap){
+            NSString *(*getMobileNetworkCode)(id, SEL) = (NSString *(*)(id, SEL))[carrierMap[key] methodForSelector:mobileNetworkCode];
+            if (getMobileNetworkCode && getMobileNetworkCode(carrierMap[key], mobileNetworkCode) != nil){
+                carrier = carrierMap[key];
+                // exit early as we found a carrier here
+                break;
             }
         }
-        // unable to fetch carrier information
-        if (!_carrier) {
-            _carrier = @"Unknown";
+    } else {
+        SEL subscriberCellularProvider = NSSelectorFromString(@"subscriberCellularProvider");
+        id (*imp1)(id, SEL) = (id (*)(id, SEL))[networkInfo methodForSelector:subscriberCellularProvider];
+        if (imp1) {
+            carrier = imp1(networkInfo, subscriberCellularProvider);
         }
     }
+    NSString *(*imp2)(id, SEL) = (NSString *(*)(id, SEL))[carrier methodForSelector:carrierName];
+    if (imp2) {
+        _carrier = imp2(carrier, carrierName);
+    }
     return _carrier;
 }
 

diff --git a/Tests/DeviceInfoTests.m b/Tests/DeviceInfoTests.m
@@ -70,10 +70,12 @@ - (void)testManufacturer {
 }
 
 - (void)testModel {
-#if !TARGET_OS_OSX
-    XCTAssertEqualObjects(@"Simulator", _deviceInfo.model);
-#else
+#if TARGET_OS_OSX && TARGET_CPU_X86_64
     XCTAssertTrue([_deviceInfo.model containsString:@"Mac"]);
+#elif TARGET_CPU_ARM64
+    XCTAssertTrue([_deviceInfo.model containsString:@"arm64"]);
+#else
+    XCTAssertEqualObjects(@"Simulator", _deviceInfo.model);
 #endif
 }
 
@@ -101,4 +103,8 @@ - (void)testGenerateUUID {
     XCTAssertNotEqual(a, b);
 }
 
+- (void)testCarrier {
+    XCTAssertEqualObjects(_deviceInfo.carrier, @"Unknown");
+}
+
 @end