Skip to content

Commit eda29f0

Browse files
huntiefacebook-github-bot
authored andcommitted
Remove legacy InspectorPackagerConnection (#48506)
Summary: Pull Request resolved: #48506 Cleanup after the original experiment removal in D57730921, and having launched Fusebox for a full release cycle. - This was previously opened as D58017460 and reverted in D58132473 ([see comment](https://www.internalfb.com/diff/D58017460?transaction_fbid=980942997022731)). Changelog: [Internal] Reviewed By: hoxyq Differential Revision: D67858259 fbshipit-source-id: f4b29247dd4c310cc1f6b6f45688756d7b925a5e
1 parent a8cf53f commit eda29f0

File tree

5 files changed

+7
-663
lines changed

5 files changed

+7
-663
lines changed

packages/react-native/React/DevSupport/RCTInspectorDevServerHelper.mm

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
#import <React/RCTCxxInspectorPackagerConnection.h>
1616
#import <React/RCTDefines.h>
17-
#import <React/RCTInspectorPackagerConnection.h>
1817

1918
#import <CommonCrypto/CommonCrypto.h>
2019
#import <jsinspector-modern/InspectorFlags.h>
@@ -183,11 +182,7 @@ + (void)disableDebugger
183182
NSString *key = [inspectorURL absoluteString];
184183
id<RCTInspectorPackagerConnectionProtocol> connection = socketConnections[key];
185184
if (!connection || !connection.isConnected) {
186-
if (facebook::react::jsinspector_modern::InspectorFlags::getInstance().getFuseboxEnabled()) {
187-
connection = [[RCTCxxInspectorPackagerConnection alloc] initWithURL:inspectorURL];
188-
} else {
189-
connection = [[RCTInspectorPackagerConnection alloc] initWithURL:inspectorURL];
190-
}
185+
connection = [[RCTCxxInspectorPackagerConnection alloc] initWithURL:inspectorURL];
191186

192187
socketConnections[key] = connection;
193188
[connection connect];

packages/react-native/React/Inspector/RCTInspectorPackagerConnection.m

Lines changed: 0 additions & 325 deletions
This file was deleted.

packages/react-native/ReactAndroid/api/ReactAndroid.api

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2223,13 +2223,6 @@ public final class com/facebook/react/devsupport/InspectorFlags {
22232223
public static final fun getIsProfilingBuild ()Z
22242224
}
22252225

2226-
public class com/facebook/react/devsupport/InspectorPackagerConnection : com/facebook/react/devsupport/IInspectorPackagerConnection {
2227-
public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
2228-
public fun closeQuietly ()V
2229-
public fun connect ()V
2230-
public fun sendEventToAllConnections (Ljava/lang/String;)V
2231-
}
2232-
22332226
public class com/facebook/react/devsupport/JSDebuggerWebSocketClient : okhttp3/WebSocketListener {
22342227
public fun <init> ()V
22352228
public fun closeQuietly ()V

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevServerHelper.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -205,17 +205,12 @@ public void openInspectorConnection() {
205205
new AsyncTask<Void, Void, Void>() {
206206
@Override
207207
protected Void doInBackground(Void... params) {
208-
if (InspectorFlags.getFuseboxEnabled()) {
209-
Map<String, String> metadata =
210-
AndroidInfoHelpers.getInspectorHostMetadata(mApplicationContext);
211-
212-
mInspectorPackagerConnection =
213-
new CxxInspectorPackagerConnection(
214-
getInspectorDeviceUrl(), metadata.get("deviceName"), mPackageName);
215-
} else {
216-
mInspectorPackagerConnection =
217-
new InspectorPackagerConnection(getInspectorDeviceUrl(), mPackageName);
218-
}
208+
Map<String, String> metadata =
209+
AndroidInfoHelpers.getInspectorHostMetadata(mApplicationContext);
210+
211+
mInspectorPackagerConnection =
212+
new CxxInspectorPackagerConnection(
213+
getInspectorDeviceUrl(), metadata.get("deviceName"), mPackageName);
219214
mInspectorPackagerConnection.connect();
220215
return null;
221216
}

0 commit comments

Comments
 (0)