assertion in caller

facebook · Jun 11, 2024 · e6a722d · e6a722d
1 parent a237918
commit e6a722d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/...ages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/...ages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -1284,7 +1284,7 @@ private void attachRootViewToInstance(final ReactRoot reactRoot) {
       rootTag =
           uiManager.startSurface(
               reactRoot.getRootViewGroup(),
-              reactRoot.getJSModuleName(),
+              Assertions.assertNotNull(reactRoot.getJSModuleName()),
               initialProperties == null
                   ? new WritableNativeMap()
                   : Arguments.fromBundle(initialProperties),

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -435,7 +435,9 @@ public void run() {
     if (mShouldLogContentAppeared) {
       mShouldLogContentAppeared = false;
       String jsModuleName = getJSModuleName();
-      ReactMarker.logMarker(ReactMarkerConstants.CONTENT_APPEARED, jsModuleName, mRootViewTag);
+      if (jsModuleName != null) {
+        ReactMarker.logMarker(ReactMarkerConstants.CONTENT_APPEARED, jsModuleName, mRootViewTag);
+      }
     }
   }
 
@@ -630,7 +632,7 @@ public void setEventListener(@Nullable ReactRootViewEventListener eventListener)
 
   @Override
   public String getJSModuleName() {
-    return Assertions.assertNotNull(mJSModuleName);
+    return mJSModuleName;
   }
 
   @Override
@@ -665,7 +667,7 @@ public void runApplication() {
       }
 
       CatalystInstance catalystInstance = reactContext.getCatalystInstance();
-      String jsAppModuleName = getJSModuleName();
+      String jsAppModuleName = Assertions.assertNotNull(getJSModuleName());
 
       if (mWasMeasured) {
         updateRootLayoutSpecs(true, mWidthMeasureSpec, mHeightMeasureSpec);

diff --git a/...es/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/...es/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
@@ -32,6 +32,7 @@
 import com.facebook.common.logging.FLog;
 import com.facebook.debug.holder.PrinterHolder;
 import com.facebook.debug.tags.ReactDebugOverlayTags;
+import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.proguard.annotations.DoNotStripAny;
 import com.facebook.react.bridge.ColorPropConverter;
@@ -255,7 +256,7 @@ public <T extends View> int addRootView(final T rootView, final WritableMap init
         new ThemedReactContext(
             mReactApplicationContext, rootView.getContext(), reactRootView.getSurfaceID(), rootTag);
     mMountingManager.startSurface(rootTag, reactContext, rootView);
-    String moduleName = reactRootView.getJSModuleName();
+    String moduleName = Assertions.assertNotNull(reactRootView.getJSModuleName());
     if (ENABLE_FABRIC_LOGS) {
       FLog.d(TAG, "Starting surface for module: %s and reactTag: %d", moduleName, rootTag);
     }

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRoot.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactRoot.java
@@ -28,6 +28,7 @@ public interface ReactRoot {
   @Nullable
   Bundle getAppProperties();
 
+  @Nullable
   String getJSModuleName();
 
   /** Fabric or Default UI Manager, see {@link UIManagerType} */