Skip to content

Commit 72ce33a

Browse files
davidtruongdavidtruong
committed
updating constants for firebase data
1 parent 3b2ccbb commit 72ce33a

File tree

4 files changed

+37
-13
lines changed

4 files changed

+37
-13
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -737,15 +737,15 @@ public void registerDeviceToken(String applicationName, String token, String pus
737737
dataFields = new JSONObject();
738738
}
739739
if (pushServicePlatform != null) {
740-
dataFields.put("firebase", pushServicePlatform.equalsIgnoreCase(IterableConstants.MESSAGING_PLATFORM_FIREBASE));
740+
dataFields.put(IterableConstants.FIREBASE_COMPATIBLE, pushServicePlatform.equalsIgnoreCase(IterableConstants.MESSAGING_PLATFORM_FIREBASE));
741741
}
742-
dataFields.put("brand", Build.BRAND); //brand: google
743-
dataFields.put("manufacturer", Build.MANUFACTURER); //manufacturer: samsung
744-
dataFields.putOpt("advertisingId", getAdvertisingId()); //ADID: "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
745-
dataFields.put("systemName", Build.DEVICE); //device name: toro
746-
dataFields.put("systemVersion", Build.VERSION.RELEASE); //version: 4.0.4
747-
dataFields.put("model", Build.MODEL); //device model: Galaxy Nexus
748-
dataFields.put("sdkVersion", Build.VERSION.SDK_INT); //sdk version/api level: 15
742+
dataFields.put(IterableConstants.DEVICE_BRAND, Build.BRAND); //brand: google
743+
dataFields.put(IterableConstants.DEVICE_MANUFACTURER, Build.MANUFACTURER); //manufacturer: samsung
744+
dataFields.putOpt(IterableConstants.DEVICE_ADID, getAdvertisingId()); //ADID: "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
745+
dataFields.put(IterableConstants.DEVICE_SYSTEM_NAME, Build.DEVICE); //device name: toro
746+
dataFields.put(IterableConstants.DEVICE_SYSTEM_VERSION, Build.VERSION.RELEASE); //version: 4.0.4
747+
dataFields.put(IterableConstants.DEVICE_MODEL, Build.MODEL); //device model: Galaxy Nexus
748+
dataFields.put(IterableConstants.DEVICE_SDK_VERSION, Build.VERSION.SDK_INT); //sdk version/api level: 15
749749

