From 4ccd14f31ae0d2440598ef3dddae69a3d91e8f48 Mon Sep 17 00:00:00 2001 From: Yibin Chen Date: Mon, 18 Jul 2016 16:24:54 -0700 Subject: [PATCH] Integrating AutoUpdater's custom JS Bundle loading into Fb4a Reviewed By: AaaChiuuu Differential Revision: D3558831 fbshipit-source-id: b3909de774922fae903f3e8718fbfcd9b1ece2f8 --- .../java/com/facebook/react/ReactInstanceManager.java | 5 +++++ .../java/com/facebook/react/ReactInstanceManagerImpl.java | 5 +++++ .../com/facebook/react/XReactInstanceManagerImpl.java | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index 02bfb32c8..4aa08512f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -127,6 +127,11 @@ public abstract class ReactInstanceManager { */ public abstract String getSourceUrl(); + /** + * The JS Bundle file that this Instance Manager was constructed with. + */ + public abstract @Nullable String getJSBundleFile(); + /** * Attach given {@param rootView} to a catalyst instance manager and start JS application using * JS module provided by {@link ReactRootView#getJSModuleName}. If the react context is currently diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerImpl.java index 7da997411..d33fd10d2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerImpl.java @@ -629,6 +629,11 @@ import static com.facebook.react.bridge.ReactMarkerConstants.RUN_JS_BUNDLE_START return Assertions.assertNotNull(mSourceUrl); } + @Override + public @Nullable String getJSBundleFile() { + return mJSBundleFile; + } + /** * Attach given {@param rootView} to a catalyst instance manager and start JS application using * JS module provided by {@link ReactRootView#getJSModuleName}. If the react context is currently diff --git a/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManagerImpl.java index ee29bc079..adc4ff8d4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManagerImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManagerImpl.java @@ -610,6 +610,14 @@ import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE; return Assertions.assertNotNull(mSourceUrl); } + @Override + public @Nullable String getJSBundleFile() { + if (mBundleLoader == null) { + return null; + } + return mBundleLoader.getSourceUrl(); + } + /** * Attach given {@param rootView} to a catalyst instance manager and start JS application using * JS module provided by {@link ReactRootView#getJSModuleName}. If the react context is currently