Merge pull request #1986 from OneSignal/Add_default_value_for_notification_types

Add default value to legacy notification types

Author: jinliu9508

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

@@ -9,6 +9,7 @@ import com.onesignal.common.IDManager
 import com.onesignal.common.OneSignalUtils
 import com.onesignal.common.modeling.ModelChangeTags
 import com.onesignal.common.modules.IModule
+import com.onesignal.common.safeInt
 import com.onesignal.common.safeString
 import com.onesignal.common.services.IServiceProvider
 import com.onesignal.common.services.ServiceBuilder
@@ -277,7 +278,7 @@ internal class OneSignalImp : IOneSignal, IServiceProvider {
 
                     if (legacyUserSyncString != null) {
                         val legacyUserSyncJSON = JSONObject(legacyUserSyncString)
-                        val notificationTypes = legacyUserSyncJSON.getInt("notification_types")
+                        val notificationTypes = legacyUserSyncJSON.safeInt("notification_types")
 
                         val pushSubscriptionModel = SubscriptionModel()
                         pushSubscriptionModel.id = legacyPlayerId
@@ -286,8 +287,8 @@ internal class OneSignalImp : IOneSignal, IServiceProvider {
                             notificationTypes != SubscriptionStatus.NO_PERMISSION.value && notificationTypes != SubscriptionStatus.UNSUBSCRIBE.value
                         pushSubscriptionModel.address =
                             legacyUserSyncJSON.safeString("identifier") ?: ""
-                        pushSubscriptionModel.status = SubscriptionStatus.fromInt(notificationTypes)
-                            ?: SubscriptionStatus.NO_PERMISSION
+                        if (notificationTypes != null)
+                            pushSubscriptionModel.status = SubscriptionStatus.fromInt(notificationTypes) ?: SubscriptionStatus.NO_PERMISSION
 
                         pushSubscriptionModel.sdk = OneSignalUtils.SDK_VERSION
                         pushSubscriptionModel.deviceOS = Build.VERSION.RELEASE