From 0d73b962c2f1c83ed54c8189ab8792eae370a80e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 16 Mar 2023 15:11:55 +0100
Subject: [PATCH] Add explicit dependency to okhttp (was provided by coil), and
 inject the OkHttpClient to DefaultBugReporter.

---
 features/rageshake/impl/build.gradle.kts                    | 2 ++
 .../features/rageshake/impl/reporter/DefaultBugReporter.kt  | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/rageshake/impl/build.gradle.kts b/features/rageshake/impl/build.gradle.kts
index c23bbe74cc..d09bb4025d 100644
--- a/features/rageshake/impl/build.gradle.kts
+++ b/features/rageshake/impl/build.gradle.kts
@@ -43,6 +43,8 @@ dependencies {
     api(libs.squareup.seismic)
     api(projects.features.rageshake.api)
     implementation(libs.androidx.datastore.preferences)
+    implementation(platform(libs.network.okhttp.bom))
+    implementation("com.squareup.okhttp3:okhttp")
     implementation(libs.coil)
     implementation(libs.coil.compose)
     ksp(libs.showkase.processor)
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
index 27bae6ee72..4e031703ab 100755
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
@@ -64,6 +64,7 @@ class DefaultBugReporter @Inject constructor(
     private val screenshotHolder: ScreenshotHolder,
     private val crashDataStore: CrashDataStore,
     private val coroutineDispatchers: CoroutineDispatchers,
+    private val okHttpClient: OkHttpClient,
     /*
     private val activeSessionHolder: ActiveSessionHolder,
     private val versionProvider: VersionProvider,
@@ -88,9 +89,6 @@ class DefaultBugReporter @Inject constructor(
         private const val BUFFER_SIZE = 1024 * 1024 * 50
     }
 
-    // the http client
-    private val mOkHttpClient = OkHttpClient()
-
     // the pending bug report call
     private var mBugReportCall: Call? = null
 
@@ -346,7 +344,7 @@ class DefaultBugReporter @Inject constructor(
 
                     // trigger the request
                     try {
-                        mBugReportCall = mOkHttpClient.newCall(request)
+                        mBugReportCall = okHttpClient.newCall(request)
                         response = mBugReportCall!!.execute()
                         responseCode = response.code
                     } catch (e: Exception) {