From 6b79c14e338b6fbf59281c5fc80b3bae00a2a18d Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Tue, 9 Jan 2024 19:07:01 -0800 Subject: [PATCH] Refactor: ReactHost: Rename {new,old}Start to {new,old}GetOrCreateStartTask (#42166) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/42166 Changelog: [Internal] Reviewed By: mdvacca Differential Revision: D52495535 fbshipit-source-id: 736e2c512710db0a51a5370a4f7e97ea87a7ce23 --- .../facebook/react/runtime/ReactHostImpl.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java index 38a58ccd863..7a76b8176d3 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java @@ -202,10 +202,10 @@ public class ReactHostImpl implements ReactHost { @Override public TaskInterface start() { if (ReactFeatureFlags.enableBridgelessArchitectureNewCreateReloadDestroy) { - return newStart(); + return newGetOrCreateStartTask(); } - return oldStart(); + return oldGetOrCreateStartTask(); } /** Initialize and run a React Native surface in a background without mounting real views. */ @@ -719,8 +719,8 @@ public class ReactHostImpl implements ReactHost { @ThreadConfined("ReactHost") private @Nullable Task mStartTask = null; - private Task oldStart() { - final String method = "oldStart()"; + private Task oldGetOrCreateStartTask() { + final String method = "oldGetOrCreateStartTask()"; return Task.call( () -> { if (mStartTask == null) { @@ -731,7 +731,8 @@ public class ReactHostImpl implements ReactHost { task -> { if (task.isFaulted()) { destroy( - "oldStart() failure: " + task.getError().getMessage(), + "oldGetOrCreateStartTask() failure: " + + task.getError().getMessage(), task.getError()); mReactHostDelegate.handleInstanceException(task.getError()); } @@ -747,8 +748,8 @@ public class ReactHostImpl implements ReactHost { .continueWithTask(Task::getResult); } - private Task newStart() { - final String method = "newStart()"; + private Task newGetOrCreateStartTask() { + final String method = "newGetOrCreateStartTask()"; return Task.call( () -> { if (mStartTask == null) { @@ -761,7 +762,8 @@ public class ReactHostImpl implements ReactHost { mReactHostDelegate.handleInstanceException(task.getError()); // Wait for destroy to finish return newGetOrCreateDestroyTask( - "newStart() failure: " + task.getError().getMessage(), + "newGetOrCreateStartTask() failure: " + + task.getError().getMessage(), task.getError()) .continueWithTask(destroyTask -> Task.forError(task.getError())) .makeVoid();