Include Parameter values in the cache key by default. (#319)

coil-kt · Mar 20, 2020 · f0c97bb · f0c97bb
1 parent b1e6153
commit f0c97bb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/coil-base/src/main/java/coil/request/Parameters.kt b/coil-base/src/main/java/coil/request/Parameters.kt
@@ -81,7 +81,7 @@ class Parameters private constructor(
          * @param cacheKey The parameter's cache key. If not null, this value will be added to a request's cache key.
          */
         @JvmOverloads
-        fun set(key: String, value: Any?, cacheKey: String? = null) = apply {
+        fun set(key: String, value: Any?, cacheKey: String? = value?.toString()) = apply {
             this.map[key] = Entry(value, cacheKey)
         }
 

diff --git a/coil-base/src/main/java/coil/request/RequestBuilder.kt b/coil-base/src/main/java/coil/request/RequestBuilder.kt
@@ -366,7 +366,7 @@ sealed class RequestBuilder<T : RequestBuilder<T>> {
      * @see Parameters.Builder.set
      */
     @JvmOverloads
-    fun setParameter(key: String, value: Any?, cacheKey: String? = null): T = self {
+    fun setParameter(key: String, value: Any?, cacheKey: String? = value?.toString()): T = self {
         this.parameters = (this.parameters ?: Parameters.Builder()).apply { set(key, value, cacheKey) }
     }
 

diff --git a/coil-base/src/test/java/coil/RealImageLoaderBasicTest.kt b/coil-base/src/test/java/coil/RealImageLoaderBasicTest.kt
@@ -515,9 +515,9 @@ class RealImageLoaderBasicTest {
 
     private fun createFakeParameters(): Parameters {
         return Parameters.Builder()
-            .set("key1", "no_cache")
-            .set("key2", "cached2", "cached2")
-            .set("key3", "cached3", "cached3")
+            .set("key1", "no_cache", cacheKey = null)
+            .set("key2", "cached2")
+            .set("key3", "cached3")
             .build()
     }
 

diff --git a/coil-sample/src/main/java/coil/sample/MainViewModel.kt b/coil-sample/src/main/java/coil/sample/MainViewModel.kt
@@ -57,7 +57,7 @@ class MainViewModel(application: Application, handle: SavedStateHandle) : Androi
             for (index in 0 until 50) {
                 val videoFrameMicros = Random.nextLong(62000000L)
                 val parameters = Parameters.Builder()
-                    .set(VIDEO_FRAME_MICROS_KEY, videoFrameMicros, videoFrameMicros.toString())
+                    .set(VIDEO_FRAME_MICROS_KEY, videoFrameMicros)
                     .build()
 
                 images += Image(