diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java index 4d7110c91eb954..fdec95c5696193 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java @@ -65,8 +65,6 @@ */ public final class BridgeDevSupportManager extends DevSupportManagerBase { private boolean mIsSamplingProfilerEnabled = false; - private ReactInstanceDevHelper mReactInstanceManagerHelper; - private @Nullable DevLoadingViewManager mDevLoadingViewManager; public BridgeDevSupportManager( Context applicationContext, @@ -91,9 +89,6 @@ public BridgeDevSupportManager( surfaceDelegateFactory, devLoadingViewManager); - mReactInstanceManagerHelper = reactInstanceManagerHelper; - mDevLoadingViewManager = devLoadingViewManager; - if (getDevSettings().isStartSamplingProfilerOnInit()) { // Only start the profiler. If its already running, there is an error if (!mIsSamplingProfilerEnabled) { @@ -133,14 +128,6 @@ public void onOptionSelected() { } } - public DevLoadingViewManager getDevLoadingViewManager() { - return mDevLoadingViewManager; - } - - public ReactInstanceDevHelper getReactInstanceManagerHelper() { - return mReactInstanceManagerHelper; - } - @Override protected String getUniqueTag() { return "Bridge"; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java index 18c4dd093dba24..255145e051bf1b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java @@ -770,7 +770,11 @@ protected DevServerHelper getDevServerHelper() { return mDevServerHelper; } - protected ReactInstanceDevHelper getReactInstanceDevHelper() { + public DevLoadingViewManager getDevLoadingViewManager() { + return mDevLoadingViewManager; + } + + public ReactInstanceDevHelper getReactInstanceDevHelper() { return mReactInstanceDevHelper; } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java index 4c965eba4437f5..13abdc09ca7af9 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java @@ -16,6 +16,7 @@ import com.facebook.react.bridge.ReadableArray; import com.facebook.react.common.SurfaceDelegate; import com.facebook.react.devsupport.interfaces.BundleLoadCallback; +import com.facebook.react.devsupport.interfaces.DevLoadingViewManager; import com.facebook.react.devsupport.interfaces.DevOptionHandler; import com.facebook.react.devsupport.interfaces.DevSplitBundleCallback; import com.facebook.react.devsupport.interfaces.DevSupportManager; @@ -127,6 +128,11 @@ public String getDownloadedJSBundleFile() { return null; } + @Override + public DevLoadingViewManager getDevLoadingViewManager() { + return null; + } + @Override public boolean hasUpToDateJSBundleInCache() { return false; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java index 5380de4a32df4e..d4495d8fc612ed 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java @@ -66,6 +66,8 @@ public interface DevSupportManager extends JSExceptionHandler { String getDownloadedJSBundleFile(); + DevLoadingViewManager getDevLoadingViewManager(); + boolean hasUpToDateJSBundleInCache(); void reloadSettings(); diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/devloading/DevLoadingModule.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/devloading/DevLoadingModule.java index 4eaa3f2d0b9a34..ae4a91e21e0e71 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/devloading/DevLoadingModule.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/devloading/DevLoadingModule.java @@ -13,8 +13,7 @@ import com.facebook.react.bridge.NativeModule; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.UiThreadUtil; -import com.facebook.react.devsupport.BridgeDevSupportManager; -import com.facebook.react.devsupport.DefaultDevLoadingViewImplementation; +import com.facebook.react.devsupport.interfaces.DevSupportManager; import com.facebook.react.devsupport.interfaces.DevLoadingViewManager; import com.facebook.react.module.annotations.ReactModule; @@ -28,14 +27,9 @@ public class DevLoadingModule extends NativeDevLoadingViewSpec { public DevLoadingModule(ReactApplicationContext reactContext) { super(reactContext); mJSExceptionHandler = reactContext.getJSExceptionHandler(); - if (mJSExceptionHandler != null && mJSExceptionHandler instanceof BridgeDevSupportManager) { + if (mJSExceptionHandler != null && mJSExceptionHandler instanceof DevSupportManager) { mDevLoadingViewManager = - ((BridgeDevSupportManager) mJSExceptionHandler).getDevLoadingViewManager(); - mDevLoadingViewManager = - mDevLoadingViewManager != null - ? mDevLoadingViewManager - : new DefaultDevLoadingViewImplementation( - ((BridgeDevSupportManager) mJSExceptionHandler).getReactInstanceManagerHelper()); + ((DevSupportManager) mJSExceptionHandler).getDevLoadingViewManager(); } } @@ -46,7 +40,9 @@ public void showMessage(final String message, final Double color, final Double b new Runnable() { @Override public void run() { - mDevLoadingViewManager.showMessage(message); + if (mDevLoadingViewManager != null) { + mDevLoadingViewManager.showMessage(message); + } } }); }