优化
diff --git a/app/src/main/java/com/supwisdom/okhttp/NetworkHandler.kt b/app/src/main/java/com/supwisdom/okhttp/NetworkHandler.kt
index 008eeaf..02fd393 100644
--- a/app/src/main/java/com/supwisdom/okhttp/NetworkHandler.kt
+++ b/app/src/main/java/com/supwisdom/okhttp/NetworkHandler.kt
@@ -5,9 +5,10 @@
import okhttp3.MediaType.Companion.toMediaTypeOrNull
import java.io.IOException
import java.io.UnsupportedEncodingException
-import java.security.*
-import java.security.cert.CertificateException
-import java.security.cert.X509Certificate
+import java.security.KeyManagementException
+import java.security.KeyStore
+import java.security.KeyStoreException
+import java.security.NoSuchAlgorithmException
import java.util.*
import java.util.concurrent.TimeUnit
import javax.net.ssl.*
@@ -69,19 +70,23 @@
client = OkHttpClient()
.newBuilder()
+ .followRedirects(true)
+ .followSslRedirects(true)
.retryOnConnectionFailure(false)
.readTimeout(commTime.toLong(), TimeUnit.SECONDS)
.writeTimeout(1, TimeUnit.SECONDS)
- .connectTimeout(commTime.toLong(), TimeUnit.SECONDS)
+ .connectTimeout(1, TimeUnit.SECONDS)
.hostnameVerifier(TrustAllHostnameVerifier())
.sslSocketFactory(sslSocketFactory!!, trustManager!!)
.build()
clientLong = OkHttpClient()
.newBuilder()
+ .followRedirects(true)
+ .followSslRedirects(true)
.retryOnConnectionFailure(false)
- .readTimeout(35, TimeUnit.SECONDS)
+ .readTimeout(60, TimeUnit.SECONDS)
.writeTimeout(1, TimeUnit.SECONDS)
- .connectTimeout(3, TimeUnit.SECONDS)
+ .connectTimeout(1, TimeUnit.SECONDS)
.hostnameVerifier(TrustAllHostnameVerifier())
.sslSocketFactory(sslSocketFactory!!, trustManager!!)
.build()
@@ -93,10 +98,12 @@
this.commTime = communicateTime
client = OkHttpClient()
.newBuilder()
+ .followRedirects(true)
+ .followSslRedirects(true)
.retryOnConnectionFailure(false)
.readTimeout(commTime.toLong(), TimeUnit.SECONDS)
.writeTimeout(1, TimeUnit.SECONDS)
- .connectTimeout(commTime.toLong(), TimeUnit.SECONDS)
+ .connectTimeout(1, TimeUnit.SECONDS)
.hostnameVerifier(TrustAllHostnameVerifier())
.sslSocketFactory(sslSocketFactory!!, trustManager!!)
.build()