adding a registerUserSuccessful. registerUserFinished also represents fail

Author: emawby

iOS_SDK/OneSignalSDK/Source/OSStateSynchronizer.m

@@ -48,7 +48,7 @@ + (void)setEmailUserId:(NSString *)emailUserId;
 + (void)saveExternalIdAuthToken:(NSString *)hashToken;
 + (void)saveSMSNumber:(NSString *)smsNumber withAuthToken:(NSString *)smsAuthToken userId:(NSString *)smsPlayerId;
 + (void)registerUserFinished;
-
++ (void)registerUserSuccessful;
 @end
 
 @interface OSStateSynchronizer ()
@@ -129,7 +129,7 @@ - (void)registerUserWithState:(OSUserState *)registrationState withSuccess:(OSMu
 
     [OneSignalClient.sharedClient executeSimultaneousRequests:requests withSuccess:^(NSDictionary<NSString *, NSDictionary *> *results) {
         [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"on_session result: %@", results]];
-        [OneSignal registerUserFinished];
+        [OneSignal registerUserSuccessful];
 
         // If the external user ID was sent as part of this request, we need to save it
         // Cache the external id if it exists within the registration payload
@@ -186,6 +186,7 @@ - (void)registerUserWithState:(OSUserState *)registrationState withSuccess:(OSMu
         for (NSString *key in @[OS_PUSH, OS_EMAIL])
             [OneSignal onesignal_Log:ONE_S_LL_ERROR message:[NSString stringWithFormat: @"Encountered error during %@ registration with OneSignal: %@", key, errors[key]]];
 
+        [OneSignal registerUserFinished];
         if (failureBlock)
             failureBlock(errors);
     }];

iOS_SDK/OneSignalSDK/Source/OSSubscription.m

@@ -181,7 +181,7 @@ + (void)fireChangesObserver:(OSSubscriptionState*)state {
     OSSubscriptionStateChanges* stateChanges = [OSSubscriptionStateChanges alloc];
     stateChanges.from = OneSignal.lastSubscriptionState;
     stateChanges.to = [state copy];
-    if (OneSignal.isRegisterUserFinished) {
+    if (OneSignal.isRegisterUserSuccessful) {
         BOOL hasReceiver = [OneSignal.subscriptionStateChangesObserver notifyChange:stateChanges];
 
         if (hasReceiver) {

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -471,10 +471,15 @@ + (NSString*)mUserId {
 + (void)setUserId:(NSString *)userId {
     self.currentSubscriptionState.userId = userId;
 }
-
+// This is set to true even if register user fails
 + (void)registerUserFinished {
     _registerUserFinished = true;
 }
+// If successful then register user is also finished
++ (void)registerUserSuccessful {
+    _registerUserSuccessful = true;
+    [OneSignal registerUserFinished];
+}
 
 + (NSString *)mEmailAuthToken {
     return self.currentEmailSubscriptionState.emailAuthCode;
@@ -593,6 +598,7 @@ + (void)clearStatics {
     _outcomeEventsController = nil;
 
     _registerUserFinished = false;
+    _registerUserSuccessful = false;
 
     _delayedSMSParameters = nil;
 }
@@ -1653,6 +1659,11 @@ + (BOOL)isRegisterUserFinished {
     return _registerUserFinished || isOnSessionSuccessfulForCurrentState;
 }
 
+static BOOL _registerUserSuccessful = false;
++ (BOOL)isRegisterUserSuccessful {
+    return _registerUserSuccessful || isOnSessionSuccessfulForCurrentState;
+}
+
 + (BOOL)shouldRegisterNow {
     // return if the user has not granted privacy permissions
     if ([self shouldLogMissingPrivacyConsentErrorWithMethodName:nil])
@@ -1822,6 +1833,7 @@ + (OSUserState *)createUserState {
 + (void)registerUserInternal {
     [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"registerUserInternal"];
     _registerUserFinished = false;
+    _registerUserSuccessful = false;
 
     // return if the user has not granted privacy permissions
     if ([self shouldLogMissingPrivacyConsentErrorWithMethodName:nil])
@@ -1928,7 +1940,6 @@ + (void)registerUserInternal {
                     callbackSet.failureBlock(error);
             }
         }
-        
         [OSMessagingController.sharedInstance updateInAppMessagesFromCache];
     }];
 }

iOS_SDK/OneSignalSDK/Source/OneSignalInternal.h

@@ -79,7 +79,10 @@
 
 @property (class, readonly) BOOL didCallDownloadParameters;
 @property (class, readonly) BOOL downloadedParameters;
+//Indicates we have attempted to register the user and it has succeeded or failed
 @property (class, readonly) BOOL isRegisterUserFinished;
+//Indicates that registering the user was successful
+@property (class, readonly) BOOL isRegisterUserSuccessful;
 
 @property (class) NSObject<OneSignalNotificationSettings>* _Nonnull osNotificationSettings;
 @property (class) OSPermissionState* _Nonnull currentPermissionState;