Skip to content

Don't resume the new context without an Activity after a reload on Android #59474

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
lazerg wants to merge 1 commit into from
Closed

Don't resume the new context without an Activity after a reload on Android #59474

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,7 @@ public class ReactHostImpl(
* Native is reloading, it seems reasonable to assume that: (1) We must have navigated to a
* React Native screen in the past, or (2) We must be on a React Native screen.
*/
if (isReloading && !isManagerResumed) {
if (isReloading && !isManagerResumed && currentActivity != null) {
reactLifecycleStateManager.moveToOnHostResume(reactContext, currentActivity)
} else {
/**
Expand Down
34 changes: 34 additions & 0 deletions packages/react-native/ReactAndroid/src/test/java/com/facebook/react/runtime/ReactHostTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,4 +168,38 @@ class ReactHostTest {
reactHost.onHostDestroy(activityController.get())
assertThat(reactHost.lifecycleState).isEqualTo(LifecycleState.BEFORE_CREATE)
}

@Test
fun testActivityDestroyedDuringReload() {
val bgTasks = ArrayDeque<Runnable>()
reactHost =
spy(
ReactHostImpl(
activityController.get().application,
reactHostDelegate,
mock(),
{ bgTasks.add(it) },
Task.IMMEDIATE_EXECUTOR,
false /* allowPackagerServerAccess */,
false /* useDevSupport */,
),
)
doReturn(null).whenever(reactHost).getOrCreateReactHostInspectorTarget()
doNothing().whenever(reactHost).unregisterInstanceFromInspector(any())

reactHost.start()
while (bgTasks.isNotEmpty()) bgTasks.removeFirst().run()
reactHost.onHostResume(activityController.get())

reactHost.reload("Reload from testing infra")
reactHost.onHostPause(activityController.get())
reactHost.onHostDestroy(activityController.get())
while (bgTasks.isNotEmpty()) bgTasks.removeFirst().run()
assertThat(reactHost.lifecycleState).isEqualTo(LifecycleState.BEFORE_CREATE)

val newActivity = Robolectric.buildActivity(Activity::class.java).create().start().resume()
reactHost.onHostResume(newActivity.get())
val newReactContext = mockedBridgelessReactContextCtor.constructed().last()
verify(newReactContext).onHostResume(newActivity.get())
}
}
Loading