From c59bb5740a4ecc7222c301433fb7de4906c43ada Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 17 Jan 2022 15:24:51 +0100
Subject: [PATCH] Add comment after merge of #4952
---
matrix-sdk-android/build.gradle | 5 +++++
.../java/org/matrix/android/sdk/internal/di/NetworkModule.kt | 1 +
2 files changed, 6 insertions(+)
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index ba17a23bc3..7b9a611c72 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -116,6 +116,11 @@ dependencies {
implementation libs.squareup.retrofit
implementation libs.squareup.retrofitMoshi
+ // When version of okhttp is updated (current is 4.9.3), consider removing the workaround
+ // to force usage of Protocol.HTTP_1_1. Check the status of:
+ // - https://github.com/square/okhttp/issues/3278
+ // - https://github.com/square/okhttp/issues/4455
+ // - https://github.com/square/okhttp/issues/3146
implementation(platform("com.squareup.okhttp3:okhttp-bom:4.9.3"))
implementation 'com.squareup.okhttp3:okhttp'
implementation 'com.squareup.okhttp3:logging-interceptor'
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
index 44b00c0ace..0cbbe1210d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
@@ -72,6 +72,7 @@ internal object NetworkModule {
val spec = ConnectionSpec.Builder(matrixConfiguration.connectionSpec).build()
return OkHttpClient.Builder()
+ // workaround for #4669
.protocols(listOf(Protocol.HTTP_1_1))
.connectTimeout(30, TimeUnit.SECONDS)
.readTimeout(60, TimeUnit.SECONDS)