Fix more warnings on bridge invalidation

Summary: Looked at the top soft exceptions firing from this codepath. Most of these should use `getReactApplicationContext` instead of `getReactApplicationContextIfActiveOrWarn` to do their cleanup on invalidation. Changelog: [Internal] Reviewed By: NickGerleman Differential Revision: D43661307 fbshipit-source-id: 27094a6e8dfcf4748eb916531c4998f1c9ee8713
facebook · Mar 28, 2023 · 4a2d125 · 4a2d125
1 parent f713bdb
commit 4a2d125
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 20 deletions.
diff --git a/...d/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java b/...d/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java
@@ -194,12 +194,8 @@ public void initialize() {
 
   @Override
   public void invalidate() {
+    getReactApplicationContext().removeLifecycleEventListener(this);
     super.invalidate();
-
-    ReactApplicationContext applicationContext = getReactApplicationContextIfActiveOrWarn();
-    if (applicationContext != null) {
-      applicationContext.removeLifecycleEventListener(this);
-    }
   }
 
   @Override

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
@@ -234,11 +234,7 @@ public void run() {
 
   @Override
   public void invalidate() {
+    getReactApplicationContext().removeLifecycleEventListener(this);
     super.invalidate();
-
-    ReactApplicationContext applicationContext = getReactApplicationContextIfActiveOrWarn();
-    if (applicationContext != null) {
-      applicationContext.removeLifecycleEventListener(this);
-    }
   }
 }
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
@@ -7,7 +7,6 @@
 
 package com.facebook.react.modules.fresco;
 
-import android.content.Context;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.drawee.backends.pipeline.Fresco;
@@ -127,13 +126,14 @@ public FrescoModule(
   @Override
   public void initialize() {
     super.initialize();
-    getReactApplicationContext().addLifecycleEventListener(this);
+
+    ReactApplicationContext reactContext = getReactApplicationContext();
+    reactContext.addLifecycleEventListener(this);
     if (!hasBeenInitialized()) {
       if (mConfig == null) {
-        mConfig = getDefaultConfig(getReactApplicationContext());
+        mConfig = getDefaultConfig(reactContext);
       }
-      Context context = getReactApplicationContext().getApplicationContext();
-      Fresco.initialize(context, mConfig);
+      Fresco.initialize(reactContext.getApplicationContext(), mConfig);
       sHasBeenInitialized = true;
     } else if (mConfig != null) {
       FLog.w(
@@ -219,11 +219,7 @@ private ImagePipeline getImagePipeline() {
 
   @Override
   public void invalidate() {
+    getReactApplicationContext().removeLifecycleEventListener(this);
     super.invalidate();
-
-    ReactApplicationContext applicationContext = getReactApplicationContextIfActiveOrWarn();
-    if (applicationContext != null) {
-      applicationContext.removeLifecycleEventListener(this);
-    }
   }
 }