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 ac70eff2adc..145f1a28e8c 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().addLifecycleEventListener(this); + getReactApplicationContext().addLifecycleEventListenerAndCheckState(this); if (!hasBeenInitialized()) { if (mConfig == null) { mConfig = getDefaultConfig(getReactApplicationContext()); @@ -194,4 +194,14 @@ public class FrescoModule extends ReactContextBaseJavaModule } return mImagePipeline; } + + @Override + public void onCatalystInstanceDestroy() { + super.onCatalystInstanceDestroy(); + + ReactApplicationContext applicationContext = getReactApplicationContextIfActiveOrWarn(); + if (applicationContext != null) { + applicationContext.removeLifecycleEventListener(this); + } + } }