Merge pull request #835 from OneSignal/fix/send_external_id_after_quit

Fixing logic for delaying setting external user id

Author: emawby

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -849,7 +849,7 @@ + (void)downloadIOSParamsWithAppId:(NSString *)appId {
             requiresUserIdAuth = [result[IOS_REQUIRES_USER_ID_AUTHENTICATION] boolValue];
 
             // checks if a call to setExternalUserId: was delayed due to missing 'require_user_id_auth' parameter
-            if (delayedExternalIdParameters && self.currentSubscriptionState.userId) {
+            if (delayedExternalIdParameters) {
                 [self setExternalUserId:delayedExternalIdParameters.externalId withExternalIdAuthHashToken:delayedExternalIdParameters.authToken withSuccess:delayedExternalIdParameters.successBlock withFailure:delayedExternalIdParameters.failureBlock];
                 delayedExternalIdParameters = nil;
             }
@@ -2541,7 +2541,7 @@ + (void)setExternalUserId:(NSString *)externalId withExternalIdAuthHashToken:(NS
         return;
 
     // Can't set the external id if init is not done or the app id or user id has not ben set yet
-    if (!performedOnSessionRequest) {
+    if (!_didCallDownloadParameters) {
         // will be sent as part of the registration/on_session request
         pendingExternalUserId = externalId;
         pendingExternalUserIdHashToken = hashToken;