Added in test cases for messagingPlatform

Author: davidtruong

iterableapi/src/androidTest/java/com/iterable/iterableapi/IterablePushRegistrationTest.java

@@ -38,6 +38,7 @@ public void testGetGCMToken() throws Exception {
         IterablePushRegistration registration = new IterablePushRegistration();
         IterablePushRegistration.PushRegistrationObject registrationObject = registration.getDeviceToken(senderID, IterableConstants.MESSAGING_PLATFORM_GOOGLE, "test_application_GCM", false);
         assertNotNull(registrationObject.token);
+        assertEquals(IterableConstants.MESSAGING_PLATFORM_GOOGLE, registrationObject.messagingPlatform);
 
         SharedPreferences sharedPref = appContext.getSharedPreferences(IterableConstants.PUSH_APP_ID, Context.MODE_PRIVATE);
         String pushIdPref = sharedPref.getString(IterableConstants.PUSH_APP_ID, null);
@@ -60,12 +61,14 @@ public void testGetFCMToken() throws Exception {
             sharedPref = appContext.getSharedPreferences(IterableConstants.PUSH_APP_ID, Context.MODE_PRIVATE);
             pushIdPref = sharedPref.getString(IterableConstants.PUSH_APP_ID, null);
             assertNotNull(pushIdPref);
+            assertEquals(IterableConstants.MESSAGING_PLATFORM_FIREBASE, registrationObject.messagingPlatform);
 
         } else {
             //GCM registration
             sharedPref = appContext.getSharedPreferences(IterableConstants.PUSH_APP_ID, Context.MODE_PRIVATE);
             pushIdPref = sharedPref.getString(IterableConstants.PUSH_APP_ID, null);
             assertNull(pushIdPref);
+            assertEquals(IterableConstants.MESSAGING_PLATFORM_GOOGLE, registrationObject.messagingPlatform);
         }
     }
 }

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

@@ -726,7 +726,7 @@ private void tryTrackNotifOpen(Intent calledIntent) {
      * @param pushServicePlatform
      * @param dataFields
      */
-    private void registerDeviceToken(String applicationName, String token, String pushServicePlatform, JSONObject dataFields) {
+    public void registerDeviceToken(String applicationName, String token, String pushServicePlatform, JSONObject dataFields) {
         String platform = IterableConstants.MESSAGING_PLATFORM_GOOGLE;
 
         JSONObject requestJSON = new JSONObject();

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

@@ -8,6 +8,9 @@
 import com.google.android.gms.iid.InstanceID;
 import com.google.firebase.iid.FirebaseInstanceId;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.io.IOException;
 
 /**
@@ -26,20 +29,26 @@ class IterablePushRegistration extends AsyncTask<IterablePushRegistrationData, V
      * @return registration token
      */
     protected String doInBackground(IterablePushRegistrationData... params) {
-        PushRegistrationObject PushRegistrationObject = null;
+        PushRegistrationObject pushRegistrationObject = null;
         iterablePushRegistrationData = params[0];
         if (iterablePushRegistrationData.iterableAppId != null) {
             if (iterablePushRegistrationData.pushRegistrationAction == IterablePushRegistrationData.PushRegistrationAction.ENABLE) {
-                PushRegistrationObject = getDeviceToken(iterablePushRegistrationData.projectNumber, iterablePushRegistrationData.messagingPlatform, iterablePushRegistrationData.iterableAppId, true);
-                IterableApi.sharedInstance.registerDeviceToken(iterablePushRegistrationData.iterableAppId, PushRegistrationObject.token, iterablePushRegistrationData.messagingPlatform);
+                pushRegistrationObject = getDeviceToken(iterablePushRegistrationData.projectNumber, iterablePushRegistrationData.messagingPlatform, iterablePushRegistrationData.iterableAppId, true);
+                JSONObject data = new JSONObject();
+                try {
+                    data.put("TokenPlatformType", pushRegistrationObject.messagingPlatform);
+                } catch (JSONException e) {
+                    IterableLogger.e(TAG, e.toString());
+                }
+                IterableApi.sharedInstance.registerDeviceToken(iterablePushRegistrationData.iterableAppId, pushRegistrationObject.token, iterablePushRegistrationData.messagingPlatform, data);
             } else if (iterablePushRegistrationData.pushRegistrationAction == IterablePushRegistrationData.PushRegistrationAction.DISABLE) {
-                PushRegistrationObject = getDeviceToken(iterablePushRegistrationData.projectNumber, iterablePushRegistrationData.messagingPlatform, iterablePushRegistrationData.iterableAppId, false);
-                IterableApi.sharedInstance.disablePush(PushRegistrationObject.token);
+                pushRegistrationObject = getDeviceToken(iterablePushRegistrationData.projectNumber, iterablePushRegistrationData.messagingPlatform, iterablePushRegistrationData.iterableAppId, false);
+                IterableApi.sharedInstance.disablePush(pushRegistrationObject.token);
             }
         } else {
             IterableLogger.e("IterablePush", "The IterableAppId has not been added");
         }
-        return PushRegistrationObject.token;
+        return pushRegistrationObject.token;
     }
 
     /**