Comments and changes to fix the double callback problem

Author: franco-zalamena-iterable

iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java

@@ -405,15 +405,15 @@ private void onLogin(
             boolean isUnknown,
             @Nullable IterableHelper.FailureHandler failureHandler
     ) {
-        if (!isInitialized()) {
+        if (!isInitialized()) { //todo: If we get here and it is not initialized, isn't it possible to have leftover data that was already set by setEmail?
             setAuthToken(null);
             return;
         }
 
         getAuthManager().pauseAuthRetries(false);
         if (authToken != null) {
             setAuthToken(authToken);
-            attemptMergeAndEventReplay(userIdOrEmail, isEmail, merge, replay, isUnknown, failureHandler);
+            attemptMergeAndEventReplay(userIdOrEmail, isEmail, merge, replay, isUnknown, failureHandler); //todo: Why do we need to do this again if we did this on setEmail?
         } else {
             getAuthManager().requestNewAuthToken(false, data -> attemptMergeAndEventReplay(userIdOrEmail, isEmail, merge, replay, isUnknown, failureHandler));
         }
@@ -449,8 +449,9 @@ private void completeUserLogin(@Nullable String email, @Nullable String userId,
         }
 
         if (config.autoPushRegistration) {
-            registerForPush();
-        } else if (_setUserSuccessCallbackHandler != null) {
+            registerForPush(); //TODO: FIX, THE LOGIN NEVER CALLS THE CALLBACK IF THE AUTOPUSH REGISTRATION IS TRUE
+        }
+        if (_setUserSuccessCallbackHandler != null) { // todo: why is there an else if it can be both true
             _setUserSuccessCallbackHandler.onSuccess(new JSONObject()); // passing blank json object here as onSuccess is @Nonnull
         }
 
@@ -738,7 +739,7 @@ protected void registerDeviceToken(@Nullable String email, @Nullable String user
     private IterableHelper.SuccessHandler getSuccessHandler() {
         IterableHelper.SuccessHandler wrappedSuccessHandler = null;
         if (_setUserSuccessCallbackHandler != null || (config.enableUnknownUserActivation && getVisitorUsageTracked() && config.identityResolution.getReplayOnVisitorToKnown())) {
-            final IterableHelper.SuccessHandler originalSuccessHandler = _setUserSuccessCallbackHandler;
+            final IterableHelper.SuccessHandler originalSuccessHandler = null; //todo: MAYBE THIS HAS TO DO WITH THE ERROR, IF THE PERSON IS SETTING EMAIL AND REGISTERING DEVICE TOKEN THEY WILL GET THE WRONG CALLBACK CALLED
             wrappedSuccessHandler = data -> {
                 trackConsentOnDeviceRegistration();
 
@@ -1023,6 +1024,9 @@ public void setEmail(@Nullable String email, @Nullable String authToken, @Nullab
 
         if (_email != null && _email.equals(email)) {
             checkAndUpdateAuthToken(authToken);
+            if (successHandler != null) {
+                successHandler.onSuccess(new JSONObject());
+            }
             return;
         }
 
@@ -1133,7 +1137,7 @@ private boolean isReplay(@Nullable IterableIdentityResolution iterableIdentityRe
     private void attemptMergeAndEventReplay(@Nullable String emailOrUserId, boolean isEmail, boolean merge, boolean replay, boolean isUnknown, IterableHelper.FailureHandler failureHandler) {
         if (config.enableUnknownUserActivation && getVisitorUsageTracked()) {
 
-            if (emailOrUserId != null && !emailOrUserId.equals(_userIdUnknown)) {
+            if (emailOrUserId != null && !emailOrUserId.equals(_userIdUnknown)) { //todo: when would the userIdUnknown be the same?
                 attemptAndProcessMerge(emailOrUserId, isEmail, merge, failureHandler, _userIdUnknown);
             }
 

iterableapi/src/main/java/com/iterable/iterableapi/UnknownUserMerge.java

@@ -5,7 +5,7 @@ public class UnknownUserMerge {
 
     void tryMergeUser(IterableApiClient apiClient, String unknownUserId, String destinationUser, boolean isEmail, boolean merge, MergeResultCallback callback) {
         IterableLogger.v(TAG, "tryMergeUser");
-        if (unknownUserId != null && merge) {
+        if (unknownUserId != null && merge) { //todo: why can we try to merge and have merge false?
             String destinationEmail = isEmail ? destinationUser : null;
             String destinationUserId = isEmail ? null : destinationUser;
             apiClient.mergeUser(null, unknownUserId, destinationEmail, destinationUserId, data -> {