yayan 1 år sedan
förälder
incheckning
25635780fa
1 ändrade filer med 9 tillägg och 3 borttagningar
  1. 9 3
      cpaas-lite/src/main/java/io/nexilis/service/core/Network.kt

+ 9 - 3
cpaas-lite/src/main/java/io/nexilis/service/core/Network.kt

@@ -1,5 +1,6 @@
 package io.nexilis.service.core
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.net.Uri
 import android.os.Build
@@ -31,7 +32,6 @@ import java.io.File
 import java.io.IOException
 import java.security.SecureRandom
 import java.security.cert.X509Certificate
-import javax.net.ssl.HostnameVerifier
 import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLSession
 import javax.net.ssl.SSLSocketFactory
@@ -43,11 +43,14 @@ import javax.security.cert.CertificateException
 fun getUnsafeOkHttpClient(): OkHttpClient {
     return try {
         val trustAllCerts = arrayOf<TrustManager>(
+            @SuppressLint("CustomX509TrustManager")
             object : X509TrustManager {
+                @SuppressLint("TrustAllX509TrustManager")
                 @Throws(CertificateException::class)
                 override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {
                 }
 
+                @SuppressLint("TrustAllX509TrustManager")
                 @Throws(CertificateException::class)
                 override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) {
                 }
@@ -63,7 +66,7 @@ fun getUnsafeOkHttpClient(): OkHttpClient {
         val builder = OkHttpClient.Builder()
         builder.followRedirects(false)
         builder.sslSocketFactory(sslSocketFactory, trustAllCerts[0] as X509TrustManager)
-        builder.hostnameVerifier(HostnameVerifier { hostname: String?, session: SSLSession? -> true })
+        builder.hostnameVerifier { _: String?, _: SSLSession? -> true }
         builder.build()
     } catch (e: Exception) {
         throw RuntimeException(e)
@@ -176,11 +179,14 @@ class Network {
         onProgress: ((Long, Long) -> Unit) = { _, _ -> }
     ): Uri? {
         val trustAllCerts = arrayOf<TrustManager>(
+            @SuppressLint("CustomX509TrustManager")
             object : X509TrustManager {
+                @SuppressLint("TrustAllX509TrustManager")
                 @Throws(CertificateException::class)
                 override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {
                 }
 
+                @SuppressLint("TrustAllX509TrustManager")
                 @Throws(CertificateException::class)
                 override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) {
                 }
@@ -195,7 +201,7 @@ class Network {
         val sslSocketFactory: SSLSocketFactory = sslContext.socketFactory
         val client = OkHttpClient.Builder()
             .sslSocketFactory(sslSocketFactory, trustAllCerts[0] as X509TrustManager)
-            .hostnameVerifier(HostnameVerifier { hostname: String?, session: SSLSession? -> true })
+            .hostnameVerifier { _: String?, _: SSLSession? -> true }
             .addNetworkInterceptor {
                 val originalResponse = it.proceed(it.request())
                 val interceptor = originalResponse.newBuilder()