Use staging server in simulator

platform/ios/CHANGELOG.md

@@ -11,6 +11,7 @@ Mapbox welcomes participation and contributions from everyone.  If you’d like
 - Fixed an issue preventing KVO change notifications from being generated on MGLMapView’s `userTrackingMode` key path when `-setUserTrackingMode:animated:` is called. ([#4724](https://github.com/mapbox/mapbox-gl-native/pull/4724))
 - Added a `-reloadStyle:` action to MGLMapView to force a reload of the current style. ([#4728](https://github.com/mapbox/mapbox-gl-native/pull/4728))
 - A more specific user agent string is now sent with style and tile requests. ([#4012](https://github.com/mapbox/mapbox-gl-native/pull/4012))
+- Mapbox Telemetry is automatically disabled while the host application is running in the iOS Simulator. ([#4726](https://github.com/mapbox/mapbox-gl-native/pull/4726))
 - Removed unused SVG files from the SDK’s resource bundle. ([#4641](https://github.com/mapbox/mapbox-gl-native/pull/4641))
 - Deprecated `-[MGLMapView emptyMemoryCache]`. ([#4725](https://github.com/mapbox/mapbox-gl-native/pull/4725))
 

platform/ios/app/Info.plist

@@ -24,17 +24,6 @@
 	<string>7877</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSExceptionDomains</key>
-		<dict>
-			<key>cloudfront-staging.tilestream.net</key>
-			<dict>
-				<key>NSExceptionRequiresForwardSecrecy</key>
-				<false/>
-			</dict>
-		</dict>
-	</dict>
 	<key>NSHumanReadableCopyright</key>
 	<string>© 2014–2016 Mapbox</string>
 	<key>NSLocationAlwaysUsageDescription</key>

platform/ios/app/MBXViewController.m

@@ -42,7 +42,6 @@ + (void)initialize
             @"MBXUserTrackingMode": @(MGLUserTrackingModeNone),
             @"MBXShowsUserLocation": @NO,
             @"MBXDebug": @NO,
-            @"MGLTelemetryTestServerURL": @"https://cloudfront-staging.tilestream.net",
         }];
     }
 }

platform/ios/src/MGLMapboxEvents.m

@@ -145,8 +145,12 @@ + (void)initialize {
 }
 
 + (BOOL)isEnabled {
+#if TARGET_OS_SIMULATOR
+    return NO;
+#else
     return ([[NSUserDefaults standardUserDefaults] boolForKey:@"MGLMapboxMetricsEnabled"] &&
             [[NSUserDefaults standardUserDefaults] integerForKey:@"MGLMapboxAccountType"] == 0);
+#endif
 }
 
 - (BOOL)debugLoggingEnabled {
@@ -360,7 +364,7 @@ - (void)pushEvent:(NSString *)event withAttributes:(MGLMapboxEventAttributes *)a
         [self pushTurnstileEvent];
     }
 
-    if ([self isPaused]) {
+    if (self.paused) {
         return;
     }
 
@@ -450,7 +454,7 @@ - (MGLMapboxEventAttributes *)eventForAttributes:(MGLMutableMapboxEventAttribute
 // Called implicitly from public use of +flush.
 //
 - (void)postEvents:(NS_ARRAY_OF(MGLMapboxEventAttributes *) *)events {
-    if ([self isPaused]) {
+    if (self.paused) {
         return;
     }
 

platform/ios/uitest/App-Info.plist

@@ -28,8 +28,6 @@
 	<string>pk.eyJ1IjoianVzdGluIiwiYSI6Ik9RX3RRQzAifQ.dmOg_BAp1ywuDZMM7YsXRg</string>
 	<key>MGLMapboxMetricsEnabledSettingShownInApp</key>
 	<true/>
-	<key>MGLMetricsTestServerURL</key>
-	<string>https://cloudfront-staging.tilestream.net</string>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>Strictly for testing purposes, promise!</string>
 	<key>UILaunchStoryboardName</key>