From 10830f4db94969b83b4e751be5429cc2fcacd8f0 Mon Sep 17 00:00:00 2001
From: Lulu Wu <luluwu@fb.com>
Date: Wed, 31 Mar 2021 09:38:14 -0700
Subject: [PATCH] Remove redundant isBridgeless() checking

Summary:
3rd step of following 3 steps:

1, Rename hasActiveCatalystInstance() to hasActiveReactInstance() so it won't sounds like CatalystInstance-only. D27335055 (https://github.com/facebook/react-native/commit/dfa8eb0558338f18ea01f294a64d355f6deeff06)
2, Implement hasActiveReactInstance() for Venice. D27343867
3, Remove previous mitigation. D27343952

Changelog:
[Category][Type] - Remove isBridgeless() mitigation

Reviewed By: mdvacca

Differential Revision: D27343952

fbshipit-source-id: 158175e58d0f4248623d369793e919e43e8ad972
---
 .../facebook/react/bridge/ReactContextBaseJavaModule.java   | 3 +--
 .../facebook/react/devsupport/DevSupportManagerBase.java    | 3 +--
 .../com/facebook/react/modules/dialog/DialogModule.java     | 6 ++----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java
index ecae0c9ed5a..277f6fb4224 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java
@@ -52,8 +52,7 @@ public abstract class ReactContextBaseJavaModule extends BaseJavaModule {
    */
   @ThreadConfined(ANY)
   protected @Nullable final ReactApplicationContext getReactApplicationContextIfActiveOrWarn() {
-    if (mReactApplicationContext.hasActiveReactInstance()
-        || mReactApplicationContext.isBridgeless()) {
+    if (mReactApplicationContext.hasActiveReactInstance()) {
       return mReactApplicationContext;
     }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java
index 694724292b4..2932fecc5da 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java
@@ -914,8 +914,7 @@ public abstract class DevSupportManagerBase
                         });
 
                     @Nullable ReactContext context = mCurrentContext;
-                    if (context == null
-                        || (!context.isBridgeless() && !context.hasActiveReactInstance())) {
+                    if (context == null || !context.hasActiveReactInstance()) {
                       return;
                     }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
index 78b91ee2bd0..8a111555e5e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
@@ -129,8 +129,7 @@ public class DialogModule extends NativeDialogManagerAndroidSpec implements Life
     @Override
     public void onClick(DialogInterface dialog, int which) {
       if (!mCallbackConsumed) {
-        if (getReactApplicationContext().isBridgeless()
-            || getReactApplicationContext().hasActiveReactInstance()) {
+        if (getReactApplicationContext().hasActiveReactInstance()) {
           mCallback.invoke(ACTION_BUTTON_CLICKED, which);
           mCallbackConsumed = true;
         }
@@ -140,8 +139,7 @@ public class DialogModule extends NativeDialogManagerAndroidSpec implements Life
     @Override
     public void onDismiss(DialogInterface dialog) {
       if (!mCallbackConsumed) {
-        if (getReactApplicationContext().isBridgeless()
-            || getReactApplicationContext().hasActiveReactInstance()) {
+        if (getReactApplicationContext().hasActiveReactInstance()) {
           mCallback.invoke(ACTION_DISMISSED);
           mCallbackConsumed = true;
         }