Fix cache misses due to wrong drawable

DataDog · Dec 17, 2024 · 2b8f4b0 · 2b8f4b0
1 parent 9f3d758
commit 2b8f4b0
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 4 deletions.
diff --git a/.../kotlin/com/datadog/android/sessionreplay/internal/recorder/resources/ResourceResolver.kt b/.../kotlin/com/datadog/android/sessionreplay/internal/recorder/resources/ResourceResolver.kt
@@ -160,7 +160,8 @@ internal class ResourceResolver(
 
         if (handledBitmap == null) {
             tryToDrawNewBitmap(
-                drawable = copiedDrawable,
+                originalDrawable = drawable,
+                copiedDrawable = copiedDrawable,
                 drawableWidth = drawableWidth,
                 drawableHeight = drawableHeight,
                 displayMetrics = displayMetrics,
@@ -244,20 +245,22 @@ internal class ResourceResolver(
         val key = customResourceIdCacheKey
             ?: bitmapCachesManager.generateResourceKeyFromDrawable(drawable)
             ?: return
+
         bitmapCachesManager.putInResourceCache(key, resourceId)
     }
 
     @WorkerThread
     private fun tryToDrawNewBitmap(
-        drawable: Drawable,
+        originalDrawable: Drawable,
+        copiedDrawable: Drawable,
         drawableWidth: Int,
         drawableHeight: Int,
         displayMetrics: DisplayMetrics,
         customResourceIdCacheKey: String?,
         resolveResourceCallback: ResolveResourceCallback
     ) {
         drawableUtils.createBitmapOfApproxSizeFromDrawable(
-            drawable = drawable,
+            drawable = copiedDrawable,
             drawableWidth = drawableWidth,
             drawableHeight = drawableHeight,
             displayMetrics = displayMetrics,
@@ -273,7 +276,7 @@ internal class ResourceResolver(
                     }
 
                     resolveResourceHash(
-                        drawable = drawable,
+                        drawable = originalDrawable,
                         bitmap = bitmap,
                         compressedBitmapBytes = compressedBitmapBytes,
                         shouldCacheBitmap = true,
@@ -339,6 +342,7 @@ internal class ResourceResolver(
         val cacheKey = key
             ?: bitmapCachesManager.generateResourceKeyFromDrawable(drawable)
             ?: return null
+
         return bitmapCachesManager.getFromResourceCache(cacheKey)
     }
 

diff --git a/...lin/com/datadog/android/sessionreplay/internal/recorder/resources/ResourceResolverTest.kt b/...lin/com/datadog/android/sessionreplay/internal/recorder/resources/ResourceResolverTest.kt
@@ -1037,4 +1037,60 @@ internal class ResourceResolverTest {
         applicationId = fakeApplicationid.toString(),
         bitmapCachesManager = mockBitmapCachesManager
     )
+
+    @Test
+    fun `M use original drawable for cache write W resolveResourceId() { cache miss }`(
+        @Mock mockCopiedDrawable: Drawable
+    ) {
+        // Given
+        whenever(mockDrawableCopier.copy(mockDrawable, mockResources)).thenReturn(mockCopiedDrawable)
+
+        // When
+        testedResourceResolver.resolveResourceId(
+            resources = mockResources,
+            applicationContext = mockApplicationContext,
+            displayMetrics = mockDisplayMetrics,
+            originalDrawable = mockDrawable,
+            drawableCopier = mockDrawableCopier,
+            drawableWidth = mockDrawable.intrinsicWidth,
+            drawableHeight = mockDrawable.intrinsicHeight,
+            customResourceIdCacheKey = null,
+            resourceResolverCallback = mockSerializerCallback
+        )
+
+        // Then
+        verify(mockBitmapCachesManager, times(2)).generateResourceKeyFromDrawable(mockDrawable)
+    }
+
+    @Test
+    fun `M use copy of the drawable for creating the bitmap W resolveResourceId() { cache miss }`(
+        @Mock mockCopiedDrawable: Drawable
+    ) {
+        // Given
+        whenever(mockDrawableCopier.copy(mockDrawable, mockResources)).thenReturn(mockCopiedDrawable)
+
+        // When
+        testedResourceResolver.resolveResourceId(
+            resources = mockResources,
+            applicationContext = mockApplicationContext,
+            displayMetrics = mockDisplayMetrics,
+            originalDrawable = mockDrawable,
+            drawableCopier = mockDrawableCopier,
+            drawableWidth = mockDrawable.intrinsicWidth,
+            drawableHeight = mockDrawable.intrinsicHeight,
+            customResourceIdCacheKey = null,
+            resourceResolverCallback = mockSerializerCallback
+        )
+
+        // Then
+        verify(mockDrawableUtils).createBitmapOfApproxSizeFromDrawable(
+            drawable = eq(mockCopiedDrawable),
+            drawableWidth = any(),
+            drawableHeight = any(),
+            displayMetrics = any(),
+            requestedSizeInBytes = any(),
+            config = any(),
+            bitmapCreationCallback = any()
+        )
+    }
 }