From 9ff4667c448296f639eceaa561e7ffe08f66765c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateo=20Guzm=C3=A1n?= Date: Sun, 16 Feb 2025 20:43:24 +0100 Subject: [PATCH] Remove TLSSocketFactory class --- .../ReactAndroid/api/ReactAndroid.api | 11 --- .../modules/network/TLSSocketFactory.java | 78 ------------------- 2 files changed, 89 deletions(-) delete mode 100644 packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/TLSSocketFactory.java diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 51fcf8e6df2f..a1cfc613c6ad 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -3359,17 +3359,6 @@ public final class com/facebook/react/modules/network/ReactCookieJarContainer : public fun setCookieJar (Lokhttp3/CookieJar;)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; - public fun createSocket (Ljava/lang/String;ILjava/net/InetAddress;I)Ljava/net/Socket; - public fun createSocket (Ljava/net/InetAddress;I)Ljava/net/Socket; - public fun createSocket (Ljava/net/InetAddress;ILjava/net/InetAddress;I)Ljava/net/Socket; - public fun createSocket (Ljava/net/Socket;Ljava/lang/String;IZ)Ljava/net/Socket; - public fun getDefaultCipherSuites ()[Ljava/lang/String; - public fun getSupportedCipherSuites ()[Ljava/lang/String; -} - public final class com/facebook/react/modules/permissions/PermissionsModule : com/facebook/fbreact/specs/NativePermissionsAndroidSpec, com/facebook/react/modules/core/PermissionListener { public static final field Companion Lcom/facebook/react/modules/permissions/PermissionsModule$Companion; public static final field NAME Ljava/lang/String; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/TLSSocketFactory.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/TLSSocketFactory.java deleted file mode 100644 index 77798a81fc82..000000000000 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/TLSSocketFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -package com.facebook.react.modules.network; - -import java.io.IOException; -import java.net.InetAddress; -import java.net.Socket; -import java.net.UnknownHostException; -import java.security.KeyManagementException; -import java.security.NoSuchAlgorithmException; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocket; -import javax.net.ssl.SSLSocketFactory; - -/** - * This class is needed for TLS 1.2 support on Android 4.x - * - *

Source: http://blog.dev-area.net/2015/08/13/android-4-1-enable-tls-1-1-and-tls-1-2/ - */ -public class TLSSocketFactory extends SSLSocketFactory { - private SSLSocketFactory delegate; - - public TLSSocketFactory() throws KeyManagementException, NoSuchAlgorithmException { - SSLContext context = SSLContext.getInstance("TLS"); - context.init(null, null, null); - delegate = context.getSocketFactory(); - } - - @Override - public String[] getDefaultCipherSuites() { - return delegate.getDefaultCipherSuites(); - } - - @Override - public String[] getSupportedCipherSuites() { - return delegate.getSupportedCipherSuites(); - } - - @Override - public Socket createSocket(Socket s, String host, int port, boolean autoClose) - throws IOException { - return enableTLSOnSocket(delegate.createSocket(s, host, port, autoClose)); - } - - @Override - public Socket createSocket(String host, int port) throws IOException, UnknownHostException { - return enableTLSOnSocket(delegate.createSocket(host, port)); - } - - @Override - public Socket createSocket(String host, int port, InetAddress localHost, int localPort) - throws IOException, UnknownHostException { - return enableTLSOnSocket(delegate.createSocket(host, port, localHost, localPort)); - } - - @Override - public Socket createSocket(InetAddress host, int port) throws IOException { - return enableTLSOnSocket(delegate.createSocket(host, port)); - } - - @Override - public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) - throws IOException { - return enableTLSOnSocket(delegate.createSocket(address, port, localAddress, localPort)); - } - - private Socket enableTLSOnSocket(Socket socket) { - if (socket != null && (socket instanceof SSLSocket)) { - ((SSLSocket) socket).setEnabledProtocols(new String[] {"TLSv1", "TLSv1.1", "TLSv1.2"}); - } - return socket; - } -}