750750
JSONObject device = new JSONObject();
751751
device.put(IterableConstants.KEY_TOKEN, token);

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,16 @@ public final class IterableConstants {
5858
public static final String ITERABLE_DATA_TITLE = "title";
5959
public static final String ITERABLE_DATA_SOUND = "sound";
6060

61-
public static final String FIREBASE_RESOURCE_ID = "firebase_database_url";
61+
//Device
62+
public static final String DEVICE_BRAND = "brand";
63+
public static final String DEVICE_MANUFACTURER = "manufacturer";
64+
public static final String DEVICE_ADID = "advertisingId";
65+
public static final String DEVICE_SYSTEM_NAME = "systemName";
66+
public static final String DEVICE_SYSTEM_VERSION = "systemVersion";
67+
public static final String DEVICE_MODEL = "model";
68+
public static final String DEVICE_SDK_VERSION = "sdkVersion";
69+
6270
public static final String INSTANCE_ID_CLASS = "com.google.android.gms.iid.InstanceID";
63-
public static final String FIREBASE_MESSAGING_CLASS = "com.google.firebase.messaging.FirebaseMessaging";
6471
public static final String ICON_FOLDER_IDENTIFIER = "drawable";
6572
public static final String NOTIFICATION_ICON_NAME = "iterable_notification_icon";
6673
public static final String NOTIFICATION_COLOR = "iterable_notification_color";
@@ -69,6 +76,13 @@ public final class IterableConstants {
6976
public static final String ANDROID_RESOURCE_PATH = "android.resource://";
7077
public static final String ANDROID_STRING = "string";
7178

79+
//Firebase
80+
public static final String FIREBASE_RESOURCE_ID = "firebase_database_url";
81+
public static final String FIREBASE_MESSAGING_CLASS = "com.google.firebase.messaging.FirebaseMessaging";
82+
public static final String FIREBASE_COMPATIBLE = "firebaseCompatible";
83+
public static final String FIREBASE_TOKEN_TYPE = "tokenRegistrationType";
84+
public static final String FIREBASE_INITIAL_UPGRADE = "initialFirebaseUpgrade";
85+
7286
public static final String ITBL_DEEPLINK_IDENTIFIER = "/a/[A-Za-z0-9]+";
7387
public static final String DATEFORMAT = "yyyy-MM-dd HH:mm:ss";
7488
public static final String PICASSO_CLASS = "com.squareup.picasso.Picasso";

‎iterableapi/src/main/java/com/iterable/iterableapi/IterableFirebaseInstanceIDService.java‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
import com.google.firebase.iid.FirebaseInstanceId;
77
import com.google.firebase.iid.FirebaseInstanceIdService;
88

9+
import org.json.JSONException;
10+
import org.json.JSONObject;
11+
912
/**
1013
* Created by David Truong [email protected].
1114
*/
@@ -26,7 +29,14 @@ public void onTokenRefresh() {
2629
String pushIdPref = sharedPref.getString(IterableConstants.PUSH_APP_ID, null);
2730
if (registrationToken != null && pushIdPref != null && !pushIdPref.equalsIgnoreCase(IterableConstants.PUSH_APP_ID)) {
2831
IterableLogger.w(TAG, "Refreshed fcm token: " + registrationToken);
29-
IterableApi.sharedInstance.registerDeviceToken(pushIdPref, registrationToken, IterableConstants.MESSAGING_PLATFORM_FIREBASE);
32+
JSONObject data = new JSONObject();
33+
try {
34+
data.put(IterableConstants.FIREBASE_TOKEN_TYPE, IterableConstants.MESSAGING_PLATFORM_FIREBASE);
35+
data.put(IterableConstants.FIREBASE_INITIAL_UPGRADE, true);
36+
} catch (JSONException e) {
37+
IterableLogger.e(TAG, e.toString());
38+
}
39+
IterableApi.sharedInstance.registerDeviceToken(pushIdPref, registrationToken, IterableConstants.MESSAGING_PLATFORM_FIREBASE, data);
3040
SharedPreferences.Editor editor = sharedPref.edit();
3141
editor.putString(IterableConstants.PUSH_APP_ID, IterableConstants.PUSH_APP_ID);
3242
editor.commit();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ protected String doInBackground(IterablePushRegistrationData... params) {
3636
pushRegistrationObject = getDeviceToken(iterablePushRegistrationData.projectNumber, iterablePushRegistrationData.messagingPlatform, iterablePushRegistrationData.iterableAppId, true);
3737
JSONObject data = new JSONObject();
3838
try {
39-
data.put("TokenPlatformType", pushRegistrationObject.messagingPlatform);
39+
data.put("tokenRegistrationType", pushRegistrationObject.messagingPlatform);
4040
} catch (JSONException e) {
4141
IterableLogger.e(TAG, e.toString());
4242
}
@@ -94,7 +94,7 @@ PushRegistrationObject getDeviceToken(String projectNumber, String messagingPlat
9494
editor.commit();
9595
}
9696

97-
//IterableFirebaseInstanceIDService.onTokenRefresh gets called after delete
97+
//IterableFirebaseInstanceIDService.onTokenRefresh gets called after the current token is deleted
9898
instanceID.deleteInstanceId();
9999
}
100100
registrationObject = new PushRegistrationObject(instanceID.getToken(), IterableConstants.MESSAGING_PLATFORM_FIREBASE);

0 commit comments

Comments
 (0)