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; }