verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fix RN patch

This commit is contained in:
Diego Mello 2023-07-13 09:31:13 -03:00
parent b6156a2834
commit 189dcc7398
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningModule.java
View File

@ -111,7 +111,7 @@ public class SSLPinningModule extends ReactContextBaseJavaModule implements KeyC
// FastImage Glide network layer // FastImage Glide network layer
FastImageOkHttpUrlLoader.setOkHttpClient(getOkHttpClient()); FastImageOkHttpUrlLoader.setOkHttpClient(getOkHttpClient());
// Expo AV network layer // Expo AV network layer
// SharedCookiesDataSourceFactory.setOkHttpClient(getOkHttpClient()); SharedCookiesDataSourceFactory.setOkHttpClient(getOkHttpClient());
promise.resolve(null); promise.resolve(null);
} }

46
patches/react-native+0.72.1.patch
View File

@ -165,3 +165,49 @@ index 1c4b373..d723b59 100644
private static void applyCustomBuilder(OkHttpClient.Builder builder) { private static void applyCustomBuilder(OkHttpClient.Builder builder) {
if (customClientBuilder != null) { if (customClientBuilder != null) {
customClientBuilder.apply(builder); customClientBuilder.apply(builder);
diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java
index ee1b2c8..94bc974 100644
--- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java
+++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java
@@ -35,6 +35,9 @@ import okhttp3.WebSocket;
import okhttp3.WebSocketListener;
import okio.ByteString;
+import com.facebook.react.modules.network.OkHttpClientProvider;
+import com.facebook.react.modules.network.CustomClientBuilder;
+
@ReactModule(name = NativeWebSocketModuleSpec.NAME, hasConstants = false)
public final class WebSocketModule extends NativeWebSocketModuleSpec {
public interface ContentHandler {
@@ -48,6 +51,18 @@ public final class WebSocketModule extends NativeWebSocketModuleSpec {
private ForwardingCookieHandler mCookieHandler;
+ private static @Nullable CustomClientBuilder customClientBuilder = null;
+
+ public static void setCustomClientBuilder(CustomClientBuilder ccb) {
+ customClientBuilder = ccb;
+ }
+
+ private static void applyCustomBuilder(OkHttpClient.Builder builder) {
+ if (customClientBuilder != null) {
+ customClientBuilder.apply(builder);
+ }
+ }
+
public WebSocketModule(ReactApplicationContext context) {
super(context);
mCookieHandler = new ForwardingCookieHandler(context);
@@ -88,8 +103,10 @@ public final class WebSocketModule extends NativeWebSocketModuleSpec {
new OkHttpClient.Builder()
.connectTimeout(10, TimeUnit.SECONDS)
.writeTimeout(10, TimeUnit.SECONDS)
- .readTimeout(0, TimeUnit.MINUTES) // Disable timeouts for read
- .build();
+ .readTimeout(0, TimeUnit.MINUTES); // Disable timeouts for read
+
+ applyCustomBuilder(clientBuilder);
+ OkHttpClient client = clientBuilder.build();
Request.Builder builder = new Request.Builder().tag(id).url(url);