Skip to content

Commit e2eef2c

Browse files
authored
Merge pull request joltup#472 from xamoulin/fix/deprecated-sslSocketFactory
Use non deprecated version of the method OkHttpClient.builder.sslSocketFactory
2 parents 84d5312 + 61af1c7 commit e2eef2c

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

android/src/main/java/com/RNFetchBlob/RNFetchBlobUtils.java

+15-16
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,21 @@ public static void emitWarningEvent(String data) {
5656
public static OkHttpClient.Builder getUnsafeOkHttpClient(OkHttpClient client) {
5757
try {
5858
// Create a trust manager that does not validate certificate chains
59-
final TrustManager[] trustAllCerts = new TrustManager[]{
60-
new X509TrustManager() {
61-
@Override
62-
public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
63-
}
64-
65-
@Override
66-
public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
67-
}
68-
69-
@Override
70-
public java.security.cert.X509Certificate[] getAcceptedIssuers() {
71-
return new java.security.cert.X509Certificate[]{};
72-
}
73-
}
59+
final X509TrustManager x509TrustManager = new X509TrustManager() {
60+
@Override
61+
public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
62+
}
63+
64+
@Override
65+
public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
66+
}
67+
68+
@Override
69+
public java.security.cert.X509Certificate[] getAcceptedIssuers() {
70+
return new java.security.cert.X509Certificate[]{};
71+
}
7472
};
73+
final TrustManager[] trustAllCerts = new TrustManager[]{ x509TrustManager };
7574

7675
// Install the all-trusting trust manager
7776
final SSLContext sslContext = SSLContext.getInstance("SSL");
@@ -80,7 +79,7 @@ public java.security.cert.X509Certificate[] getAcceptedIssuers() {
8079
final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
8180

8281
OkHttpClient.Builder builder = client.newBuilder();
83-
builder.sslSocketFactory(sslSocketFactory);
82+
builder.sslSocketFactory(sslSocketFactory, x509TrustManager);
8483
builder.hostnameVerifier(new HostnameVerifier() {
8584
@Override
8685
public boolean verify(String hostname, SSLSession session) {

0 commit comments

Comments
 (0)