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 (dfa8eb0558)
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
This commit is contained in:
Lulu Wu 2021-03-31 09:38:14 -07:00 коммит произвёл Facebook GitHub Bot
Родитель dfa8eb0558
Коммит 10830f4db9
3 изменённых файлов: 4 добавлений и 8 удалений

Просмотреть файл

@ -52,8 +52,7 @@ public abstract class ReactContextBaseJavaModule extends BaseJavaModule {
*/ */
@ThreadConfined(ANY) @ThreadConfined(ANY)
protected @Nullable final ReactApplicationContext getReactApplicationContextIfActiveOrWarn() { protected @Nullable final ReactApplicationContext getReactApplicationContextIfActiveOrWarn() {
if (mReactApplicationContext.hasActiveReactInstance() if (mReactApplicationContext.hasActiveReactInstance()) {
|| mReactApplicationContext.isBridgeless()) {
return mReactApplicationContext; return mReactApplicationContext;
} }

Просмотреть файл

@ -914,8 +914,7 @@ public abstract class DevSupportManagerBase
}); });
@Nullable ReactContext context = mCurrentContext; @Nullable ReactContext context = mCurrentContext;
if (context == null if (context == null || !context.hasActiveReactInstance()) {
|| (!context.isBridgeless() && !context.hasActiveReactInstance())) {
return; return;
} }

Просмотреть файл

@ -129,8 +129,7 @@ public class DialogModule extends NativeDialogManagerAndroidSpec implements Life
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
if (!mCallbackConsumed) { if (!mCallbackConsumed) {
if (getReactApplicationContext().isBridgeless() if (getReactApplicationContext().hasActiveReactInstance()) {
|| getReactApplicationContext().hasActiveReactInstance()) {
mCallback.invoke(ACTION_BUTTON_CLICKED, which); mCallback.invoke(ACTION_BUTTON_CLICKED, which);
mCallbackConsumed = true; mCallbackConsumed = true;
} }
@ -140,8 +139,7 @@ public class DialogModule extends NativeDialogManagerAndroidSpec implements Life
@Override @Override
public void onDismiss(DialogInterface dialog) { public void onDismiss(DialogInterface dialog) {
if (!mCallbackConsumed) { if (!mCallbackConsumed) {
if (getReactApplicationContext().isBridgeless() if (getReactApplicationContext().hasActiveReactInstance()) {
|| getReactApplicationContext().hasActiveReactInstance()) {
mCallback.invoke(ACTION_DISMISSED); mCallback.invoke(ACTION_DISMISSED);
mCallbackConsumed = true; mCallbackConsumed = true;
} }