added in userId for each api call instead of email

Author: davidtruong

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

@@ -150,7 +150,7 @@ public static IterableApi sharedInstanceWithApiKeyWithUserId(Context currentCont
     {
         return sharedInstanceWithApiKey(currentContext, apiKey, null, userId, debugMode);
     }
-    
+
     /**
      * Returns a shared instance of IterableApi. Updates the client data if an instance already exists.
      * Should be called whenever the app is opened.
@@ -281,7 +281,7 @@ public void track(String eventName, String campaignId, String templateId, JSONOb
             if (_email != null) {
                 requestJSON.put(IterableConstants.KEY_EMAIL, _email);
             } else {
-
+                requestJSON.put(IterableConstants.KEY_USER_ID, _userId);
             }
             requestJSON.put(IterableConstants.KEY_EVENTNAME, eventName);
 
@@ -297,8 +297,8 @@ public void track(String eventName, String campaignId, String templateId, JSONOb
     }
 
     public void sendPush(String email, int campaignId) {
-    sendPush(email, campaignId, null, null);
-}
+        sendPush(email, campaignId, null, null);
+    }
 
     /**
      * Sends a push campaign to an email address at the given time.
@@ -354,7 +354,12 @@ public void updateEmail(String newEmail) {
 
         sendRequest(IterableConstants.ENDPOINT_UPDATEEMAIL, requestJSON);
 
-        _email = newEmail;
+        if (_email != null) {
+            _email = newEmail;
+        } else {
+            IterableLogger.w(TAG, "updateEmail should not be called with a userId. " +
+                "Init SDK with sharedInstanceWithApiKey instead of sharedInstanceWithApiKeyWithUserId");
+        }
     }
 
     public void updateUser(JSONObject dataFields) {
@@ -363,6 +368,8 @@ public void updateUser(JSONObject dataFields) {
         try {
             if (_email != null) {
                 requestJSON.put(IterableConstants.KEY_EMAIL, _email);
+            } else {
+                requestJSON.put(IterableConstants.KEY_USER_ID, _userId);
             }
 
             requestJSON.put(IterableConstants.KEY_DATAFIELDS, dataFields);
@@ -418,7 +425,11 @@ protected void trackPushOpen(int campaignId, int templateId, String messageId) {
         JSONObject requestJSON = new JSONObject();
 
         try {
-            requestJSON.put(IterableConstants.KEY_EMAIL, _email);
+            if (_email != null) {
+                requestJSON.put(IterableConstants.KEY_EMAIL, _email);
+            } else {
+                requestJSON.put(IterableConstants.KEY_USER_ID, _userId);
+            }
             requestJSON.put(IterableConstants.KEY_CAMPAIGNID, campaignId);
             requestJSON.put(IterableConstants.KEY_TEMPLATE_ID, templateId);
             requestJSON.put(IterableConstants.KEY_MESSAGE_ID, messageId);
@@ -438,7 +449,11 @@ protected void disablePush(String token) {
         JSONObject requestJSON = new JSONObject();
         try {
             requestJSON.put(IterableConstants.KEY_TOKEN, token);
-            requestJSON.put(IterableConstants.KEY_EMAIL, _email);
+            if (_email != null) {
+                requestJSON.put(IterableConstants.KEY_EMAIL, _email);
+            } else {
+                requestJSON.put(IterableConstants.KEY_USER_ID, _userId);
+            }
         }
         catch (JSONException e) {
             e.printStackTrace();
@@ -480,7 +495,12 @@ private void registerDeviceToken(String applicationName, String token, JSONObjec
 
         JSONObject requestJSON = new JSONObject();
         try {
-            requestJSON.put(IterableConstants.KEY_EMAIL, _email);
+            if (_email != null) {
+                requestJSON.put(IterableConstants.KEY_EMAIL, _email);
+            } else {
+                requestJSON.put(IterableConstants.KEY_USER_ID, _userId);
+            }
+
             if (dataFields == null) {
                 dataFields = new JSONObject();
             }

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

@@ -20,8 +20,9 @@ public final class IterableConstants {
     public static final String KEY_RECIPIENT_EMAIL     = "recipientEmail";
     public static final String KEY_SEND_AT             = "sendAt";
     public static final String KEY_TEMPLATE_ID         = "templateId";
-    public static final String KEY_MESSAGE_ID         = "messageId";
+    public static final String KEY_MESSAGE_ID          = "messageId";
     public static final String KEY_TOKEN               = "token";
+    public static final String KEY_USER_ID             = "userId";
     public static final String KEY_PLATFORM            = "platform";
     public static final String KEY_APPLICATIONNAME     = "applicationName";
     public static final String KEY_DEVICE              = "device";