Always retrieve push token

Motivation: in-line with how we did things prior to user model Fixes issue where FCM project is changed and push token is not updated on subscribed devices
OneSignal · Jun 3, 2024 · 542d4e6 · 542d4e6
1 parent ef9e15e
commit 542d4e6
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/...rc/main/java/com/onesignal/notifications/internal/listeners/DeviceRegistrationListener.kt b/...rc/main/java/com/onesignal/notifications/internal/listeners/DeviceRegistrationListener.kt
@@ -69,21 +69,13 @@ internal class DeviceRegistrationListener(
     private fun retrievePushTokenAndUpdateSubscription() {
         val pushSubscription = _subscriptionManager.subscriptions.push
 
-        if (pushSubscription.token.isNotEmpty()) {
+        suspendifyOnThread {
+            val pushTokenAndStatus = _pushTokenManager.retrievePushToken()
             val permission = _notificationsManager.permission
             _subscriptionManager.addOrUpdatePushSubscriptionToken(
-                null,
-                if (permission) SubscriptionStatus.SUBSCRIBED else SubscriptionStatus.NO_PERMISSION,
+                pushTokenAndStatus.token,
+                if (permission) pushTokenAndStatus.status else SubscriptionStatus.NO_PERMISSION,
             )
-        } else {
-            suspendifyOnThread {
-                val pushTokenAndStatus = _pushTokenManager.retrievePushToken()
-                val permission = _notificationsManager.permission
-                _subscriptionManager.addOrUpdatePushSubscriptionToken(
-                    pushTokenAndStatus.token,
-                    if (permission) pushTokenAndStatus.status else SubscriptionStatus.NO_PERMISSION,
-                )
-            }
         }
     }