chore(fix): update network client retry strategies and content wrappe…

…r defaults
AniTrend · May 5, 2024 · ae2a320 · ae2a320
1 parent c97b018
commit ae2a320
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 19 deletions.
diff --git a/android-core/src/main/kotlin/co/anitrend/core/android/compose/design/ContentWrapper.kt b/android-core/src/main/kotlin/co/anitrend/core/android/compose/design/ContentWrapper.kt
@@ -64,6 +64,7 @@ private fun ContentText(
         textAlign = TextAlign.Center,
         style = MaterialTheme.typography.bodyLarge,
         overflow = TextOverflow.Ellipsis,
+        color = MaterialTheme.colorScheme.onSurface,
         maxLines = 3,
         modifier = modifier,
     )
@@ -82,13 +83,14 @@ private fun LoadingContent(
         ContentImage(drawableResource = config.loadingDrawable)
         Spacer(modifier = Modifier.height(8.dp))
         Row(
-            horizontalArrangement = Arrangement.spacedBy(16.dp),
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
             verticalAlignment = Alignment.CenterVertically,
         ) {
             CircularProgressIndicator(
-                modifier = Modifier.size(24.dp).align(alignment = Alignment.CenterVertically),
+                modifier = Modifier.size(16.dp)
+                    .align(alignment = Alignment.CenterVertically),
                 color = MaterialTheme.colorScheme.surfaceVariant,
-                strokeWidth = 4.dp,
+                strokeWidth = 2.dp,
                 trackColor = MaterialTheme.colorScheme.secondary,
             )
             config.loadingMessage?.also {
@@ -174,7 +176,8 @@ fun <P: IParam> ContentWrapper(
 }
 
 
-@AniTrendPreview.Mobile
+@AniTrendPreview.Light
+@AniTrendPreview.Dark
 @Composable
 private fun ContentWrapperPreview(
     @PreviewParameter(provider = ContentWrapperPreviewParameter::class) loadState: LoadState

diff --git a/app-core/src/main/kotlin/co/anitrend/core/koin/Modules.kt b/app-core/src/main/kotlin/co/anitrend/core/koin/Modules.kt
@@ -35,7 +35,9 @@ import co.anitrend.core.coil.client.CoilRequestClient
 import co.anitrend.core.coil.fetch.RequestImageFetcher
 import co.anitrend.core.coil.mapper.RequestImageMapper
 import co.anitrend.data.android.koin.dataModules
+import co.anitrend.data.android.network.cache.CacheHelper
 import co.anitrend.data.android.network.model.NetworkMessage
+import co.anitrend.data.core.extensions.defaultBuilder
 import coil.ImageLoader
 import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
@@ -45,6 +47,7 @@ import coil.disk.DiskCache
 import coil.memory.MemoryCache
 import io.wax911.emojify.EmojiManager
 import io.wax911.emojify.serializer.kotlinx.KotlinxDeserializer
+import okhttp3.CookieJar
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import org.koin.android.ext.koin.androidContext
@@ -113,9 +116,15 @@ private val configurationModule = module {
         val memoryLimit = if (isLowRamDevice) 0.15 else 0.35
         val storageController = get<IStorageController>()
 
-        val client = get<OkHttpClient.Builder> {
-            parametersOf(HttpLoggingInterceptor.Level.BASIC)
-        }.build()
+        val client = defaultBuilder()
+            .cookieJar(get<CookieJar>())
+            .cache(
+                CacheHelper.createCache(
+                    androidContext(),
+                    "coil-okhttp"
+                )
+            )
+            .build()
 
         val imageCache = storageController.getImageCache(
             context = androidContext()

diff --git a/...c/main/kotlin/co/anitrend/data/android/controller/strategy/contract/ControllerStrategy.kt b/...c/main/kotlin/co/anitrend/data/android/controller/strategy/contract/ControllerStrategy.kt
@@ -22,6 +22,7 @@ import co.anitrend.arch.request.callback.RequestCallback
 import co.anitrend.data.android.network.model.NetworkMessage
 import retrofit2.HttpException
 import java.net.SocketTimeoutException
+import java.net.UnknownHostException
 
 /**
  * Contract for controller strategy
@@ -49,6 +50,13 @@ abstract class ControllerStrategy<D> {
                 cause
             )
         }
+        is UnknownHostException -> {
+            RequestError(
+                networkMessage.connectivityErrorTittle,
+                networkMessage.connectivityErrorMessage,
+                cause
+            )
+        }
         else -> {
             if (cause == null)
                 RequestError(

diff --git a/...id/src/main/kotlin/co/anitrend/data/android/controller/strategy/policy/OfflineStrategy.kt b/...id/src/main/kotlin/co/anitrend/data/android/controller/strategy/policy/OfflineStrategy.kt
@@ -44,7 +44,7 @@ class OfflineStrategy<D> private constructor(
     ): D? {
         runCatching {
             block()
-        }.onSuccess {result ->
+        }.onSuccess { result ->
             callback.recordSuccess()
             return result
         }.onFailure { exception ->

diff --git a/...ndroid/src/main/kotlin/co/anitrend/data/android/network/client/DeferrableNetworkClient.kt b/...ndroid/src/main/kotlin/co/anitrend/data/android/network/client/DeferrableNetworkClient.kt
@@ -55,8 +55,7 @@ abstract class DeferrableNetworkClient<T> : AbstractNetworkClient<Deferred<Respo
      */
     override fun defaultShouldRetry(exception: Throwable) = when (exception) {
         is HttpException -> exception.code() == 429
-        is SocketTimeoutException,
-        is IOException -> true
+        is SocketTimeoutException -> true
         else -> false
     }
 
@@ -120,4 +119,4 @@ abstract class DeferrableNetworkClient<T> : AbstractNetworkClient<Deferred<Respo
         maxAttempts,
         shouldRetry
     ).bodyOrThrow()
-}
+}
diff --git a/...ndroid/src/main/kotlin/co/anitrend/data/android/network/client/OkHttpCallNetworkClient.kt b/...ndroid/src/main/kotlin/co/anitrend/data/android/network/client/OkHttpCallNetworkClient.kt
@@ -52,8 +52,7 @@ abstract class OkHttpCallNetworkClient : AbstractNetworkClient<Call, Response>()
      */
     override fun defaultShouldRetry(exception: Throwable) = when (exception) {
         is OkHttpException -> exception.code == 429
-        is SocketTimeoutException,
-        is IOException -> true
+        is SocketTimeoutException -> true
         else -> false
     }
 
@@ -118,4 +117,4 @@ abstract class OkHttpCallNetworkClient : AbstractNetworkClient<Call, Response>()
         maxAttempts,
         shouldRetry
     ).bodyOrThrow()
-}
+}
diff --git a/...roid/src/main/kotlin/co/anitrend/data/android/network/client/RetrofitCallNetworkClient.kt b/...roid/src/main/kotlin/co/anitrend/data/android/network/client/RetrofitCallNetworkClient.kt
@@ -46,8 +46,7 @@ internal abstract class RetrofitCallNetworkClient<T> : AbstractNetworkClient<Cal
      */
     override fun defaultShouldRetry(exception: Throwable) = when (exception) {
         is HttpException -> exception.code() == 429
-        is SocketTimeoutException,
-        is IOException -> true
+        is SocketTimeoutException -> true
         else -> false
     }
 
@@ -112,4 +111,4 @@ internal abstract class RetrofitCallNetworkClient<T> : AbstractNetworkClient<Cal
         maxAttempts,
         shouldRetry
     ).bodyOrThrow()
-}
+}
diff --git a/app-data/src/main/kotlin/co/anitrend/data/auth/datasource/local/AuthLocalSource.kt b/app-data/src/main/kotlin/co/anitrend/data/auth/datasource/local/AuthLocalSource.kt
@@ -39,7 +39,7 @@ internal abstract class AuthLocalSource : AbstractLocalSource<AuthEntity>() {
         delete from auth
         where user_id = :userId
         """)
-    abstract fun clearByUserId(userId: Long)
+    abstract suspend fun clearByUserId(userId: Long)
 
     @Query("""
             select * from auth
@@ -51,4 +51,4 @@ internal abstract class AuthLocalSource : AbstractLocalSource<AuthEntity>() {
             select user_id from auth
         """)
     abstract suspend fun userIds(): List<Long>
-}
+}