Repository navigation
fix(android): tie observer cleanup to the React module lifetime - #1977
Merged
fadi-george merged 3 commits intoAug 31, 2026
Merged
fadi-george merged 3 commits into
fadi-george merged 3 commits into
Conversation
…idate Invalidate only released one of the two notification caches, so events retained by preventDefault survived teardown and any thread parked in onWillDisplay was never woken. Guard both caches behind a single lock, wake pending waiters, and swap the static instance atomically so a concurrent reload cannot clear a newer live module. Co-authored-by: Cursor <cursoragent@cursor.com>
Emulator testing showed the activity lifecycle listener was the only cause of lost observers. The cache locking, waiter wake-up and eviction changes were never reproduced and reworked the notification delivery path, so revert them. Invalidate still clears both notification caches and releases the static instance. Co-authored-by: Cursor <cursoragent@cursor.com>
fadi-george
force-pushed
the
codex/onesignal-android-module-lifetime
branch
from
August 31, 2026 21:50
9242858 to
54aee2b
Compare
fadi-george
approved these changes
Aug 31, 2026
Merged
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.
Description
One Line Summary
Remove the activity lifecycle listener, whose destroy callback removed observers even while the React instance remained usable. Keep cleanup in invalidate and release retained notification events and the current static instance there.
Compatibility and observable changes
Observers remain available across host activity recreation until module invalidation. Invalidating an old module does not clear a newer current instance. No JS API changes.
Details
Motivation
The source audit reproduced the failure paths described below. This PR contains only the associated fix; unrelated audit changes are in separate PRs.
Scope
android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.javaTesting
Compiled actual constructor/invalidate methods and activity lifecycle reproduction; checked ReactContext and LifecycleEventListener source to distinguish activity destruction from React instance invalidation.
Each code/tooling fix was also applied independently to upstream commit
a70312207cf094ac361eaa9196c317acb175c2cdand passed its targeted external actual-source diagnostics. Documentation snippets were checked separately. Native diagnostic harnesses use bridge/SDK doubles and are not an end-to-end push test.On the combined audit branch:
vp check: formatting, lint and type checks pass; native Spotless check passes.No checked-in test files were added or modified; regression evidence comes from external diagnostic harnesses and the existing suite. No physical-device, live notification delivery, Appium/BrowserStack, or release-workflow execution is claimed. The no-location example's stale native lock was updated locally to resolve the current SDK for verification; generated locks are not part of this PR.
Checklist