Privatized MGLMapboxEvents

`-pauseMetricsCollection` and `-resumeMetricsCollection` were originally introduced to mitigate concerns around battery usage, but `MGLMapboxEvents` has since evolved to tread much lighter on the battery. There’s no longer any need for the client to call these methods directly. The iOS test project now includes MGLMapboxEvents.h explicitly to avoid having to package a header that will go unused.

9 files changed, 10 insertions, 42 deletions

diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi
index 0e200f5e1d..0034831a91 100644
--- a/gyp/platform-ios.gypi
+++ b/gyp/platform-ios.gypi
@@ -18,8 +18,7 @@
         '../platform/darwin/nsthread.mm',
         '../platform/darwin/reachability.m',
         '../include/mbgl/ios/MapboxGL.h',
-        '../include/mbgl/ios/MGLMapboxEvents.h',
-        '../platform/ios/MGLMapboxEvents_Private.h',
+        '../platform/ios/MGLMapboxEvents.h',
         '../platform/ios/MGLMapboxEvents.m',
         '../include/mbgl/ios/MGLMapView.h',
         '../include/mbgl/ios/MGLMapView+IBAdditions.h',
diff --git a/ios/app/MBXAppDelegate.m b/ios/app/MBXAppDelegate.m
index ce699ce694..dc04105083 100644
--- a/ios/app/MBXAppDelegate.m
+++ b/ios/app/MBXAppDelegate.m
@@ -1,8 +1,6 @@
 #import "MBXAppDelegate.h"
 #import "MBXViewController.h"
 #import <mbgl/ios/MapboxGL.h>
-#import <mbgl/ios/MGLAccountManager.h>
-#import <mbgl/ios/MGLMapboxEvents.h>
 
 @implementation MBXAppDelegate
 
@@ -34,26 +32,4 @@
     return YES;
 }
 
-/**
-- (void)applicationWillEnterForeground:(UIApplication *)application
-{
-    // Example of how to resume Metrics Collection
-    
-    // Reasons for needing to resume:
-    // 1. In UIBackground and app starts listening for Location Updates where it previously had not been listening.
-    // 2. App is entering foreground where it had called pauseMetricsCollection.
-    [MGLMapboxEvents resumeMetricsCollection];
-}
-
-- (void)applicationDidEnterBackground:(UIApplication *)application
-{
-    // Example of how to pause Metrics Collection
-    
-    // Reason for needing to pause:
-    // 1. Either entering or already in UIBackground and app stops listening for Location Updates
-    // via any CLLocationManager instance it may have.
-    [MGLMapboxEvents pauseMetricsCollection];
-}
-*/
-
 @end
diff --git a/platform/ios/MGLAccountManager.m b/platform/ios/MGLAccountManager.m
index 2e3c0a38e4..a49433777d 100644
--- a/platform/ios/MGLAccountManager.m
+++ b/platform/ios/MGLAccountManager.m
@@ -1,7 +1,7 @@
 #import <Foundation/Foundation.h>
 
 #import "MGLAccountManager.h"
-#import "MGLMapboxEvents_Private.h"
+#import "MGLMapboxEvents.h"
 #import "NSProcessInfo+MGLAdditions.h"
 
 @interface MGLAccountManager()
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm
index dfbb034398..72a2ed0d62 100644
--- a/platform/ios/MGLMapView.mm
+++ b/platform/ios/MGLMapView.mm
@@ -15,22 +15,19 @@
 #include <mbgl/util/geo.hpp>
 #include <mbgl/util/constants.hpp>
 
-#import "MGLTypes.h"
+#import "MapboxGL.h"
+
 #import "NSBundle+MGLAdditions.h"
 #import "NSString+MGLAdditions.h"
 #import "NSProcessInfo+MGLAdditions.h"
 #import "NSException+MGLAdditions.h"
-#import "MGLAccountManager.h"
-#import "MGLAnnotation.h"
 #import "MGLUserLocationAnnotationView.h"
 #import "MGLUserLocation_Private.h"
 #import "MGLFileCache.h"
+#import "MGLMapboxEvents.h"
 
 #import "SMCalloutView.h"
 
-#import "MGLMapboxEvents.h"
-#import "MapboxGL.h"
-
 #import <algorithm>
 
 class MBGLView;
diff --git a/include/mbgl/ios/MGLMapboxEvents.h b/platform/ios/MGLMapboxEvents.h
index 5c5d8a924c..94aa8be783 100644
--- a/include/mbgl/ios/MGLMapboxEvents.h
+++ b/platform/ios/MGLMapboxEvents.h
@@ -30,6 +30,8 @@ extern NSString *const MGLEventGestureRotateStart;
 
 @interface MGLMapboxEvents : NSObject <NSURLSessionDelegate>
 
++ (instancetype)sharedManager;
+
 // You must call these methods from the main thread.
 //
 + (void) pauseMetricsCollection;
diff --git a/platform/ios/MGLMapboxEvents.m b/platform/ios/MGLMapboxEvents.m
index 2b9d887777..5663e3f1c0 100644
--- a/platform/ios/MGLMapboxEvents.m
+++ b/platform/ios/MGLMapboxEvents.m
@@ -1,4 +1,4 @@
-#import "MGLMapboxEvents_Private.h"
+#import "MGLMapboxEvents.h"
 
 #import <UIKit/UIKit.h>
 #import <SystemConfiguration/CaptiveNetwork.h>
diff --git a/platform/ios/MGLMapboxEvents_Private.h b/platform/ios/MGLMapboxEvents_Private.h
deleted file mode 100644
index 6a48b31f04..0000000000
--- a/platform/ios/MGLMapboxEvents_Private.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#import "MGLMapboxEvents.h"
-
-@interface MGLMapboxEvents (Private)
-
-+ (instancetype)sharedManager;
-
-@end
diff --git a/test/ios/MetricsTests.m b/test/ios/MetricsTests.m
index 179e7a1acb..5b1a7956ea 100644
--- a/test/ios/MetricsTests.m
+++ b/test/ios/MetricsTests.m
@@ -10,7 +10,6 @@
 
 @interface MGLMapboxEvents (Testing)
 
-+ (instancetype)sharedManager;
 - (NSString *)appBundleId;
 - (NSString *)token;
 - (BOOL)isPaused;
diff --git a/test/ios/ios-tests.xcodeproj/project.pbxproj b/test/ios/ios-tests.xcodeproj/project.pbxproj
index 50e12595f7..4f31a5b4a4 100644
--- a/test/ios/ios-tests.xcodeproj/project.pbxproj
+++ b/test/ios/ios-tests.xcodeproj/project.pbxproj
@@ -81,6 +81,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		DACAD7111B08719F009119DC /* MGLMapboxEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MGLMapboxEvents.h; path = ../../platform/ios/MGLMapboxEvents.h; sourceTree = SOURCE_ROOT; };
 		DD043323196DB9BC00E6F39D /* Mapbox GL Tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Mapbox GL Tests.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		DD04335F196DBBD500E6F39D /* MGLTAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLTAppDelegate.m; sourceTree = SOURCE_ROOT; };
 		DD043360196DBBD500E6F39D /* MGLTViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLTViewController.m; sourceTree = SOURCE_ROOT; };
@@ -270,6 +271,7 @@
 			isa = PBXGroup;
 			children = (
 				DD0581031ACB661200B112C9 /* Headers */,
+				DACAD7111B08719F009119DC /* MGLMapboxEvents.h */,
 				DD0581071ACB663200B112C9 /* libMapboxGL.a */,
 				DD0581051ACB661C00B112C9 /* MapboxGL.bundle */,
 			);