diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java index 58ca6599796..dd7a0c1b2f3 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java @@ -163,7 +163,7 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { - reactApplicationContext.addLifecycleEventListenerAndCheckState(this); + reactApplicationContext.addLifecycleEventListener(this); } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java index 30d2de3f2f2..28d024fd4b0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java @@ -23,7 +23,6 @@ import com.facebook.react.bridge.queue.MessageQueueThread; import com.facebook.react.bridge.queue.ReactQueueConfiguration; import com.facebook.react.common.LifecycleState; import com.facebook.react.common.ReactConstants; -import com.facebook.react.common.annotations.VisibleForTesting; import com.facebook.react.config.ReactFeatureFlags; import java.lang.ref.WeakReference; import java.util.concurrent.CopyOnWriteArraySet; @@ -183,14 +182,9 @@ public class ReactContext extends ContextWrapper { return mLifecycleState; } - @VisibleForTesting public void addLifecycleEventListener(final LifecycleEventListener listener) { mLifecycleEventListeners.add(listener); - } - - public void addLifecycleEventListenerAndCheckState(final LifecycleEventListener listener) { - mLifecycleEventListeners.add(listener); - if (hasActiveCatalystInstance()) { + if (hasActiveCatalystInstance() || isBridgeless()) { switch (mLifecycleState) { case BEFORE_CREATE: case BEFORE_RESUME: diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java index 8f5f0cbb386..7d372c2e1eb 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -176,7 +176,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener { mEventDispatcher = eventDispatcher; mShouldDeallocateEventDispatcher = false; mEventBeatManager = eventBeatManager; - mReactApplicationContext.addLifecycleEventListenerAndCheckState(this); + mReactApplicationContext.addLifecycleEventListener(this); } public FabricUIManager( @@ -189,7 +189,7 @@ public class FabricUIManager implements UIManager, LifecycleEventListener { mEventDispatcher = new EventDispatcherImpl(reactContext); mShouldDeallocateEventDispatcher = true; mEventBeatManager = eventBeatManager; - mReactApplicationContext.addLifecycleEventListenerAndCheckState(this); + mReactApplicationContext.addLifecycleEventListener(this); } // TODO (T47819352): Rename this to startSurface for consistency with xplat/iOS diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java index c746918f09d..cf45e01e8c8 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java @@ -157,7 +157,7 @@ public class AccessibilityInfoModule extends NativeAccessibilityInfoSpec @Override public void initialize() { - getReactApplicationContext().addLifecycleEventListenerAndCheckState(this); + getReactApplicationContext().addLifecycleEventListener(this); updateAndSendTouchExplorationChangeEvent(mAccessibilityManager.isTouchExplorationEnabled()); updateAndSendReduceMotionChangeEvent(); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java index deca22cf138..b4337d0a512 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java @@ -68,7 +68,7 @@ public final class TimingModule extends NativeTimingSpec @Override public void initialize() { - getReactApplicationContext().addLifecycleEventListenerAndCheckState(this); + getReactApplicationContext().addLifecycleEventListener(this); HeadlessJsTaskContext headlessJsTaskContext = HeadlessJsTaskContext.getInstance(getReactApplicationContext()); headlessJsTaskContext.addTaskEventListener(this); diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java index 62082cbffa1..5662ccf89a6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java @@ -37,7 +37,7 @@ public class DeviceInfoModule extends NativeDeviceInfoSpec implements LifecycleE DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(reactContext); mFontScale = reactContext.getResources().getConfiguration().fontScale; mReactApplicationContext = reactContext; - mReactApplicationContext.addLifecycleEventListenerAndCheckState(this); + mReactApplicationContext.addLifecycleEventListener(this); } public DeviceInfoModule(Context context) { 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 55f5b0461df..918a30663dc 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 @@ -156,7 +156,7 @@ public class DialogModule extends NativeDialogManagerAndroidSpec implements Life @Override public void initialize() { - getReactApplicationContext().addLifecycleEventListenerAndCheckState(this); + getReactApplicationContext().addLifecycleEventListener(this); } @Override diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java index 188fbfa6015..2dc27d679cc 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java @@ -105,7 +105,7 @@ public class FrescoModule extends ReactContextBaseJavaModule @Override public void initialize() { super.initialize(); - getReactApplicationContext().addLifecycleEventListenerAndCheckState(this); + getReactApplicationContext().addLifecycleEventListener(this); if (!hasBeenInitialized()) { if (mConfig == null) { mConfig = getDefaultConfig(getReactApplicationContext()); diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java index 2e1493f3f43..15701d63618 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java @@ -56,8 +56,8 @@ public class ThemedReactContext extends ReactContext { } @Override - public void addLifecycleEventListenerAndCheckState(LifecycleEventListener listener) { - mReactApplicationContext.addLifecycleEventListenerAndCheckState(listener); + public void addLifecycleEventListener(LifecycleEventListener listener) { + mReactApplicationContext.addLifecycleEventListener(listener); } @Override diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java index 182c04fb840..1d49251377d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java @@ -158,7 +158,7 @@ public class UIManagerModule extends ReactContextBaseJavaModule mEventDispatcher, minTimeLeftInFrameForNonBatchedOperationMs); - reactContext.addLifecycleEventListenerAndCheckState(this); + reactContext.addLifecycleEventListener(this); } @Deprecated @@ -180,7 +180,7 @@ public class UIManagerModule extends ReactContextBaseJavaModule mEventDispatcher, minTimeLeftInFrameForNonBatchedOperationMs); - reactContext.addLifecycleEventListenerAndCheckState(this); + reactContext.addLifecycleEventListener(this); } /** diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.java index 8e3ded74b1d..a99d6b1eb31 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/EventDispatcherImpl.java @@ -104,7 +104,7 @@ public class EventDispatcherImpl implements EventDispatcher, LifecycleEventListe public EventDispatcherImpl(ReactApplicationContext reactContext) { mReactContext = reactContext; - mReactContext.addLifecycleEventListenerAndCheckState(this); + mReactContext.addLifecycleEventListener(this); mReactEventEmitter = new ReactEventEmitter(mReactContext); }