Android TM: create TurboModuleManager earlier

Summary: Some TM lookup from native will fail assertion if done too early, because TM Manager is not initialized yet. Reviewed By: mdvacca Differential Revision: D15872776 fbshipit-source-id: 7616c1424816f73a45aa1d9723e7807ae10392a7
facebook · Jun 18, 2019 · e6f28bb · e6f28bb
1 parent 2df9073
commit e6f28bb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -52,6 +52,7 @@
 import com.facebook.react.bridge.CatalystInstanceImpl;
 import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.JSIModulePackage;
+import com.facebook.react.bridge.JSIModuleType;
 import com.facebook.react.bridge.JavaJSExecutor;
 import com.facebook.react.bridge.JavaScriptExecutor;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
@@ -71,6 +72,7 @@
 import com.facebook.react.common.LifecycleState;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.annotations.VisibleForTesting;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.devsupport.DevSupportManagerFactory;
 import com.facebook.react.devsupport.ReactInstanceManagerDevHelper;
 import com.facebook.react.devsupport.RedBoxHandler;
@@ -1006,6 +1008,11 @@ private void setupReactContext(final ReactApplicationContext reactContext) {
           Assertions.assertNotNull(reactContext.getCatalystInstance());
 
       catalystInstance.initialize();
+
+      if (ReactFeatureFlags.useTurboModules) {
+        catalystInstance.setTurboModuleManager(catalystInstance.getJSIModule(JSIModuleType.TurboModuleManager));
+      }
+
       mDevSupportManager.onNewReactContextCreated(reactContext);
       mMemoryPressureRouter.addMemoryPressureListener(catalystInstance);
       moveReactContextToCurrentLifecycleState();
@@ -1158,7 +1165,6 @@ private ReactApplicationContext createReactContext(
       catalystInstance.addJSIModules(mJSIModulePackage
         .getJSIModules(reactContext, catalystInstance.getJavaScriptContextHolder()));
     }
-
     if (mBridgeIdleDebugListener != null) {
       catalystInstance.addBridgeIdleDebugListener(mBridgeIdleDebugListener);
     }
@@ -1172,7 +1178,6 @@ private ReactApplicationContext createReactContext(
 
     reactContext.initializeWithInstance(catalystInstance);
 
-
     return reactContext;
   }
 

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
@@ -118,5 +118,5 @@ void callFunction(
    * to CatalystInstance so that getNativeModule, hasNativeModule, and
    * getNativeModules can also return TurboModules.
    */
-  void setTurboModuleRegistry(TurboModuleRegistry getter);
+  void setTurboModuleManager(JSIModule getter);
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
@@ -536,8 +536,8 @@ public void run() {
     }
   }
 
-  public void setTurboModuleRegistry(TurboModuleRegistry getter) {
-    mTurboModuleRegistry = getter;
+  public void setTurboModuleManager(JSIModule getter) {
+    mTurboModuleRegistry = (TurboModuleRegistry)getter;
   }
 
   private void decrementPendingJSCalls() {