diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java index a6ab8fd65..fbf8925cb 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java @@ -40,6 +40,7 @@ public interface CatalystInstance extends MemoryPressureListener { */ void destroy(); boolean isDestroyed(); + boolean isAcceptingCalls(); /** * Initialize all the native modules 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 674655b99..35ec76084 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java @@ -143,7 +143,7 @@ public class ReactContext extends ContextWrapper { } public boolean hasActiveCatalystInstance() { - return mCatalystInstance != null && !mCatalystInstance.isDestroyed(); + return mCatalystInstance != null && mCatalystInstance.isAcceptingCalls(); } public LifecycleState getLifecycleState() { diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java index 3fe348bc5..fad0ff908 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java @@ -55,9 +55,6 @@ public class CatalystInstanceImpl implements CatalystInstance { SoLoader.loadLibrary(REACT_NATIVE_LIB); } - private static final int BRIDGE_SETUP_TIMEOUT_MS = 30000; - private static final int LOAD_JS_BUNDLE_TIMEOUT_MS = 30000; - private static final AtomicInteger sNextInstanceIdForTrace = new AtomicInteger(1); // Access from any thread @@ -247,6 +244,11 @@ public class CatalystInstanceImpl implements CatalystInstance { return mDestroyed; } + @Override + public boolean isAcceptingCalls() { + return !mDestroyed && mAcceptCalls; + } + /** * Initialize all the native modules */