From 360cbf7433f885522e2393802af5caf2b96d4595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateo=20Guzm=C3=A1n?= Date: Tue, 4 Feb 2025 04:21:27 -0800 Subject: [PATCH] Make `ResponseUtil` internal (#49153) Summary: As part of the initiative to reduce the public API surface, this class can be internalized. I've checked there are [no relevant OSS usages](https://github.com/search?type=code&q=NOT+is%3Afork+NOT+org%3Afacebook+NOT+repo%3Areact-native-tvos%2Freact-native-tvos+NOT+repo%3Anuagoz%2Freact-native+NOT+repo%3A2lambda123%2Freact-native+NOT+repo%3Abeanchips%2Ffacebookreactnative+NOT+repo%3AfabOnReact%2Freact-native-notes+NOT+user%3Ahuntie+com.facebook.react.modules.network.ResponseUtil). ## Changelog: [Android][Breaking] - Make com.facebook.react.modules.network.ResponseUtil internal Pull Request resolved: https://github.com/facebook/react-native/pull/49153 Test Plan: ```bash yarn test-android yarn android ``` Reviewed By: fabriziocucci Differential Revision: D69111691 Pulled By: javache fbshipit-source-id: 985677316be7546d06119826bb53b78e1ae11d75 --- .../ReactAndroid/api/ReactAndroid.api | 12 ---------- .../react/modules/network/ResponseUtil.kt | 22 ++++++++----------- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index db796db2513..9639c74697b 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -3372,18 +3372,6 @@ public class com/facebook/react/modules/network/ProgressResponseBody : okhttp3/R public fun totalBytesRead ()J } -public final class com/facebook/react/modules/network/ResponseUtil { - public static final field INSTANCE Lcom/facebook/react/modules/network/ResponseUtil; - public static final fun onDataReceived (Lcom/facebook/react/bridge/ReactApplicationContext;ILcom/facebook/react/bridge/WritableMap;)V - public static final fun onDataReceived (Lcom/facebook/react/bridge/ReactApplicationContext;ILjava/lang/String;)V - public static final fun onDataReceivedProgress (Lcom/facebook/react/bridge/ReactApplicationContext;IJJ)V - public static final fun onDataSend (Lcom/facebook/react/bridge/ReactApplicationContext;IJJ)V - public static final fun onIncrementalDataReceived (Lcom/facebook/react/bridge/ReactApplicationContext;ILjava/lang/String;JJ)V - public static final fun onRequestError (Lcom/facebook/react/bridge/ReactApplicationContext;ILjava/lang/String;Ljava/lang/Throwable;)V - public static final fun onRequestSuccess (Lcom/facebook/react/bridge/ReactApplicationContext;I)V - public static final fun onResponseReceived (Lcom/facebook/react/bridge/ReactApplicationContext;IILcom/facebook/react/bridge/WritableMap;Ljava/lang/String;)V -} - public class com/facebook/react/modules/network/TLSSocketFactory : javax/net/ssl/SSLSocketFactory { public fun ()V public fun createSocket (Ljava/lang/String;I)Ljava/net/Socket; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ResponseUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ResponseUtil.kt index a9eb69c9fef..bc00838d414 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ResponseUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/ResponseUtil.kt @@ -13,9 +13,9 @@ import com.facebook.react.bridge.WritableMap import java.net.SocketTimeoutException /** Util methods to send network responses to JS. */ -public object ResponseUtil { +internal object ResponseUtil { @JvmStatic - public fun onDataSend( + fun onDataSend( reactContext: ReactApplicationContext?, requestId: Int, progress: Long, @@ -32,7 +32,7 @@ public object ResponseUtil { } @JvmStatic - public fun onIncrementalDataReceived( + fun onIncrementalDataReceived( reactContext: ReactApplicationContext?, requestId: Int, data: String?, @@ -51,7 +51,7 @@ public object ResponseUtil { } @JvmStatic - public fun onDataReceivedProgress( + fun onDataReceivedProgress( reactContext: ReactApplicationContext?, requestId: Int, progress: Long, @@ -68,7 +68,7 @@ public object ResponseUtil { } @JvmStatic - public fun onDataReceived(reactContext: ReactApplicationContext?, requestId: Int, data: String?) { + fun onDataReceived(reactContext: ReactApplicationContext?, requestId: Int, data: String?) { val args = Arguments.createArray().apply { pushInt(requestId) @@ -79,11 +79,7 @@ public object ResponseUtil { } @JvmStatic - public fun onDataReceived( - reactContext: ReactApplicationContext?, - requestId: Int, - data: WritableMap? - ) { + fun onDataReceived(reactContext: ReactApplicationContext?, requestId: Int, data: WritableMap?) { val args = Arguments.createArray().apply { pushInt(requestId) @@ -94,7 +90,7 @@ public object ResponseUtil { } @JvmStatic - public fun onRequestError( + fun onRequestError( reactContext: ReactApplicationContext?, requestId: Int, error: String?, @@ -114,7 +110,7 @@ public object ResponseUtil { } @JvmStatic - public fun onRequestSuccess(reactContext: ReactApplicationContext?, requestId: Int) { + fun onRequestSuccess(reactContext: ReactApplicationContext?, requestId: Int) { val args = Arguments.createArray().apply { pushInt(requestId) @@ -125,7 +121,7 @@ public object ResponseUtil { } @JvmStatic - public fun onResponseReceived( + fun onResponseReceived( reactContext: ReactApplicationContext?, requestId: Int, statusCode: Int,