diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index 77c27a627..84f0ce951 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -280,6 +280,9 @@ public class ReactInstanceManager { // Instantiate ReactChoreographer in UI thread. ReactChoreographer.initialize(); + if (mUseDeveloperSupport) { + mDevSupportManager.startInspector(); + } } public DevSupportManager getDevSupportManager() { @@ -586,6 +589,7 @@ public class ReactInstanceManager { if (mUseDeveloperSupport) { mDevSupportManager.setDevSupportEnabled(false); + mDevSupportManager.stopInspector(); } moveToBeforeCreateLifecycleState(); 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 ce8a4938a..fcf248c46 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java @@ -885,6 +885,18 @@ public class DevSupportManagerImpl implements bundleURL); } + @Override + public void startInspector() { + if (mIsDevSupportEnabled) { + mDevServerHelper.openInspectorConnection(); + } + } + + @Override + public void stopInspector() { + mDevServerHelper.closeInspectorConnection(); + } + private void reload() { // reload settings, show/hide debug overlay if required & start/stop shake detector if (mIsDevSupportEnabled) { @@ -914,7 +926,6 @@ public class DevSupportManagerImpl implements } mDevServerHelper.openPackagerConnection(this.getClass().getSimpleName(), this); - mDevServerHelper.openInspectorConnection(); if (mDevSettings.isReloadOnJSChangeEnabled()) { mDevServerHelper.startPollingOnChangeEndpoint( new DevServerHelper.OnServerContentChangeListener() { @@ -956,9 +967,7 @@ public class DevSupportManagerImpl implements // hide loading view mDevLoadingViewController.hide(); - mDevServerHelper.closePackagerConnection(); - mDevServerHelper.closeInspectorConnection(); mDevServerHelper.stopPollingOnChangeEndpoint(); } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java index 63f803ca6..4373ebe07 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java @@ -69,6 +69,16 @@ public class DisabledDevSupportManager implements DevSupportManager { } + @Override + public void startInspector() { + + } + + @Override + public void stopInspector() { + + } + @Override public boolean getDevSupportEnabled() { return false; diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java index b6bcdec4e..a5fae4b7b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.java @@ -32,6 +32,8 @@ public interface DevSupportManager extends NativeModuleCallExceptionHandler { void hideRedboxDialog(); void showDevOptionsDialog(); void setDevSupportEnabled(boolean isDevSupportEnabled); + void startInspector(); + void stopInspector(); boolean getDevSupportEnabled(); DeveloperSettings getDevSettings(); void onNewReactContextCreated(ReactContext reactContext);