feat: handled retrieving carrier names as per different iOS versions

rudderlabs · May 9, 2023 · a81e3a2 · a81e3a2
1 parent 11cd359
commit a81e3a2
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 20 deletions.
diff --git a/Sources/Classes/Headers/Public/RSNetwork.h b/Sources/Classes/Headers/Public/RSNetwork.h
@@ -13,13 +13,13 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RSNetwork : NSObject
-- (instancetype) initWithDict:(NSDictionary*) dict;
-- (NSDictionary<NSString* , NSObject *>*) dict;
+- (instancetype)initWithDict:(NSDictionary *)dict;
+- (NSDictionary<NSString *, NSObject *> *)dict;
 
-@property (nonatomic, readwrite) NSString* carrier;
-@property (nonatomic, readwrite) bool wifi;
-@property (nonatomic, readwrite) bool isNetworkReachable;
-@property (nonatomic, readwrite) bool cellular;
+@property(nonatomic, strong) NSMutableArray<NSString *> *carrier;
+@property(nonatomic, readwrite) bool wifi;
+@property(nonatomic, readwrite) bool isNetworkReachable;
+@property(nonatomic, readwrite) bool cellular;
 
 @end
 

diff --git a/Sources/Classes/RSNetwork.m b/Sources/Classes/RSNetwork.m
@@ -7,7 +7,8 @@
 //
 
 #import "RSNetwork.h"
-
+#import "RSLogger.h"
+#import "RSUtils.h"
 #if !TARGET_OS_TV && !TARGET_OS_WATCH
 #import <CoreTelephony/CTTelephonyNetworkInfo.h>
 #import <CoreTelephony/CTCarrier.h>
@@ -19,12 +20,35 @@ - (instancetype)init
 {
     self = [super init];
     if (self) {
+        _carrier = [[NSMutableArray alloc] init];
 #if !TARGET_OS_TV && !TARGET_OS_WATCH
-        NSString *carrierName = [[[[CTTelephonyNetworkInfo alloc] init] subscriberCellularProvider]carrierName];
-        if (carrierName == nil) {
-            carrierName = @"unavailable";
+        CTTelephonyNetworkInfo *networkInfo = [[CTTelephonyNetworkInfo alloc] init];
+        if(@available(iOS 16.0, *)) {
+            [RSLogger logWarn:@"RSNetwork: init: cannot retrieve carrier names on iOS 16 and above as CTCarrier is deprecated"];
+        }
+        else if (@available(iOS 12.0, *)) {
+            NSDictionary *serviceProviders = [networkInfo serviceSubscriberCellularProviders];
+            for (NSString *rat in serviceProviders) {
+                CTCarrier *carrier = [serviceProviders objectForKey:rat];
+                if(carrier == nil) {
+                    continue;
+                }
+                NSString *carrierName = [carrier carrierName];
+                if (carrierName && ![carrierName isEqualToString:@"--"]) {
+                    [_carrier addObject:carrierName];
+                }
+            }
+        } else {
+            CTCarrier *carrier = [networkInfo subscriberCellularProvider];
+            NSString *carrierName = [carrier carrierName];
+            if (carrierName) {
+                [_carrier addObject:carrierName];
+            }
+        }
+
+        if(_carrier.count == 0) {
+            [RSLogger logWarn:@"RSNetwork: init: unable to retrieve carrier name"];
         }
-        _carrier = carrierName;
 #endif
 #if !TARGET_OS_WATCH
         SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithName(NULL, "8.8.8.8");
@@ -60,7 +84,9 @@ - (instancetype) initWithDict:(NSDictionary*) dict {
     NSMutableDictionary *tempDict;
     @synchronized (tempDict) {
         tempDict = [[NSMutableDictionary alloc] init];
-        [tempDict setValue:_carrier forKey:@"carrier"];
+        if(_carrier.count !=0) {
+            [tempDict setValue:[RSUtils getCSVString:_carrier] forKey:@"carrier"];
+        }
 #if !TARGET_OS_WATCH
         if(_isNetworkReachable) {
             [tempDict setValue:[NSNumber numberWithBool:_wifi] forKey:@"wifi"];

diff --git a/Sources/Classes/RSUtils.m b/Sources/Classes/RSUtils.m
@@ -128,14 +128,7 @@ + (NSArray*) serializeArray:(NSArray*) array {
 }
 
 +(NSString*) getCSVString:(NSArray*) inputStrings {
-    NSMutableString *CSVString = [[NSMutableString alloc] init];
-    for (int index = 0; index < inputStrings.count; index++) {
-        [CSVString appendString:inputStrings[index]];
-        if (index != inputStrings.count -1) {
-            [CSVString appendString:@","];
-        }
-    }
-    return [CSVString copy];
+    return [inputStrings componentsJoinedByString:@","];
 }
 
 +(NSString*) getJSONCSVString:(NSArray*) inputStrings {

diff --git a/Tests/RudderUtilsTest.swift b/Tests/RudderUtilsTest.swift
@@ -23,6 +23,11 @@ class RudderUtilsTest: XCTestCase {
         let bioCSV = RSUtils.getCSVString(bio)
         print(bioCSV)
         XCTAssert(bioCSV == "Desu,Mobile Engineer,RudderStack")
+        let carriers:[String] = ["Airtel"]
+        let carriersCSV = RSUtils.getCSVString(carriers)
+        print(carriersCSV)
+        XCTAssertEqual(carriersCSV, "Airtel")
+
     }
 
     func testGetJSONCSVString() throws {