Skip to content

fix race condition in IntentModule.mInitialURLListener #46499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sammy-SC wants to merge 1 commit into from
Closed

fix race condition in IntentModule.mInitialURLListener #46499

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions ...act-native/ReactAndroid/src/main/java/com/facebook/react/modules/intent/IntentModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,11 @@ public IntentModule(ReactApplicationContext reactContext) {

@Override
public void invalidate() {
if (mInitialURLListener != null) {
getReactApplicationContext().removeLifecycleEventListener(mInitialURLListener);
mInitialURLListener = null;
synchronized (this) {
if (mInitialURLListener != null) {
getReactApplicationContext().removeLifecycleEventListener(mInitialURLListener);
mInitialURLListener = null;
}
}
super.invalidate();
}
Expand Down Expand Up @@ -79,7 +81,7 @@ public void getInitialURL(Promise promise) {
}
}

private void waitForActivityAndGetInitialURL(final Promise promise) {
private synchronized void waitForActivityAndGetInitialURL(final Promise promise) {
if (mInitialURLListener != null) {
promise.reject(
new IllegalStateException(
Expand All @@ -94,7 +96,9 @@ public void onHostResume() {
getInitialURL(promise);

getReactApplicationContext().removeLifecycleEventListener(this);
mInitialURLListener = null;
synchronized (IntentModule.this) {
mInitialURLListener = null;
}
}

@Override
Expand Down