Merge pull request #904 from nextcloud/backport/897/stable-2.10

[stable-2.10] Bump okhttp to 5.0.0-alpha7 for Happy Eyeballs support
nextcloud · Jun 3, 2022 · 4821c17 · 4821c17
2 parents 5c1b995 + 41add5d
commit 4821c17
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 125 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -49,7 +49,7 @@ configurations {
 
 dependencies {
     implementation 'org.apache.jackrabbit:jackrabbit-webdav:2.13.5'
-    api 'com.squareup.okhttp3:okhttp:4.9.3'
+    api 'com.squareup.okhttp3:okhttp:5.0.0-alpha.7'
     implementation 'com.gitlab.bitfireAT:dav4jvm:2.1.3' // in transition phase, we use old and new libs
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
     implementation 'androidx.annotation:annotation:1.3.0'

diff --git a/library/src/main/java/com/nextcloud/common/IPV6PreferringDNS.kt b/library/src/main/java/com/nextcloud/common/IPV6PreferringDNS.kt
diff --git a/library/src/main/java/com/nextcloud/common/IPv4FallbackInterceptor.kt b/library/src/main/java/com/nextcloud/common/IPv4FallbackInterceptor.kt
diff --git a/library/src/main/java/com/nextcloud/common/NextcloudClient.kt b/library/src/main/java/com/nextcloud/common/NextcloudClient.kt
@@ -40,7 +40,6 @@ import com.owncloud.android.lib.common.network.RedirectionPath
 import com.owncloud.android.lib.common.operations.RemoteOperation
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.common.utils.Log_OC
-import okhttp3.ConnectionPool
 import okhttp3.CookieJar
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -82,17 +81,14 @@ class NextcloudClient private constructor(
             sslContext.init(null, arrayOf<TrustManager>(trustManager), null)
             val sslSocketFactory = sslContext.socketFactory
 
-            val connectionPool = ConnectionPool()
             return OkHttpClient.Builder()
-                .connectionPool(connectionPool)
                 .cookieJar(CookieJar.NO_COOKIES)
                 .connectTimeout(DEFAULT_CONNECTION_TIMEOUT_LONG, TimeUnit.MILLISECONDS)
                 .readTimeout(DEFAULT_DATA_TIMEOUT_LONG, TimeUnit.MILLISECONDS)
                 .callTimeout(DEFAULT_CONNECTION_TIMEOUT_LONG + DEFAULT_DATA_TIMEOUT_LONG, TimeUnit.MILLISECONDS)
                 .sslSocketFactory(sslSocketFactory, trustManager)
                 .hostnameVerifier { _: String?, _: SSLSession? -> true }
-                .addNetworkInterceptor(IPv4FallbackInterceptor(connectionPool))
-                .dns(IPV6PreferringDNS)
+                .fastFallback(true)
                 .build()
         }
     }

diff --git a/library/src/main/java/com/nextcloud/common/PlainClient.kt b/library/src/main/java/com/nextcloud/common/PlainClient.kt
@@ -32,7 +32,6 @@ import android.content.Context
 import com.owncloud.android.lib.common.OwnCloudClientFactory.DEFAULT_DATA_TIMEOUT_LONG
 import com.owncloud.android.lib.common.network.AdvancedX509TrustManager
 import com.owncloud.android.lib.common.network.NetworkUtils
-import okhttp3.ConnectionPool
 import okhttp3.CookieJar
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -57,15 +56,12 @@ class PlainClient(context: Context) {
             sslContext.init(null, arrayOf<TrustManager>(trustManager), null)
             val sslSocketFactory = sslContext.socketFactory
 
-            val connectionPool = ConnectionPool()
             return OkHttpClient.Builder()
-                .connectionPool(connectionPool)
                 .cookieJar(CookieJar.NO_COOKIES)
                 .callTimeout(DEFAULT_DATA_TIMEOUT_LONG, TimeUnit.MILLISECONDS)
                 .sslSocketFactory(sslSocketFactory, trustManager)
                 .hostnameVerifier { _: String?, _: SSLSession? -> true }
-                .addNetworkInterceptor(IPv4FallbackInterceptor(connectionPool))
-                .dns(IPV6PreferringDNS)
+                .fastFallback(true)
                 .build()
         }
     }