Merge pull request #2367 from DataDog/yl/sr-mnt/fix-resource-resolver

Fix resolveResourceId not correctly calling job finished when drawable cloning failed

Author: ambushwork

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/internal/recorder/resources/ResourceResolver.kt

@@ -62,7 +62,11 @@ internal class ResourceResolver(
             return
         }
 
-        val copiedDrawable = drawableCopier.copy(originalDrawable, resources) ?: return
+        val copiedDrawable = drawableCopier.copy(originalDrawable, resources)
+        if (copiedDrawable == null) {
+            resourceResolverCallback.onFailure()
+            return
+        }
 
         val bitmapFromDrawable =
             if (copiedDrawable is BitmapDrawable && shouldUseDrawableBitmap(copiedDrawable)) {

features/dd-sdk-android-session-replay/src/test/kotlin/com/datadog/android/sessionreplay/internal/recorder/resources/ResourceResolverTest.kt

@@ -34,6 +34,7 @@ import org.mockito.junit.jupiter.MockitoExtension
 import org.mockito.junit.jupiter.MockitoSettings
 import org.mockito.kotlin.any
 import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.never
@@ -269,6 +270,32 @@ internal class ResourceResolverTest {
         verify(mockSerializerCallback).onFailure()
     }
 
+    @Test
+    fun `M call onFailure W copy bitmap return null`() {
+        // Given
+        whenever(
+            mockDrawableCopier.copy(
+                originalDrawable = mockDrawable,
+                resources = mockResources
+            )
+        ).doReturn(null)
+
+        // When
+        testedResourceResolver.resolveResourceId(
+            resources = mockResources,
+            applicationContext = mockApplicationContext,
+            displayMetrics = mockDisplayMetrics,
+            originalDrawable = mockDrawable,
+            drawableCopier = mockDrawableCopier,
+            drawableWidth = mockDrawable.intrinsicWidth,
+            drawableHeight = mockDrawable.intrinsicHeight,
+            resourceResolverCallback = mockSerializerCallback
+        )
+
+        // Then
+        verify(mockSerializerCallback).onFailure()
+    }
+
     @Test
     fun `M calculate resourceId W resolveResourceId() { cache miss }`() {
         // Given