Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Inject Lazy and then use callFactory instead of setting client manually. It'll allow to initialise retrofit/okhttp lazily.

Browse source
This commit is contained in:
Benoit Marty 2023-03-17 10:02:51 +01:00
parent ba84f39ea1
commit 05d2090e67
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libraries/network/src/main/kotlin/io/element/android/libraries/network/RetrofitFactory.kt
View file

@ -17,6 +17,7 @@
package io.element.android.libraries.network package io.element.android.libraries.network
import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
import dagger.Lazy
import io.element.android.libraries.core.uri.ensureTrailingSlash import io.element.android.libraries.core.uri.ensureTrailingSlash
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import okhttp3.MediaType.Companion.toMediaType import okhttp3.MediaType.Companion.toMediaType
@ -25,14 +26,14 @@ import retrofit2.Retrofit
import javax.inject.Inject import javax.inject.Inject
class RetrofitFactory @Inject constructor( class RetrofitFactory @Inject constructor(
private val okHttpClient: OkHttpClient, private val okHttpClient: Lazy<OkHttpClient>,
) { ) {
fun create(baseUrl: String): Retrofit { fun create(baseUrl: String): Retrofit {
val contentType = "application/json".toMediaType() val contentType = "application/json".toMediaType()
return Retrofit.Builder() return Retrofit.Builder()
.baseUrl(baseUrl.ensureTrailingSlash()) .baseUrl(baseUrl.ensureTrailingSlash())
.addConverterFactory(Json.asConverterFactory(contentType)) .addConverterFactory(Json.asConverterFactory(contentType))
.client(okHttpClient) .callFactory { request -> okHttpClient.get().newCall(request) }
.build() .build()
} }
} }