Update smart fetch logging

Differential Revision: D53005948 fbshipit-source-id: 4c4dfb1bbb6a4b7aec1720afae5c8018baf67e89
facebook · Jan 24, 2024 · f5f3b41 · f5f3b41
1 parent 876a337
commit f5f3b41
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 10 deletions.
diff --git a/urimod/src/main/java/com/facebook/fresco/urimod/NopUriModifier.kt b/urimod/src/main/java/com/facebook/fresco/urimod/NopUriModifier.kt
@@ -11,6 +11,9 @@ import android.net.Uri
 import com.facebook.drawee.drawable.ScalingUtils
 
 object NopUriModifier : UriModifierInterface {
-  override fun modifyUri(uri: Uri, viewport: Dimensions?, scaleType: ScalingUtils.ScaleType): Uri =
-      uri
+  override fun modifyUri(
+      uri: Uri,
+      viewport: Dimensions?,
+      scaleType: ScalingUtils.ScaleType?
+  ): UriModifierInterface.ModificationResult = UriModifierInterface.ModificationResult.Disabled
 }
diff --git a/urimod/src/main/java/com/facebook/fresco/urimod/UriModifierInterface.kt b/urimod/src/main/java/com/facebook/fresco/urimod/UriModifierInterface.kt
@@ -10,6 +10,29 @@ package com.facebook.fresco.urimod
 import android.net.Uri
 import com.facebook.drawee.drawable.ScalingUtils.ScaleType
 
+const val NOT_MODIFIED_DISABLED: String = "Smart fetch is disabled"
+
 interface UriModifierInterface {
-  fun modifyUri(uri: Uri, viewport: Dimensions?, scaleType: ScaleType): Uri
+
+  fun modifyUri(uri: Uri, viewport: Dimensions?, scaleType: ScaleType?): ModificationResult
+
+  sealed class ModificationResult {
+    object Disabled : ModificationResult() {
+      override fun toString(): String {
+        return "Disabled"
+      }
+    }
+
+    class Modified(val newUri: Uri) : ModificationResult() {
+      override fun toString(): String {
+        return "Modified"
+      }
+    }
+
+    class Unmodified(val reason: String) : ModificationResult() {
+      override fun toString(): String {
+        return "Unmodified(reason='$reason')"
+      }
+    }
+  }
 }
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
@@ -15,6 +15,7 @@ import com.facebook.fresco.middleware.HasExtraData
 import com.facebook.fresco.ui.common.VitoUtils
 import com.facebook.fresco.urimod.Dimensions
 import com.facebook.fresco.urimod.UriModifier
+import com.facebook.fresco.urimod.UriModifierInterface
 import com.facebook.fresco.vito.core.ImagePipelineUtils
 import com.facebook.fresco.vito.core.VitoImagePipeline
 import com.facebook.fresco.vito.core.VitoImageRequest
@@ -46,16 +47,16 @@ class VitoImagePipelineImpl(
     val extras: MutableMap<String, Any?> = mutableMapOf()
     var finalImageSource = imageSource
     if (imageSource is SingleImageSource) {
-      val uri = imageSource.uri
-      val maybeModifiedUri =
+      val result: UriModifierInterface.ModificationResult =
           UriModifier.INSTANCE.modifyUri(
-              uri,
+              imageSource.uri,
               viewport?.let { Dimensions(it.width(), it.height()) },
               imageOptions.actualImageScaleType)
-
-      if (maybeModifiedUri != uri) {
-        extras[HasExtraData.KEY_MODIFIED_URL] = true
-        finalImageSource = ImageSourceProvider.forUri(maybeModifiedUri)
+      if (result !is UriModifierInterface.ModificationResult.Disabled) {
+        extras[HasExtraData.KEY_MODIFIED_URL] = result.toString()
+      }
+      if (result is UriModifierInterface.ModificationResult.Modified) {
+        finalImageSource = ImageSourceProvider.forUri(result.newUri)
       }
       if (imageSource.extras != null) {
         extras[HasExtraData.KEY_IMAGE_SOURCE_EXTRAS] = imageSource.extras