Call createUserForUserId before registering the token

Author: vbabenkoru

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

@@ -412,31 +412,10 @@ public void setUserId(String userId) {
         onLogOut();
         _email = null;
         _userId = userId;
-        createUserForUserId();
         storeEmailAndUserId();
         onLogIn();
     }
 
-    /**
-     * Creates a user profile for a userId if it does not yet exist.
-     */
-    public void createUserForUserId() {
-        if (!checkSDKInitialization() || _userId == null) {
-            return;
-        }
-
-        JSONObject requestJSON = new JSONObject();
-        try {
-            addEmailOrUserIdToJson(requestJSON);
-            requestJSON.put(IterableConstants.KEY_USER_ID, _userId);
-
-            sendPostRequest(IterableConstants.ENDPOINT_CREATE_USERID, requestJSON);
-        }
-        catch (JSONException e) {
-            e.printStackTrace();
-        }
-    }
-
     /**
      * Tracks a click on the uri if it is an iterable link.
      * @param uri the
@@ -548,7 +527,21 @@ public void registerDeviceToken(final String applicationName, final String token
         if (token != null) {
             new Thread(new Runnable() {
                 public void run() {
-                    registerDeviceToken(applicationName, token, IterableConstants.MESSAGING_PLATFORM_FIREBASE, null);
+                    if (getUserId() != null) {
+                        createUserForUserId(new IterableHelper.SuccessHandler() {
+                            @Override
+                            public void onSuccess(JSONObject data) {
+                                registerDeviceToken(applicationName, token, IterableConstants.MESSAGING_PLATFORM_FIREBASE, null);
+                            }
+                        }, new IterableHelper.FailureHandler() {
+                            @Override
+                            public void onFailure(String reason, JSONObject data) {
+                                IterableLogger.e(TAG, "Could not create user: " + reason);
+                            }
+                        });
+                    } else {
+                        registerDeviceToken(applicationName, token, IterableConstants.MESSAGING_PLATFORM_FIREBASE, null);
+                    }
                 }
             }).start();
         }
@@ -1399,6 +1392,26 @@ private void handleDDL(JSONObject response) {
         setDDLChecked(true);
     }
 
+    /**
+     * Creates a user profile for a userId if it does not yet exist.
+     */
+    private void createUserForUserId(IterableHelper.SuccessHandler onSuccess, IterableHelper.FailureHandler onFailure) {
+        if (!checkSDKInitialization() || _userId == null) {
+            return;
+        }
+
+        JSONObject requestJSON = new JSONObject();
+        try {
+            addEmailOrUserIdToJson(requestJSON);
+            requestJSON.put(IterableConstants.KEY_USER_ID, _userId);
+
+            sendPostRequest(IterableConstants.ENDPOINT_CREATE_USERID, requestJSON, onSuccess, onFailure);
+        }
+        catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
 //---------------------------------------------------------------------------------------
 //endregion