drake преди 2 години
родител
ревизия
8284b941f3
променени са 1 файла, в които са добавени 5 реда и са изтрити 2 реда
  1. 5 2
      net/src/main/java/com/drake/net/interceptor/NetOkHttpInterceptor.kt

+ 5 - 2
net/src/main/java/com/drake/net/interceptor/NetOkHttpInterceptor.kt

@@ -36,14 +36,17 @@ object NetOkHttpInterceptor : Interceptor {
         var request = chain.request()
         val reqBody = request.body?.toNetRequestBody(request.uploadListeners())
         val cache = request.tagOf<ForceCache>() ?: NetConfig.forceCache
+        val cacheMode = request.tagOf<CacheMode>()
         request = request.newBuilder().apply {
-            if (cache != null) cacheControl(CacheControl.Builder().noCache().noStore().build())
+            if (cache != null && cacheMode != null) {
+                cacheControl(CacheControl.Builder().noCache().noStore().build())
+            }
         }.method(request.method, reqBody).build()
 
         try {
             attach(chain)
             val response = if (cache != null) {
-                when (request.tagOf<CacheMode>()) {
+                when (cacheMode) {
                     CacheMode.READ -> cache.get(request) ?: throw NoCacheException(request)
                     CacheMode.READ_THEN_REQUEST -> cache.get(request) ?: chain.proceed(request).run {
                         cacheWritingResponse(cache, this)