feat: ignoreQueryParamsForCacheKey image option (iOS & Android)

Ignores URL query parameters for cache keys when the new option is set to true, defaults to false.

This is needed for example when downloading images using S3 presigned URL's that include a signature that changes between requests preventing the images from being found in the cache.

Also fixes the merge error in FasterImageViewManager.kt which came from commit 86a23fd

Author: numsu

android/src/main/java/com/candlefinance/fasterimage/FasterImageViewManager.kt

@@ -10,6 +10,7 @@ import android.graphics.RectF
 import android.graphics.Path
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
+import android.net.Uri
 import android.os.Build
 import android.util.Base64
 import android.view.View
@@ -18,6 +19,7 @@ import android.widget.ImageView.ScaleType
 import androidx.appcompat.widget.AppCompatImageView
 import coil.annotation.ExperimentalCoilApi
 import coil.imageLoader
+import coil.memory.MemoryCache
 import coil.request.CachePolicy
 import coil.request.ImageRequest
 import coil.size.Scale
@@ -93,9 +95,10 @@ import com.facebook.react.uimanager.events.RCTEventEmitter
         val failureImage = options.getString("failureImage")
         val grayscale = if (options.hasKey("grayscale")) options.getDouble("grayscale") else 0.0
         val allowHardware = if (options.hasKey("allowHardware")) options.getBoolean("allowHardware") else true
-       val headers = options.getMap("headers")
+        val headers = options.getMap("headers")
+        val ignoreQueryParamsForCacheKey = if (options.hasKey("ignoreQueryParamsForCacheKey")) options.getBoolean("ignoreQueryParamsForCacheKey") else false
 
-        val borderRadii = BorderRadii(
+       val borderRadii = BorderRadii(
           uniform = if (options.hasKey("borderRadius")) options.getDouble("borderRadius") else 0.0,
           topLeft = if (options.hasKey("borderTopLeftRadius")) options.getDouble("borderTopLeftRadius") else 0.0,
           topRight = if (options.hasKey("borderTopRightRadius")) options.getDouble("borderTopRightRadius") else 0.0,
@@ -128,6 +131,20 @@ import com.facebook.react.uimanager.events.RCTEventEmitter
            )
          } else {
            requestBuilder = requestBuilder.data(it)
+           if (ignoreQueryParamsForCacheKey) {
+             val uri = Uri.parse(it)
+             val keyUri = uri.buildUpon().clearQuery().build()
+             val cacheKey = keyUri.toString()
+             val memoryCacheKey = MemoryCache.Key(cacheKey)
+             if (cachePolicy.equals("memory")) {
+               requestBuilder = requestBuilder
+                 .memoryCacheKey(memoryCacheKey)
+             } else {
+               requestBuilder = requestBuilder
+                 .memoryCacheKey(memoryCacheKey)
+                 .diskCacheKey(cacheKey)
+             }
+           }
            headers?.let {
              for (entry in it.entryIterator) {
                requestBuilder.setHeader(entry.key, entry.value as String)
@@ -233,20 +250,6 @@ import com.facebook.react.uimanager.events.RCTEventEmitter
 
       private fun makeThumbHash(view: AppCompatImageView, hash: String): Drawable {
         val thumbHash = ThumbHash.thumbHashToRGBA(Base64.decode(hash, Base64.DEFAULT))
-        val bitmap = Bitmap.createBitmap(thumbHash.width, thumbHash.height, Bitmap.Config.ARGB_8888)
-        bitmap.setPixels(toIntArray(thumbHash.rgba), 0, thumbHash.width, 0, 0, thumbHash.width, thumbHash.height)
-        return BitmapDrawable(view.context.resources, bitmap)
-      }
-
-      private fun makeBlurHash(view: AppCompatImageView, hash: String): Drawable {
-        val bitmap = BlurHashDecoder.decode(hash, 8, 8)
-        return BitmapDrawable(view.context.resources, bitmap)
-      }
-
-      private fun toIntArray(byteArray: ByteArray): IntArray {
-        val intArray = IntArray(byteArray.size)
-        for (i in byteArray.indices) {
-          intArray[i] = byteArray[i].toInt() and 0xFF
         val intArray = IntArray(thumbHash.width * thumbHash.height)
         for (i in intArray.indices) {
           val r = thumbHash.rgba[i * 4].toInt() and 0xFF
@@ -260,6 +263,11 @@ import com.facebook.react.uimanager.events.RCTEventEmitter
         return BitmapDrawable(view.context.resources, bitmap)
       }
 
+      private fun makeBlurHash(view: AppCompatImageView, hash: String): Drawable {
+        val bitmap = BlurHashDecoder.decode(hash, 8, 8)
+        return BitmapDrawable(view.context.resources, bitmap)
+      }
+
     companion object {
       private val RESIZE_MODE = mapOf(
         "contain" to ScaleType.FIT_CENTER,
@@ -277,6 +285,7 @@ import com.facebook.react.uimanager.events.RCTEventEmitter
     }
   }
 
+
   object ThumbHash {
     /**
      * Encodes an RGBA image to a ThumbHash. RGB should not be premultiplied by A.

ios/FasterImageViewManager.swift

@@ -43,6 +43,7 @@ struct ImageOptions: Decodable {
     let headers: [String: String]?
     let grayscale: Double?
     let priority: String?
+    let ignoreQueryParamsForCacheKey: Bool?
 }
 
 struct BorderRadii {
@@ -162,12 +163,19 @@ final class FasterImageView: UIView {
                 }
                 progressiveLoadingEnabled = options.progressiveLoadingEnabled ?? false
                 grayscale = options.grayscale ?? 0.0
+                ignoreQueryParamsForCacheKey = options.ignoreQueryParamsForCacheKey ?? false
 
                 if let url = URL(string: options.url) {
                     var urlRequestFromOptions = URLRequest(url: url)
                     urlRequestFromOptions.allHTTPHeaderFields = options.headers
-                    
                     urlRequest = urlRequestFromOptions
+
+                    if ignoreQueryParamsForCacheKey {
+                        var components = URLComponents(url: url, resolvingAgainstBaseURL: false)
+                        components?.query = nil
+                        var url = components?.url?.absoluteString ?? url.absoluteString
+                        lazyImageView.request?.userInfo[.imageIdKey] = url
+                    }
                 } else {
                     onError?([
                         "error": "Expected a valid url but got: \(options.url)",
@@ -304,6 +312,8 @@ final class FasterImageView: UIView {
         }
     }
 
+    var ignoreQueryParamsForCacheKey = false
+
     // MARK: - Optional Properties
 
     var base64Placeholder: String? {

src/index.tsx

@@ -48,6 +48,7 @@ export type AndroidImageResizeMode =
  * @property {number} [grayscale] - Grayscale value of the image, 0-1
  * @property {boolean} [allowHardware] - Allow hardware rendering, defaults to true (Android only)
  * @property {'veryLow' | 'low' | 'normal' | 'high' | 'veryHigh'} [priority] - Set Image's loading priority, defaults to 'normal' (iOS only)
+ * @property {boolean} [ignoreQueryParamsForCacheKey] - Ignore query params for cache key, defaults to false
  */
 export type ImageOptions = {
   blurhash?: string;
@@ -72,6 +73,7 @@ export type ImageOptions = {
   grayscale?: number;
   allowHardware?: boolean;
   priority?: "veryLow" | "low" | "normal" | "high" | "veryHigh"
+  ignoreQueryParamsForCacheKey?: boolean;
 };
 
 /**