From 754bede928027236a6e92566241e3f1d50b66c51 Mon Sep 17 00:00:00 2001 From: Deepak Borania Date: Mon, 19 Apr 2021 13:52:22 +0200 Subject: [PATCH] add null check for intial interests while registering device with FCM --- pushnotifications/build.gradle | 2 +- .../com/pusher/pushnotifications/api/PushNotificationsAPI.kt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pushnotifications/build.gradle b/pushnotifications/build.gradle index 5d70ecce..473d09dc 100644 --- a/pushnotifications/build.gradle +++ b/pushnotifications/build.gradle @@ -9,7 +9,7 @@ android { minSdkVersion 16 targetSdkVersion 28 versionCode 1 - versionName "1.6.2" + versionName "1.6.3" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } diff --git a/pushnotifications/src/main/java/com/pusher/pushnotifications/api/PushNotificationsAPI.kt b/pushnotifications/src/main/java/com/pusher/pushnotifications/api/PushNotificationsAPI.kt index 3f4c3558..d3ebe866 100644 --- a/pushnotifications/src/main/java/com/pusher/pushnotifications/api/PushNotificationsAPI.kt +++ b/pushnotifications/src/main/java/com/pusher/pushnotifications/api/PushNotificationsAPI.kt @@ -141,6 +141,9 @@ class PushNotificationsAPI(private val instanceId: String, overrideHostURL: Stri val responseBody = response?.body() if (responseBody != null && response.code() in 200..299) { + if (responseBody.initialInterestSet==null || responseBody.id==null){ + throw PushNotificationsAPIException("device id or initial interests is null") + } return RegisterDeviceResult( deviceId = responseBody.id, initialInterests = responseBody.initialInterestSet)