Added locks to lastLocation to prevent race conditions

Author: jkasten2

iOS_SDK/OneSignalDevApp/OneSignalDevApp.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		03432CDC1EBD426A0071FC48 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03432CDB1EBD426A0071FC48 /* CoreLocation.framework */; };
 		9112E8871E724C320022A1CB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 9112E8861E724C320022A1CB /* main.m */; };
 		9112E88A1E724C320022A1CB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9112E8891E724C320022A1CB /* AppDelegate.m */; };
 		9112E88D1E724C320022A1CB /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9112E88C1E724C320022A1CB /* ViewController.m */; };
@@ -50,6 +51,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		03432CDB1EBD426A0071FC48 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
 		9112E8821E724C320022A1CB /* OneSignalDevApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OneSignalDevApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		9112E8861E724C320022A1CB /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		9112E8881E724C320022A1CB /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -78,6 +80,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				03432CDC1EBD426A0071FC48 /* CoreLocation.framework in Frameworks */,
 				9112E8A71E724EE00022A1CB /* SystemConfiguration.framework in Frameworks */,
 				9112E8A51E724ECC0022A1CB /* libOneSignal.a in Frameworks */,
 			);
@@ -145,6 +148,7 @@
 		9112E8A21E724DCA0022A1CB /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				03432CDB1EBD426A0071FC48 /* CoreLocation.framework */,
 				91B6EA051E83215000B5CF01 /* UserNotifications.framework */,
 				9150E7821E73BFB600C5D46A /* UIKit.framework */,
 				9150E77F1E73BF5B00C5D46A /* OneSignal.framework */,

iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m

@@ -49,8 +49,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [OneSignal initWithLaunchOptions:launchOptions
                                appId:@"b2f7f966-d8cc-11e4-bed1-df8f05be55ba"
             handleNotificationAction:openNotificationHandler
-                            settings:@{kOSSettingsKeyAutoPrompt: @false}];
+                            settings:@{kOSSettingsKeyAutoPrompt: @false,
+                                       kOSSettingsKeyInAppLaunchURL: @false}];
 
+    [OneSignal promptLocation];
     [OneSignal sendTag:@"someKey1122" value:@"03222017"];
 
     [OneSignal addPermissionObserver:self];

iOS_SDK/OneSignalDevApp/OneSignalDevApp/Info.plist

@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>Test Location2</string>
+	<key>NSLocationUsageDescription</key>
+	<string>Test Location</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -45,10 +49,10 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-    <key>NSAppTransportSecurity</key>
-    <dict>
-        <key>NSAllowsArbitraryLoads</key>
-        <true/>
-    </dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 </dict>
 </plist>

iOS_SDK/OneSignalSDK/Source/OneSignalLocation.m

@@ -61,6 +61,14 @@ @implementation OneSignalLocation
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wundeclared-selector"
 
+
+NSObject *_mutexObjectForLastLocation;
++(NSObject*)mutexObjectForLastLocation {
+    if (!_mutexObjectForLastLocation)
+        _mutexObjectForLastLocation = [NSObject alloc];
+    return _mutexObjectForLastLocation;
+}
+
 static OneSignalLocation* singleInstance = nil;
 +(OneSignalLocation*) sharedInstance {
     @synchronized( singleInstance ) {
@@ -76,7 +84,9 @@ + (os_last_location*)lastLocation {
     return lastLocation;
 }
 + (void)clearLastLocation {
-    lastLocation = nil;
+    @synchronized(OneSignalLocation.mutexObjectForLastLocation) {
+       lastLocation = nil;
+    }
 }
 
 + (void) getLocation:(bool)prompt {
@@ -212,7 +222,9 @@ - (void)locationManager:(id)manager didUpdateLocations:(NSArray *)locations {
     currentLocation->horizontalAccuracy = [[location valueForKey:@"horizontalAccuracy"] doubleValue];
     currentLocation->cords = cords;
 
-    lastLocation = currentLocation;
+    @synchronized(OneSignalLocation.mutexObjectForLastLocation) {
+        lastLocation = currentLocation;
+    }
 
     if(!sendLocationTimer)
         [OneSignalLocation resetSendTimer];
@@ -227,11 +239,12 @@ + (void)resetSendTimer {
     sendLocationTimer = [NSTimer scheduledTimerWithTimeInterval:requiredWaitTime target:self selector:@selector(sendLocation) userInfo:nil repeats:NO];
 }
 
-+ (void) sendLocation {
++ (void)sendLocation {
+    @synchronized(OneSignalLocation.mutexObjectForLastLocation) {
     if (!lastLocation || ![OneSignal mUserId]) return;
 
     //Fired from timer and not initial location fetched
-    if(initialLocationSent)
+    if (initialLocationSent)
         [OneSignalLocation resetSendTimer];
 
     initialLocationSent = YES;
@@ -256,6 +269,7 @@ + (void) sendLocation {
     [OneSignalHelper enqueueRequest:request
                           onSuccess:nil
                           onFailure:nil];
+    }
 }