From 7d0c128174f261a9c0512a266dc89a5d7bf1548b Mon Sep 17 00:00:00 2001
From: Nurzhan Bakibayev <hypuk@fb.com>
Date: Tue, 29 Aug 2017 04:21:04 -0700
Subject: [PATCH] Remove 'Debug JS on-device (experimental)' feature

Reviewed By: bnham

Differential Revision: D5706200

fbshipit-source-id: f389222a9266819c5730860a2e3e461eb1068d0e
---
 React/Inspector/RCTInspectorPackagerConnection.h   |  1 -
 React/Inspector/RCTInspectorPackagerConnection.m   |  6 ------
 .../java/com/facebook/react/bridge/Inspector.java  | 10 ----------
 .../facebook/react/devsupport/DevServerHelper.java |  6 ------
 .../react/devsupport/DevSupportManagerImpl.java    | 14 --------------
 .../devsupport/InspectorPackagerConnection.java    |  9 ---------
 6 files changed, 46 deletions(-)

diff --git a/React/Inspector/RCTInspectorPackagerConnection.h b/React/Inspector/RCTInspectorPackagerConnection.h
index a36dff330..b7774ef6a 100644
--- a/React/Inspector/RCTInspectorPackagerConnection.h
+++ b/React/Inspector/RCTInspectorPackagerConnection.h
@@ -11,7 +11,6 @@
 - (void)connect;
 - (void)closeQuietly;
 - (void)sendEventToAllConnections:(NSString *)event;
-- (void)sendOpenEvent:(NSString *)pageId;
 @end
 
 @interface RCTInspectorRemoteConnection : NSObject
diff --git a/React/Inspector/RCTInspectorPackagerConnection.m b/React/Inspector/RCTInspectorPackagerConnection.m
index 753c79f12..23941a8cd 100644
--- a/React/Inspector/RCTInspectorPackagerConnection.m
+++ b/React/Inspector/RCTInspectorPackagerConnection.m
@@ -51,12 +51,6 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init)
   return self;
 }
 
-- (void)sendOpenEvent:(NSString *)pageId
-{
-  NSDictionary<NSString *, id> *payload = makePageIdPayload(pageId);
-  [self sendEvent:@"open" payload:payload];
-}
-
 - (void)handleProxyMessage:(NSDictionary<NSString *, id> *)message
 {
   NSString *event = message[@"event"];
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java
index d6fa169a8..372b9ad90 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/Inspector.java
@@ -19,16 +19,6 @@ public class Inspector {
 
   private final HybridData mHybridData;
 
-  public static boolean isSupported() {
-    try {
-      // This isn't a very nice way to do this but it works :|
-      instance().getPagesNative();
-      return true;
-    } catch (UnsatisfiedLinkError e) {
-      return false;
-    }
-  }
-
   public static List<Page> getPages() {
     try {
       return Arrays.asList(instance().getPagesNative());
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
index 8189fc018..16204c6ee 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
@@ -201,12 +201,6 @@ public class DevServerHelper {
     }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
   }
 
-  public void openInspector(String id) {
-    if (mInspectorPackagerConnection != null) {
-      mInspectorPackagerConnection.sendOpenEvent(id);
-    }
-  }
-
   public void sendEventToAllConnections(String event) {
     if (mInspectorPackagerConnection != null) {
       mInspectorPackagerConnection.sendEventToAllConnections(event);
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 30993148d..b15f321f6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
@@ -44,7 +44,6 @@ import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.R;
 import com.facebook.react.bridge.CatalystInstance;
 import com.facebook.react.bridge.DefaultNativeModuleCallExceptionHandler;
-import com.facebook.react.bridge.Inspector;
 import com.facebook.react.bridge.JavaJSExecutor;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
@@ -385,19 +384,6 @@ public class DevSupportManagerImpl implements
             handleReloadJS();
           }
         });
-    if (Inspector.isSupported()) {
-      options.put(
-        "Debug JS on-device (experimental)", new DevOptionHandler() {
-          @Override
-          public void onOptionSelected() {
-            List<Inspector.Page> pages = Inspector.getPages();
-            if (pages.size() > 0) {
-              // TODO: We should get the actual page id instead of the first one.
-              mDevServerHelper.openInspector(String.valueOf(pages.get(0).getId()));
-            }
-          }
-        });
-    }
     options.put(
       mDevSettings.isReloadOnJSChangeEnabled()
         ? mApplicationContext.getString(R.string.catalyst_live_reload_off)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java
index 591526176..534727764 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java
@@ -56,15 +56,6 @@ public class InspectorPackagerConnection {
     }
   }
 
-  public void sendOpenEvent(String pageId) {
-    try {
-      JSONObject payload = makePageIdPayload(pageId);
-      sendEvent("open", payload);
-    } catch (JSONException e) {
-      FLog.e(TAG, "Failed to open page", e);
-    }
-  }
-
   void handleProxyMessage(JSONObject message)
       throws JSONException, IOException {
     String event = message.getString("event");