Skip to content

Commit 2585bbe

Browse files
authored
Merge pull request #23 from Iterable/feature/ITBL-3528-handle-registration-errors
adds in additional error handling for registration
2 parents c517e03 + f97ecc3 commit 2585bbe

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,25 @@ protected String doInBackground(IterablePushRegistrationData... params) {
4040
} catch (JSONException e) {
4141
IterableLogger.e(TAG, e.toString());
4242
}
43-
IterableApi.sharedInstance.registerDeviceToken(iterablePushRegistrationData.iterableAppId, pushRegistrationObject.token, pushRegistrationObject.messagingPlatform, data);
43+
if (pushRegistrationObject != null) {
44+
IterableApi.sharedInstance.registerDeviceToken(iterablePushRegistrationData.iterableAppId, pushRegistrationObject.token, pushRegistrationObject.messagingPlatform, data);
45+
}
4446
} else if (iterablePushRegistrationData.pushRegistrationAction == IterablePushRegistrationData.PushRegistrationAction.DISABLE) {
4547
pushRegistrationObject = getDeviceToken(iterablePushRegistrationData.projectNumber, iterablePushRegistrationData.messagingPlatform, iterablePushRegistrationData.iterableAppId, false);
46-
IterableApi.sharedInstance.disablePush(pushRegistrationObject.token);
48+
if (pushRegistrationObject != null) {
49+
IterableApi.sharedInstance.disablePush(pushRegistrationObject.token);
50+
}
4751
}
4852
} else {
4953
IterableLogger.e("IterablePush", "The IterableAppId has not been added");
5054
}
51-
return pushRegistrationObject.token;
55+
56+
String deviceToken = null;
57+
if (pushRegistrationObject != null) {
58+
deviceToken = pushRegistrationObject.token;
59+
}
60+
61+
return deviceToken;
5262
}
5363

5464
/**

0 commit comments

Comments
 (0)