Merge pull request #2118 from OneSignal/fix/fcm-push-token-bug

Always retrieve push token
OneSignal · Jun 7, 2024 · f2e3c11 · f2e3c11
2 parents 50acb5a + 542d4e6
commit f2e3c11
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,
-                )
-            }
         }
     }