changed call signatures of the sharedInstance fuction to take in a userId

Author: davidtruong

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

@@ -27,6 +27,7 @@ public class IterableApi {
     private Context _applicationContext;
     private String _apiKey;
     private String _email;
+    private String _userId;
     private boolean _debugMode;
     private Bundle _payloadData;
     private IterableNotificationData _notificationData;
@@ -39,9 +40,6 @@ public class IterableApi {
     IterableApi(){
     }
 
-    IterableApi(Context context, String apiKey, String email){
-        updateData(context, apiKey, email);
-    }
 //---------------------------------------------------------------------------------------
 //endregion
 
@@ -104,6 +102,60 @@ void setNotificationData(IterableNotificationData data) {
      * Returns a shared instance of IterableApi. Updates the client data if an instance already exists.
      * Should be called whenever the app is opened.
      * @param currentActivity The current activity
+     * @param userId The current userId
+     * @return stored instance of IterableApi
+     */
+    public static IterableApi sharedInstanceWithApiKeyWithUserId(Activity currentActivity, String apiKey,
+                                                                 String userId)
+    {
+        return sharedInstanceWithApiKeyWithUserId(currentActivity, apiKey, userId, false);
+    }
+
+    /**
+     * Returns a shared instance of IterableApi. Updates the client data if an instance already exists.
+     * Should be called whenever the app is opened.
+     * Allows the IterableApi to be intialized with debugging enabled
+     * @param currentActivity The current activity
+     * @param userId
+     * The current userId@return stored instance of IterableApi
+     */
+    public static IterableApi sharedInstanceWithApiKeyWithUserId(Activity currentActivity, String apiKey,
+                                                                 String userId, boolean debugMode)
+    {
+        return sharedInstanceWithApiKeyWithUserId((Context) currentActivity, apiKey, 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.
+     * @param currentContext The current context
+     * @param userId The current userId
+     * @return stored instance of IterableApi
+     */
+    public static IterableApi sharedInstanceWithApiKeyWithUserId(Context currentContext, String apiKey,
+                                                                 String userId)
+    {
+        return sharedInstanceWithApiKey(currentContext, apiKey, null, userId, false);
+    }
+
+    /**
+     * Returns a shared instance of IterableApi. Updates the client data if an instance already exists.
+     * Should be called whenever the app is opened.
+     * Allows the IterableApi to be intialized with debugging enabled
+     * @param currentContext The current context
+     * @return stored instance of IterableApi
+     */
+    public static IterableApi sharedInstanceWithApiKeyWithUserId(Context currentContext, String apiKey,
+                                                                 String userId, boolean debugMode)
+    {
+        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.
+     * @param currentActivity The current activity
+     * @param email The current email
      * @return stored instance of IterableApi
      */
     public static IterableApi sharedInstanceWithApiKey(Activity currentActivity, String apiKey,
@@ -117,6 +169,7 @@ public static IterableApi sharedInstanceWithApiKey(Activity currentActivity, Str
      * Should be called whenever the app is opened.
      * Allows the IterableApi to be intialized with debugging enabled
      * @param currentActivity The current activity
+     * @param email The current email
      * @return stored instance of IterableApi
      */
     public static IterableApi sharedInstanceWithApiKey(Activity currentActivity, String apiKey,
@@ -128,26 +181,34 @@ public static IterableApi sharedInstanceWithApiKey(Activity currentActivity, Str
     /**
      * Returns a shared instance of IterableApi. Updates the client data if an instance already exists.
      * Should be called whenever the app is opened.
-     * @param currentActivity The current activity
+     * @param currentContext The current context
+     * @param email The current email
      * @return stored instance of IterableApi
      */
-    public static IterableApi sharedInstanceWithApiKey(Context currentActivity, String apiKey,
+    public static IterableApi sharedInstanceWithApiKey(Context currentContext, String apiKey,
                                                        String email)
     {
-        return sharedInstanceWithApiKey(currentActivity, apiKey, email, false);
+        return sharedInstanceWithApiKey(currentContext, apiKey, email, false);
     }
 
     /**
      * Returns a shared instance of IterableApi. Updates the client data if an instance already exists.
      * Should be called whenever the app is opened.
      * Allows the IterableApi to be intialized with debugging enabled
      * @param currentContext The current context
+     * @param email The current email
      * @return stored instance of IterableApi
      */
     public static IterableApi sharedInstanceWithApiKey(Context currentContext, String apiKey,
                                                        String email, boolean debugMode)
     {
-        sharedInstance.updateData(currentContext.getApplicationContext(), apiKey, email);
+        return sharedInstanceWithApiKey(currentContext, apiKey, email, null, debugMode);
+    }
+
+    private static IterableApi sharedInstanceWithApiKey(Context currentContext, String apiKey,
+                                                       String email, String userId, boolean debugMode)
+    {
+        sharedInstance.updateData(currentContext.getApplicationContext(), apiKey, email, userId);
 
         if (currentContext instanceof Activity) {
             Activity currentActivity = (Activity) currentContext;
@@ -217,7 +278,11 @@ public void track(String eventName, String campaignId, String templateId) {
     public void track(String eventName, String campaignId, String templateId, JSONObject dataFields) {
         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_EVENTNAME, eventName);
 
             requestJSON.put(IterableConstants.KEY_CAMPAIGNID, campaignId);
@@ -296,7 +361,10 @@ public void updateUser(JSONObject dataFields) {
         JSONObject requestJSON = new JSONObject();
 
         try {
-            requestJSON.put(IterableConstants.KEY_EMAIL, _email);
+            if (_email != null) {
+                requestJSON.put(IterableConstants.KEY_EMAIL, _email);
+            }
+
             requestJSON.put(IterableConstants.KEY_DATAFIELDS, dataFields);
         }
         catch (JSONException e) {
@@ -383,10 +451,11 @@ protected void disablePush(String token) {
 
 //region Private Fuctions
 //---------------------------------------------------------------------------------------
-    private void updateData(Context context, String apiKey, String email) {
+    private void updateData(Context context, String apiKey, String email, String userId) {
         this._applicationContext = context;
         this._apiKey = apiKey;
         this._email = email;
+        this._userId = userId;
     }
 
     private void tryTrackNotifOpen(Intent calledIntent) {