Merge pull request #11 from mapbox/move-background-guard

Move background modes guard to location manager wrapper
mapbox · Sep 28, 2017 · f0ccdb7 · f0ccdb7
2 parents 533b32c + 7eb5cd2
commit f0ccdb7
Show file tree

Hide file tree

Showing 5 changed files with 145 additions and 66 deletions.
diff --git a/MapboxMobileEvents/MMECLLocationManagerWrapper.h b/MapboxMobileEvents/MMECLLocationManagerWrapper.h
@@ -11,6 +11,7 @@
 @property (nonatomic) CLLocationAccuracy desiredAccuracy;
 @property (nonatomic) CLLocationDistance distanceFilter;
 @property (nonatomic, copy, readonly) NSSet<__kindof CLRegion *> *monitoredRegions;
+@property (nonatomic) BOOL hostAppHasBackgroundCapability;
 
 - (CLAuthorizationStatus)authorizationStatus;
 - (void)startUpdatingLocation;

diff --git a/MapboxMobileEvents/MMECLLocationManagerWrapper.m b/MapboxMobileEvents/MMECLLocationManagerWrapper.m
@@ -8,11 +8,15 @@ @interface MMECLLocationManagerWrapper ()
 
 @implementation MMECLLocationManagerWrapper
 
+@synthesize hostAppHasBackgroundCapability;
+
 - (instancetype)init {
     self = [super init];
     if (self) {
         _locationManager = [[CLLocationManager alloc] init];
         _locationManager.delegate = self;
+        NSArray *backgroundModes = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UIBackgroundModes"];
+        self.hostAppHasBackgroundCapability = [backgroundModes containsObject:@"location"];
     }
     return self;
 }
@@ -46,14 +50,15 @@ - (void)stopMonitoringForRegion:(CLRegion *)region {
 }
 
 - (void)setAllowsBackgroundLocationUpdates:(BOOL)allowsBackgroundLocationUpdates {
-    if ([self.locationManager respondsToSelector:@selector(allowsBackgroundLocationUpdates)]) {
+    if ([self.locationManager respondsToSelector:@selector(allowsBackgroundLocationUpdates)]
+        && self.hostAppHasBackgroundCapability) {
         self.locationManager.allowsBackgroundLocationUpdates = allowsBackgroundLocationUpdates;
     }
 }
 
 - (BOOL)allowsBackgroundLocationUpdates {
     if ([self.locationManager respondsToSelector:@selector(allowsBackgroundLocationUpdates)]) {
-        return self.locationManager.allowsBackgroundLocationUpdates;
+        return !self.hostAppHasBackgroundCapability ? NO : self.locationManager.allowsBackgroundLocationUpdates;
     }
     return NO;
 }

diff --git a/MapboxMobileEvents/MMELocationManager.m b/MapboxMobileEvents/MMELocationManager.m
@@ -14,7 +14,6 @@ @interface MMELocationManager ()
 
 @property (nonatomic) id<MMEUIApplicationWrapper> application;
 @property (nonatomic) id<MMECLLocationManagerWrapper> locationManager;
-@property (nonatomic) BOOL hostAppHasBackgroundCapability;
 @property (nonatomic, getter=isUpdatingLocation, readwrite) BOOL updatingLocation;
 @property (nonatomic) NSDate *backgroundLocationServiceTimeoutAllowedDate;
 @property (nonatomic) NSTimer *backgroundLocationServiceTimeoutTimer;
@@ -26,9 +25,7 @@ @implementation MMELocationManager
 - (instancetype)init {
     self = [super init];
     if (self) {
-        NSArray *backgroundModes = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UIBackgroundModes"];
-        _hostAppHasBackgroundCapability = [backgroundModes containsObject:@"location"];
-        _application = [[MMEUIApplicationWrapper alloc] init];
+        _application = [[MMEUIApplicationWrapper alloc] init];        
     }
     return self;
 }
@@ -89,7 +86,7 @@ - (void)startLocationServices {
 
         // If the host app can run in the background with `always` location permissions then allow background
         // updates and start the significant location change service and background timeout timer
-        if (self.hostAppHasBackgroundCapability && authorizedAlways) {
+        if (authorizedAlways && self.locationManager.hostAppHasBackgroundCapability) {
             [self.locationManager startMonitoringSignificantLocationChanges];
             [self startBackgroundTimeoutTimer];
             self.locationManager.allowsBackgroundLocationUpdates = YES;

diff --git a/MapboxMobileEventsTests/MMECLLocationManagerWrapperFake.m b/MapboxMobileEventsTests/MMECLLocationManagerWrapperFake.m
@@ -6,6 +6,7 @@ @implementation MMECLLocationManagerWrapperFake
 @synthesize desiredAccuracy;
 @synthesize distanceFilter;
 @synthesize monitoredRegions;
+@synthesize hostAppHasBackgroundCapability;
 
 - (CLAuthorizationStatus)authorizationStatus {
     return self.stub_authorizationStatus;