From bb45e49f687ccb6e4cf1361eef668250b596fe08 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 3 Mar 2025 16:40:07 +0100
Subject: [PATCH] Coil3: Use newBuilder, see
 https://coil-kt.github.io/coil/network/#using-a-custom-okhttpclient

---
 .../matrix/ui/media/ImageLoaderFactories.kt          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt
index 2942ed3175..f8722a93a4 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt
@@ -31,13 +31,13 @@ class DefaultLoggedInImageLoaderFactory @Inject constructor(
     private val okHttpClient: Provider<OkHttpClient>,
 ) : LoggedInImageLoaderFactory {
     override fun newImageLoader(matrixClient: MatrixClient): ImageLoader {
-        return ImageLoader
-            .Builder(context)
+        return ImageLoader.Builder(context)
             .components {
                 add(
                     OkHttpNetworkFetcherFactory(
                         callFactory = {
-                            okHttpClient.get()
+                            // Use newBuilder, see https://coil-kt.github.io/coil/network/#using-a-custom-okhttpclient
+                            okHttpClient.get().newBuilder().build()
                         }
                     )
                 )
@@ -61,13 +61,13 @@ class NotLoggedInImageLoaderFactory @Inject constructor(
     private val okHttpClient: Provider<OkHttpClient>,
 ) {
     fun newImageLoader(): ImageLoader {
-        return ImageLoader
-            .Builder(context)
+        return ImageLoader.Builder(context)
             .components {
                 add(
                     OkHttpNetworkFetcherFactory(
                         callFactory = {
-                            okHttpClient.get()
+                            // Use newBuilder, see https://coil-kt.github.io/coil/network/#using-a-custom-okhttpclient
+                            okHttpClient.get().newBuilder().build()
                         }
                     )
                 )