Skip to content

Commit c41b921

Browse files
committed
Apply the fix to prevent the crash
1 parent 485f958 commit c41b921

File tree

1 file changed

+4
-3
lines changed
  • OneSignalSDK/onesignal/core/src/main/java/com/onesignal/internal

1 file changed

+4
-3
lines changed

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/internal/OneSignalImp.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import com.onesignal.common.IDManager
99
import com.onesignal.common.OneSignalUtils
1010
import com.onesignal.common.modeling.ModelChangeTags
1111
import com.onesignal.common.modules.IModule
12+
import com.onesignal.common.safeInt
1213
import com.onesignal.common.safeString
1314
import com.onesignal.common.services.IServiceProvider
1415
import com.onesignal.common.services.ServiceBuilder
@@ -282,7 +283,7 @@ internal class OneSignalImp : IOneSignal, IServiceProvider {
282283
legacyUserSyncString = "{name: test}";
283284
if (legacyUserSyncString != null) {
284285
val legacyUserSyncJSON = JSONObject(legacyUserSyncString)
285-
val notificationTypes = legacyUserSyncJSON.getInt("notification_types")
286+
val notificationTypes = legacyUserSyncJSON.safeInt("notification_types")
286287

287288
val pushSubscriptionModel = SubscriptionModel()
288289
pushSubscriptionModel.id = legacyPlayerId
@@ -291,8 +292,8 @@ internal class OneSignalImp : IOneSignal, IServiceProvider {
291292
notificationTypes != SubscriptionStatus.NO_PERMISSION.value && notificationTypes != SubscriptionStatus.UNSUBSCRIBE.value
292293
pushSubscriptionModel.address =
293294
legacyUserSyncJSON.safeString("identifier") ?: ""
294-
pushSubscriptionModel.status = SubscriptionStatus.fromInt(notificationTypes)
295-
?: SubscriptionStatus.NO_PERMISSION
295+
if (notificationTypes != null)
296+
pushSubscriptionModel.status = SubscriptionStatus.fromInt(notificationTypes) ?: SubscriptionStatus.NO_PERMISSION
296297

297298
pushSubscriptionModel.sdk = OneSignalUtils.SDK_VERSION
298299
pushSubscriptionModel.deviceOS = Build.VERSION.RELEASE

0 commit comments

Comments
 (0)