tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ios] Fix for a crash on iPod Touch related to carrier vendor

Browse Source 
Reverts #2691, which only fixed simulator crashing.

Refs #2687
This commit is contained in:
Adam Hunter
2015-10-22 13:29:40 -07:00
committed by Jason Wray
parent ba4a2965c7
commit 45a8aa6a8f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platform/ios/MGLMapboxEvents.m
View File

@@ -76,7 +76,6 @@ const NSTimeInterval MGLFlushInterval = 60;
_scale = [UIScreen mainScreen].scale;
}
#if (!TARGET_IPHONE_SIMULATOR)
// Collect cellular carrier data if CoreTelephony is linked
Class CTTelephonyNetworkInfo = NSClassFromString(@"CTTelephonyNetworkInfo");
if (CTTelephonyNetworkInfo != NULL) {
@@ -85,11 +84,13 @@ const NSTimeInterval MGLFlushInterval = 60;
SEL subscriberCellularProviderSelector = NSSelectorFromString(@"subscriberCellularProvider");
id carrierVendor = ((id (*)(id, SEL))[telephonyNetworkInfo methodForSelector:subscriberCellularProviderSelector])(telephonyNetworkInfo, subscriberCellularProviderSelector);
SEL carrierNameSelector = NSSelectorFromString(@"carrierName");
NSString *carrierName = ((id (*)(id, SEL))[carrierVendor methodForSelector:carrierNameSelector])(carrierVendor, carrierNameSelector);
_carrier = carrierName;
// Guard against simulator, iPod Touch, etc.
if (carrierVendor) {
SEL carrierNameSelector = NSSelectorFromString(@"carrierName");
NSString *carrierName = ((id (*)(id, SEL))[carrierVendor methodForSelector:carrierNameSelector])(carrierVendor, carrierNameSelector);
_carrier = carrierName;
}
}
#endif
}
return self;
}