@@ -9,6 +9,7 @@ import com.onesignal.common.IDManager
9
9
import com.onesignal.common.OneSignalUtils
10
10
import com.onesignal.common.modeling.ModelChangeTags
11
11
import com.onesignal.common.modules.IModule
12
+ import com.onesignal.common.safeInt
12
13
import com.onesignal.common.safeString
13
14
import com.onesignal.common.services.IServiceProvider
14
15
import com.onesignal.common.services.ServiceBuilder
@@ -282,7 +283,7 @@ internal class OneSignalImp : IOneSignal, IServiceProvider {
282
283
legacyUserSyncString = " {name: test}" ;
283
284
if (legacyUserSyncString != null ) {
284
285
val legacyUserSyncJSON = JSONObject (legacyUserSyncString)
285
- val notificationTypes = legacyUserSyncJSON.getInt (" notification_types" )
286
+ val notificationTypes = legacyUserSyncJSON.safeInt (" notification_types" )
286
287
287
288
val pushSubscriptionModel = SubscriptionModel ()
288
289
pushSubscriptionModel.id = legacyPlayerId
@@ -291,8 +292,8 @@ internal class OneSignalImp : IOneSignal, IServiceProvider {
291
292
notificationTypes != SubscriptionStatus .NO_PERMISSION .value && notificationTypes != SubscriptionStatus .UNSUBSCRIBE .value
292
293
pushSubscriptionModel.address =
293
294
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
296
297
297
298
pushSubscriptionModel.sdk = OneSignalUtils .SDK_VERSION
298
299
pushSubscriptionModel.deviceOS = Build .VERSION .RELEASE
0 commit comments