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 3caf5efad..532c22632 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java @@ -147,6 +147,10 @@ public class ReactContext extends ContextWrapper { return mCatalystInstance != null && !mCatalystInstance.isDestroyed(); } + public boolean hasCatalystInstance() { + return mCatalystInstance != null; + } + public LifecycleState getLifecycleState() { return mLifecycleState; } diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java index e061c1134..fdeb2c812 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java @@ -30,7 +30,9 @@ public class ThemedReactContext extends ReactContext { public ThemedReactContext(ReactApplicationContext reactApplicationContext, Context base) { super(base); - initializeWithInstance(reactApplicationContext.getCatalystInstance()); + if (reactApplicationContext.hasCatalystInstance()) { + initializeWithInstance(reactApplicationContext.getCatalystInstance()); + } mReactApplicationContext = reactApplicationContext; }