fix: dispatch on main for sdk methods and dispatch network calls on I…

…O, increase timeout to 30 seconds
DevCycleHQ · Nov 17, 2023 · 2b6bfae · 2b6bfae
1 parent 41307cd
commit 2b6bfae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/android-client-sdk/src/main/java/com/devcycle/sdk/android/api/DVCApiClient.kt b/android-client-sdk/src/main/java/com/devcycle/sdk/android/api/DVCApiClient.kt
@@ -6,6 +6,8 @@ import com.devcycle.sdk.android.util.JSONMapper
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.jackson.JacksonConverterFactory
+import java.util.concurrent.TimeUnit
+import kotlin.time.Duration
 
 internal class DVCApiClient {
     private val okBuilder: OkHttpClient.Builder = OkHttpClient.Builder()
@@ -14,6 +16,7 @@ internal class DVCApiClient {
 
     fun initialize(baseUrl: String, context: Context): DVCApi {
         okBuilder.addInterceptor(NetworkConnectionInterceptor(context))
+        okBuilder.connectTimeout(30, TimeUnit.SECONDS)
         return adapterBuilder
             .baseUrl(baseUrl)
             .client(okBuilder.build())

diff --git a/android-client-sdk/src/main/java/com/devcycle/sdk/android/api/DevCycleClient.kt b/android-client-sdk/src/main/java/com/devcycle/sdk/android/api/DevCycleClient.kt
@@ -40,7 +40,7 @@ class DevCycleClient private constructor(
     eventsUrl: String,
     private val customLifecycleHandler: Handler? = null,
     private val coroutineScope: CoroutineScope = MainScope(),
-    private val coroutineContext: CoroutineContext = Dispatchers.Default
+    private val coroutineContext: CoroutineContext = Dispatchers.Main
 ) {
     private var config: BucketedUserConfig? = null
     private var eventSource: EventSource? = null

diff --git a/android-client-sdk/src/main/java/com/devcycle/sdk/android/api/Request.kt b/android-client-sdk/src/main/java/com/devcycle/sdk/android/api/Request.kt
@@ -84,10 +84,11 @@ internal class Request constructor(sdkKey: String, apiBaseUrl: String, eventsBas
             val maxDelay = 10000L
 
             flow {
+                DevCycleLogger.d("Current Thread for the flow: ${Thread.currentThread().name}")
                 val response = api.getConfigJson(sdkKey, map)
                 emit(getResponseHandler(response))
             }
-                .flowOn(Dispatchers.Default)
+                .flowOn(Dispatchers.IO)
                 .retryWhen { cause, attempt ->
                     if (cause is DVCRequestException) {
                         if (!cause.isRetryable || attempt > 4) {