Add app name to inspector device url

Reviewed By: bnham, Hypuk Differential Revision: D5443705 fbshipit-source-id: 8c924948dd512be077e2f566da0cfc4110d5f843
haf · Jul 19, 2017 · 0d16c7c · 0d16c7c
1 parent 90fad3c
commit 0d16c7c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/React/DevSupport/RCTInspectorDevServerHelper.mm b/React/DevSupport/RCTInspectorDevServerHelper.mm
@@ -30,10 +30,12 @@
 
 static NSURL *getInspectorDeviceUrl(NSURL *bundleURL)
 {
-  NSString *escapedText = [[[UIDevice currentDevice] name] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-  return [NSURL URLWithString:[NSString stringWithFormat:@"http://%@/inspector/device?name=%@",
+  NSString *escapedDeviceName = [[[UIDevice currentDevice] name] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+  NSString *escapedAppName = [[[NSBundle mainBundle] bundleIdentifier] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+  return [NSURL URLWithString:[NSString stringWithFormat:@"http://%@/inspector/device?name=%@&app=%@",
                                                         getDebugServerHost(bundleURL),
-                                                        escapedText]];
+                                                        escapedDeviceName,
+                                                        escapedAppName]];
 }
 
 

diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java
@@ -80,7 +80,7 @@ public class DevServerHelper {
   private static final String WEBSOCKET_PROXY_URL_FORMAT = "ws://%s/debugger-proxy?role=client";
   private static final String PACKAGER_STATUS_URL_FORMAT = "http://%s/status";
   private static final String HEAP_CAPTURE_UPLOAD_URL_FORMAT = "http://%s/jscheapcaptureupload";
-  private static final String INSPECTOR_DEVICE_URL_FORMAT = "http://%s/inspector/device?name=%s";
+  private static final String INSPECTOR_DEVICE_URL_FORMAT = "http://%s/inspector/device?name=%s&app=%s";
   private static final String SYMBOLICATE_URL_FORMAT = "http://%s/symbolicate";
   private static final String OPEN_STACK_FRAME_URL_FORMAT = "http://%s/open-stack-frame";
 
@@ -317,7 +317,8 @@ public String getInspectorDeviceUrl() {
         Locale.US,
         INSPECTOR_DEVICE_URL_FORMAT,
         mSettings.getPackagerConnectionSettings().getInspectorServerHost(),
-        AndroidInfoHelpers.getFriendlyDeviceName());
+        AndroidInfoHelpers.getFriendlyDeviceName(),
+        mPackageName);
   }
 
   public BundleDownloader getBundleDownloader() {