fix(image): [android] removing noStore from builder when force cache …

…or only-if-cached
facebook · Nov 8, 2024 · dca3d3a · dca3d3a
1 parent dbf007e
commit dca3d3a
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/...ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.kt b/...ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.kt
@@ -36,26 +36,26 @@ internal class ReactOkHttpNetworkFetcher(private val okHttpClient: OkHttpClient)
     fetchState.submitTime = SystemClock.elapsedRealtime()
     val uri = fetchState.uri
     var requestHeaders: Map<String, String>? = null
-    val cacheControlBuilder = CacheControl.Builder().noStore()
+    val cacheControlBuilder = CacheControl.Builder()
     if (fetchState.context.imageRequest is ReactNetworkImageRequest) {
       val networkImageRequest = fetchState.context.imageRequest as ReactNetworkImageRequest
       requestHeaders = getHeaders(networkImageRequest.headers)
       when (networkImageRequest.cacheControl) {
         ImageCacheControl.RELOAD -> {
-          cacheControlBuilder.noCache()
+          cacheControlBuilder.noStore().noCache()
         }
         ImageCacheControl.FORCE_CACHE -> {
-          cacheControlBuilder
-            .onlyIfCached()
-            .maxStale(Integer.MAX_VALUE, TimeUnit.SECONDS)
+          cacheControlBuilder.maxStale(Integer.MAX_VALUE, TimeUnit.SECONDS)
         }
         ImageCacheControl.ONLY_IF_CACHED -> {
-          cacheControlBuilder.onlyIfCached()
+          cacheControlBuilder.onlyIfCached().maxStale(Integer.MAX_VALUE, TimeUnit.SECONDS)
         }
         ImageCacheControl.DEFAULT -> {
-          // No-op
+          cacheControlBuilder.noStore()
         }
       }
+    } else {
+      cacheControlBuilder.noStore()
     }
     val headers = OkHttpCompat.getHeadersFromMap(requestHeaders)
     val request =