hotfix/cp-11566-push-delivery-issues-swp-twipe-report#349
Merged
snuricp merged 3 commits intoMay 18, 2026
Conversation
Improve FCM token sync reliability and stale token recovery
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes using default mode and found 1 potential issue.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit bcaf97a. Configure here.
Fixed FCM token retry logic by separating locally cached tokens from successfully synced server tokens.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

Improve FCM token sync reliability and stale token recovery
Note
Medium Risk
Changes FCM token persistence and sync conditions, which can affect subscription state and push delivery if the new comparison/persistence logic misbehaves. Risk is mitigated by keeping the old local token key and only adding a new synced-token marker.
Overview
Improves FCM token rotation/stale-token recovery by separating the latest locally seen token from the last successfully synced token.
SubscriptionManagerFCM.checkChangedPushTokennow compares againstSYNCED_FCM_TOKENand triggers a resync when the token is forced, missing, or changed, updating bothFCM_TOKENandSYNCED_FCM_TOKENonly after a successful server sync (with clearer logging and failure reporting).CleverPushFcmListenerService.onNewTokennow immediately caches the new token locally and, when a subscription exists, routes the update throughgetChannelConfig→checkChangedPushTokento ensure the server is brought in sync.Reviewed by Cursor Bugbot for commit 64829a4. Bugbot is set up for automated code reviews on this repo. Configure here.
Summary by cubic
Separates the local cached FCM token from the last successfully synced token to improve rotation handling and automatic recovery. Reduces push delivery failures reported in CP-11566 (SWP/Twipe).
SubscriptionManagerFCM.checkChangedPushToken, compare againstSYNCED_FCM_TOKEN(new) instead of localFCM_TOKEN; sync when forced/missing/changed; skip only if no token yet; on success updateFCM_TOKENandSYNCED_FCM_TOKEN; clearer logs and errors.CleverPushFcmListenerService.onNewToken, cache the latest token inFCM_TOKENimmediately (even without a subscription), then load config and callcheckChangedPushTokenfor server sync.Written for commit 64829a4. Summary will update on new commits.