Force keep original size when isInDiskCache operation has unknown result

Reviewed By: kartavya-ramnani Differential Revision: D65858102 fbshipit-source-id: 692b5abf9b10cbced115ab26da7d0b509df88e4c
Enerfek · Nov 13, 2024 · 3bb80b8 · 3bb80b8
1 parent 2d938d1
commit 3bb80b8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.../core-java-impl/src/main/java/com/facebook/fresco/vito/core/impl/VitoImagePipelineImpl.kt b/.../core-java-impl/src/main/java/com/facebook/fresco/vito/core/impl/VitoImagePipelineImpl.kt
@@ -150,16 +150,15 @@ class VitoImagePipelineImpl(
       vitoImageRequest: VitoImageRequest,
       timeout: Long,
       unit: TimeUnit
-  ): Boolean {
+  ): Boolean? {
     if (timeout <= 0) {
       return isInDiskCacheSync(vitoImageRequest)
     }
-    val imageRequest = vitoImageRequest.finalImageRequest ?: return false
+    val imageRequest = vitoImageRequest.finalImageRequest ?: return null
     return try {
       DataSources.waitForFinalResult(imagePipeline.isInDiskCache(imageRequest), timeout, unit)
-          ?: false
     } catch (t: Throwable) {
-      false
+      null
     }
   }
 

diff --git a/vito/core/src/main/java/com/facebook/fresco/vito/core/VitoImagePipeline.kt b/vito/core/src/main/java/com/facebook/fresco/vito/core/VitoImagePipeline.kt
@@ -56,7 +56,7 @@ interface VitoImagePipeline {
       imageRequest: VitoImageRequest,
       timeout: Long,
       unit: TimeUnit,
-  ): Boolean {
+  ): Boolean? {
     throw UnsupportedOperationException("Not implemented yet")
   }
 

diff --git a/vito/litho/src/main/java/com/facebook/fresco/vito/litho/FrescoVitoImage2Spec.kt b/vito/litho/src/main/java/com/facebook/fresco/vito/litho/FrescoVitoImage2Spec.kt
@@ -183,12 +183,14 @@ object FrescoVitoImage2Spec {
         // App is still starting
         forceKeepOriginalSize.set(true)
       } else {
-        forceKeepOriginalSize.set(
+        val isInDiskCache =
             FrescoVitoProvider.getImagePipeline()
                 .isInDiskCacheSync(
                     requestCachedValue,
                     FrescoVitoProvider.getConfig().experimentalDynamicSizeDiskCacheCheckTimeoutMs(),
-                    TimeUnit.MILLISECONDS))
+                    TimeUnit.MILLISECONDS)
+        // Force keep original size if in disk cache OR unknown result (null)
+        forceKeepOriginalSize.set(isInDiskCache != false)
       }
       if (forceKeepOriginalSize.get() == true) {
         // Prefetch in OnPrepare since no prefetch will happen in OnBoundsDefined