Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Optimize OkHttp initialization for Retrofit

Tomáš Mlynaričd110d92b8735
diff --git a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt
index 321e856fe..42a0e9d64 100644
--- a/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt
+++ b/core/network/src/main/kotlin/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt
@@ -16,6 +16,7 @@
package com.google.samples.apps.nowinandroid.core.network.retrofit
+import androidx.tracing.trace
import com.google.samples.apps.nowinandroid.core.network.BuildConfig
import com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource
import com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeList
@@ -73,17 +74,19 @@ private data class NetworkResponse<T>(
@Singleton
internal class RetrofitNiaNetwork @Inject constructor(
networkJson: Json,
- okhttpCallFactory: Call.Factory,
+ okhttpCallFactory: dagger.Lazy<Call.Factory>,
) : NiaNetworkDataSource {
- private val networkApi = Retrofit.Builder()
- .baseUrl(NIA_BASE_URL)
- .callFactory(okhttpCallFactory)
- .addConverterFactory(
- networkJson.asConverterFactory("application/json".toMediaType()),
- )
- .build()
- .create(RetrofitNiaNetworkApi::class.java)
+ private val networkApi = trace("RetrofitNiaNetwork") {
+ Retrofit.Builder()
+ .baseUrl(NIA_BASE_URL)
+ .callFactory { okhttpCallFactory.get().newCall(it) }
+ .addConverterFactory(
+ networkJson.asConverterFactory("application/json".toMediaType()),
+ )
+ .build()
+ .create(RetrofitNiaNetworkApi::class.java)
+ }
override suspend fun getTopics(ids: List<String>?): List<NetworkTopic> =
networkApi.getTopics(ids = ids).data