diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java index c7c86dcff0b..99b47bbb510 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java @@ -9,6 +9,7 @@ package com.facebook.react.devsupport; +import android.app.Activity; import android.app.ActivityManager; import android.app.AlertDialog; import android.content.BroadcastReceiver; @@ -371,8 +372,8 @@ public class DevSupportManagerImpl implements @Override public void run() { if (mRedBoxDialog == null) { - Context context = mReactInstanceManagerHelper.getCurrentActivity(); - if (context == null) { + Activity context = mReactInstanceManagerHelper.getCurrentActivity(); + if (context == null || context.isFinishing()) { FLog.e(ReactConstants.TAG, "Unable to launch redbox because react activity " + "is not available, here is the error that redbox would've displayed: " + message); return; @@ -518,8 +519,8 @@ public class DevSupportManagerImpl implements final DevOptionHandler[] optionHandlers = options.values().toArray(new DevOptionHandler[0]); - Context context = mReactInstanceManagerHelper.getCurrentActivity(); - if (context == null) { + Activity context = mReactInstanceManagerHelper.getCurrentActivity(); + if (context == null || context.isFinishing()) { FLog.e(ReactConstants.TAG, "Unable to launch dev options menu because react activity " + "isn't available"); return;