From e5f136a16a9482d6ae4df65166a353e8ecd2f03f Mon Sep 17 00:00:00 2001
From: Jason Wray <jason@kulturny.com>
Date: Wed, 2 Dec 2015 17:36:09 -0500
Subject: [ios] fix CoreTelephony crash (by removing it) Fix #3112, ref #2581

---
 platform/ios/MGLMapboxEvents.m | 45 ------------------------------------------
 1 file changed, 45 deletions(-)

(limited to 'platform')

diff --git a/platform/ios/MGLMapboxEvents.m b/platform/ios/MGLMapboxEvents.m
index 239ac7ece2..7f8df61095 100644
--- a/platform/ios/MGLMapboxEvents.m
+++ b/platform/ios/MGLMapboxEvents.m
@@ -75,23 +75,6 @@ const NSTimeInterval MGLFlushInterval = 60;
         } else {
             _scale = [UIScreen mainScreen].scale;
         }
-
-#if !TARGET_OS_SIMULATOR
-        // Collect cellular carrier data if CoreTelephony is linked
-        Class MGLTelephony = NSClassFromString(@"CTTelephonyNetworkInfo");
-        if (MGLTelephony) {
-            id telephonyNetworkInfo = [[MGLTelephony alloc] init];
-            SEL subscriberCellularProviderSelector = NSSelectorFromString(@"subscriberCellularProvider");
-            id carrierVendor = [telephonyNetworkInfo performSelector:subscriberCellularProviderSelector];
-
-            // Guard against simulator, iPod Touch, etc.
-            if (carrierVendor) {
-                SEL carrierNameSelector = NSSelectorFromString(@"carrierName");
-                NSString *carrierName = [carrierVendor performSelector:carrierNameSelector];
-                _carrier = carrierName;
-            }
-        }
-#endif
     }
     return self;
 }
@@ -510,13 +493,6 @@ const NSTimeInterval MGLFlushInterval = 60;
         [evt setValue:@((int)(100 * [UIDevice currentDevice].batteryLevel)) forKey:@"batteryLevel"];
         [evt setValue:@(strongSelf.data.scale) forKey:@"resolution"];
 
-        if (strongSelf.data.carrier) {
-            [evt setValue:strongSelf.data.carrier forKey:@"carrier"];
-
-            NSString *cell = [strongSelf currentCellularNetworkConnectionType];
-            [evt setObject:(cell ? cell : [NSNull null]) forKey:@"cellularNetworkType"];
-        }
-
         MGLReachability *reachability = [MGLReachability reachabilityForLocalWiFi];
         [evt setValue:([reachability isReachableViaWiFi] ? @YES : @NO) forKey:@"wifi"];
         
@@ -725,27 +701,6 @@ const NSTimeInterval MGLFlushInterval = 60;
     return result;
 }
 
-// Can be called from any thread.
-//
-- (NSString *) currentCellularNetworkConnectionType {
-    NSString *radioTech;
-
-    Class CTTelephonyNetworkInfo = NSClassFromString(@"CTTelephonyNetworkInfo");
-    if (CTTelephonyNetworkInfo) {
-        id telephonyNetworkInfo = [[CTTelephonyNetworkInfo alloc] init];
-        SEL currentRadioAccessTechnologySelector = NSSelectorFromString(@"currentRadioAccessTechnology");
-        radioTech = ((id (*)(id, SEL))[telephonyNetworkInfo methodForSelector:currentRadioAccessTechnologySelector])(telephonyNetworkInfo, currentRadioAccessTechnologySelector);
-    }
-
-    if (radioTech == nil) {
-        return nil;
-    } else if ([radioTech hasPrefix:@"CTRadioAccessTechnology"]) {
-        return [radioTech substringFromIndex:23];
-    } else {
-        return @"Unknown";
-    }
-}
-
 // Can be called from any thread.
 //
 + (BOOL) checkPushEnabled {
-- 
cgit v1.2.1