From e6a722d84f51107269c6fbe57f169e69d33af088 Mon Sep 17 00:00:00 2001
From: Kudo Chien <ckchien@gmail.com>
Date: Tue, 11 Jun 2024 22:30:41 +0800
Subject: [PATCH] assertion in caller

---
 .../java/com/facebook/react/ReactInstanceManager.java     | 2 +-
 .../src/main/java/com/facebook/react/ReactRootView.java   | 8 +++++---
 .../java/com/facebook/react/fabric/FabricUIManager.java   | 3 ++-
 .../main/java/com/facebook/react/uimanager/ReactRoot.java | 1 +
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index 41c3e9f086e1d2..d367ffb52d067d 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/packages/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
index 58570c0bcfc4d0..75f64dfcc76b45 100644
--- 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/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
index 6c28d95ffa6744..91de40cc59be09 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
+++ b/packages/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
index 5db5a41da2c986..c4009d9fbaa389 100644
--- 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} */