Merge pull request #979 from OneSignal/fix/register_user_thread_safe

Register User Thread Safety Improvement - For 2.x.x branch

Author: jkasten2

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -1610,12 +1610,6 @@ + (void)registerUserAfterDelay {
     [OneSignalHelper performSelector:@selector(registerUser) onMainThreadOnObject:self withObject:nil afterDelay:reattemptRegistrationInterval];
 }
 
-static dispatch_queue_t serialQueue;
-
-+ (dispatch_queue_t) getRegisterQueue {
-    return serialQueue;
-}
-
 + (void)registerUser {
     // return if the user has not granted privacy permissions
     if ([self shouldLogMissingPrivacyConsentErrorWithMethodName:nil])
@@ -1631,13 +1625,12 @@ + (void)registerUser {
 
 +(void)registerUserNow {
     [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"registerUserNow"];
-
-    if (!serialQueue)
-        serialQueue = dispatch_queue_create("com.onesignal.regiseruser", DISPATCH_QUEUE_SERIAL);
 
-    dispatch_async(serialQueue, ^{
+    // Run on the main queue as it is possible for this to be called from multiple queues.
+    // Also some of the code in the method is not thread safe such as _outcomeEventsController.
+    [OneSignalHelper dispatch_async_on_main_queue:^{
         [self registerUserInternal];
-     });
+    }];
 }
 
 // We should delay registration if we are waiting on APNS

iOS_SDK/OneSignalSDK/UnitTests/UnitTestCommonMethods.h

@@ -62,7 +62,6 @@ NSString * serverUrlWithPath(NSString *path);
 
 // Expose OneSignal test methods
 @interface OneSignal (UN_extra)
-+ (dispatch_queue_t) getRegisterQueue;
 + (void)setDelayIntervals:(NSTimeInterval)apnsMaxWait withRegistrationDelay:(NSTimeInterval)registrationDelay;
 @end
 

iOS_SDK/OneSignalSDK/UnitTests/UnitTestCommonMethods.m

@@ -88,10 +88,6 @@ + (void)runBackgroundThreads {
         if (notifSettingsQueue)
             dispatch_sync(notifSettingsQueue, ^{});
 
-        registerUserQueue = [OneSignal getRegisterQueue];
-        if (registerUserQueue)
-            dispatch_sync(registerUserQueue, ^{});
-        
         [OneSignalClientOverrider runBackgroundThreads];
 
         [UNUserNotificationCenterOverrider runBackgroundThreads];