Skip to content

Commit ad89ea7

Browse files
Alexander Komissarovfacebook-github-bot
Alexander Komissarov
authored andcommitted
check if listener is still in the set before calling onHostResume
Reviewed By: achen1 Differential Revision: D6341419 fbshipit-source-id: e49188803bbf3641bad6a9cc8c497d453798bbce
1 parent 231c7a0 commit ad89ea7

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java

+14-10
Original file line numberDiff line numberDiff line change
@@ -141,16 +141,20 @@ public void addLifecycleEventListener(final LifecycleEventListener listener) {
141141
case BEFORE_RESUME:
142142
break;
143143
case RESUMED:
144-
runOnUiQueueThread(new Runnable() {
145-
@Override
146-
public void run() {
147-
try {
148-
listener.onHostResume();
149-
} catch (RuntimeException e) {
150-
handleException(e);
151-
}
152-
}
153-
});
144+
runOnUiQueueThread(
145+
new Runnable() {
146+
@Override
147+
public void run() {
148+
if (!mLifecycleEventListeners.contains(listener)) {
149+
return;
150+
}
151+
try {
152+
listener.onHostResume();
153+
} catch (RuntimeException e) {
154+
handleException(e);
155+
}
156+
}
157+
});
154158
break;
155159
default:
156160
throw new RuntimeException("Unhandled lifecycle state.");

0 commit comments

Comments
 (0)