From 46dc46a3b30ae54def63a0783b1dbf508d202955 Mon Sep 17 00:00:00 2001 From: Felix Oghina Date: Mon, 8 Aug 2016 09:01:15 -0700 Subject: [PATCH] clear mCurrentActivity in onHostDestroy Summary: It doesn't make sense to clear mCurrentActivity in onHostPause -- we're not going to leak a paused activity. Only keeping it around after onDestroy could lead to leaks. This allows us to check the source of lifecycle events and only send them if they come from the current activity (upcoming diff). Reviewed By: astreet Differential Revision: D3655370 fbshipit-source-id: f54b04a95c5c090636219832e63a348f3ae5a5c3 --- .../main/java/com/facebook/react/XReactInstanceManagerImpl.java | 1 - .../src/main/java/com/facebook/react/bridge/ReactContext.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManagerImpl.java index 5c8aa8b9224..400af02e71c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManagerImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManagerImpl.java @@ -487,7 +487,6 @@ import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE; } moveToBeforeResumeLifecycleState(); - mCurrentActivity = null; } /** 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 430e0cab702..e96dbc3abf3 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java @@ -178,7 +178,6 @@ public class ReactContext extends ContextWrapper { for (LifecycleEventListener listener : mLifecycleEventListeners) { listener.onHostPause(); } - mCurrentActivity = null; } /** @@ -189,6 +188,7 @@ public class ReactContext extends ContextWrapper { for (LifecycleEventListener listener : mLifecycleEventListeners) { listener.onHostDestroy(); } + mCurrentActivity = null; } /**