Merge pull request #1726 from Infomaniak/etag_kmail

Add `etag` for kMail
Infomaniak · Mar 1, 2024 · 2878a35 · 2878a35
2 parents 71c2341 + 659bb69
commit 2878a35
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Core b/Core
diff --git a/app/src/main/java/com/infomaniak/mail/MainApplication.kt b/app/src/main/java/com/infomaniak/mail/MainApplication.kt
@@ -38,6 +38,7 @@ import com.infomaniak.lib.core.InfomaniakCore
 import com.infomaniak.lib.core.auth.TokenInterceptorListener
 import com.infomaniak.lib.core.models.user.User
 import com.infomaniak.lib.core.networking.HttpClient
+import com.infomaniak.lib.core.networking.HttpClientConfig
 import com.infomaniak.lib.core.utils.CoilUtils
 import com.infomaniak.lib.core.utils.clearStack
 import com.infomaniak.lib.core.utils.hasPermissions
@@ -118,6 +119,8 @@ open class MainApplication : Application(), ImageLoaderFactory, DefaultLifecycle
     override fun onCreate() {
         super<Application>.onCreate()
 
+        HttpClientConfig.cacheDir = applicationContext.cacheDir
+
         ProcessLifecycleOwner.get().lifecycle.addObserver(this)
 
         if (BuildConfig.DEBUG) configureDebugMode()
@@ -215,10 +218,8 @@ open class MainApplication : Application(), ImageLoaderFactory, DefaultLifecycle
 
     private fun configureHttpClient() {
         AccountUtils.onRefreshTokenError = refreshTokenError
-        HttpClient.apply {
-            init(tokenInterceptorListener())
-            customInterceptor = listOf(UrlTraceInterceptor())
-        }
+        HttpClientConfig.customInterceptors = listOf(UrlTraceInterceptor())
+        HttpClient.init(tokenInterceptorListener())
     }
 
     private val refreshTokenError: (User) -> Unit = { user ->
+7 −1		src/main/java/com/infomaniak/lib/core/auth/CredentialManager.kt
+19 −10		src/main/java/com/infomaniak/lib/core/networking/HttpClient.kt
+30 −0		src/main/java/com/infomaniak/lib/core/networking/HttpClientConfig.kt
+1 −1		src/main/java/com/infomaniak/lib/core/networking/HttpUtils.kt
+5 −0		src/main/java/com/infomaniak/lib/core/utils/CoilUtils.kt