Merge pull request #2351 from DataDog/jmoskovich/new-fix-frozen-images

RUM-6897: Fix scrolling issue
DataDog · Oct 28, 2024 · f024089 · f024089
2 parents 178771e + 1f6307b
commit f024089
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 78 deletions.
diff --git a/...main/kotlin/com/datadog/android/sessionreplay/internal/recorder/mapper/ImageViewMapper.kt b/...main/kotlin/com/datadog/android/sessionreplay/internal/recorder/mapper/ImageViewMapper.kt
@@ -57,28 +57,25 @@ internal class ImageViewMapper(
         val contentYPosInDp = contentRect.top.densityNormalized(density).toLong()
         val contentWidthPx = contentRect.width()
         val contentHeightPx = contentRect.height()
-        val contentDrawable = drawable.constantState?.newDrawable(resources)
 
-        if (contentDrawable != null) {
-            // resolve foreground
-            mappingContext.imageWireframeHelper.createImageWireframe(
-                view = view,
-                imagePrivacy = mappingContext.imagePrivacy,
-                currentWireframeIndex = wireframes.size,
-                x = contentXPosInDp,
-                y = contentYPosInDp,
-                width = contentWidthPx,
-                height = contentHeightPx,
-                usePIIPlaceholder = true,
-                drawable = contentDrawable,
-                asyncJobStatusCallback = asyncJobStatusCallback,
-                clipping = clipping,
-                shapeStyle = null,
-                border = null,
-                prefix = ImageWireframeHelper.DRAWABLE_CHILD_NAME
-            )?.let {
-                wireframes.add(it)
-            }
+        // resolve foreground
+        mappingContext.imageWireframeHelper.createImageWireframe(
+            view = view,
+            imagePrivacy = mappingContext.imagePrivacy,
+            currentWireframeIndex = wireframes.size,
+            x = contentXPosInDp,
+            y = contentYPosInDp,
+            width = contentWidthPx,
+            height = contentHeightPx,
+            usePIIPlaceholder = true,
+            drawable = drawable,
+            asyncJobStatusCallback = asyncJobStatusCallback,
+            clipping = clipping,
+            shapeStyle = null,
+            border = null,
+            prefix = ImageWireframeHelper.DRAWABLE_CHILD_NAME
+        )?.let {
+            wireframes.add(it)
         }
 
         return wireframes

diff --git a/.../datadog/android/sessionreplay/internal/recorder/resources/DefaultImageWireframeHelper.kt b/.../datadog/android/sessionreplay/internal/recorder/resources/DefaultImageWireframeHelper.kt
@@ -137,7 +137,7 @@ internal class DefaultImageWireframeHelper(
             resources = resources,
             applicationContext = applicationContext,
             displayMetrics = displayMetrics,
-            drawable = drawableProperties.drawable,
+            originalDrawable = drawableProperties.drawable,
             drawableWidth = width,
             drawableHeight = height,
             resourceResolverCallback = object : ResourceResolverCallback {

diff --git a/.../kotlin/com/datadog/android/sessionreplay/internal/recorder/resources/ResourceResolver.kt b/.../kotlin/com/datadog/android/sessionreplay/internal/recorder/resources/ResourceResolver.kt
@@ -45,14 +45,14 @@ internal class ResourceResolver(
         resources: Resources,
         applicationContext: Context,
         displayMetrics: DisplayMetrics,
-        drawable: Drawable,
+        originalDrawable: Drawable,
         drawableWidth: Int,
         drawableHeight: Int,
         resourceResolverCallback: ResourceResolverCallback
     ) {
         bitmapCachesManager.registerCallbacks(applicationContext)
 
-        val resourceId = tryToGetResourceFromCache(drawable = drawable)
+        val resourceId = tryToGetResourceFromCache(drawable = originalDrawable)
 
         if (resourceId != null) {
             // if we got here it means we saw the bitmap before,
@@ -61,9 +61,11 @@ internal class ResourceResolver(
             return
         }
 
+        val copiedDrawable = originalDrawable.constantState?.newDrawable(resources) ?: return
+
         val bitmapFromDrawable =
-            if (drawable is BitmapDrawable && shouldUseDrawableBitmap(drawable)) {
-                drawable.bitmap // cannot be null - we already checked in shouldUseDrawableBitmap
+            if (copiedDrawable is BitmapDrawable && shouldUseDrawableBitmap(copiedDrawable)) {
+                copiedDrawable.bitmap // cannot be null - we already checked in shouldUseDrawableBitmap
             } else {
                 null
             }
@@ -72,7 +74,7 @@ internal class ResourceResolver(
         threadPoolExecutor.executeSafe("resolveResourceId", logger) {
             createBitmap(
                 resources = resources,
-                drawable = drawable,
+                drawable = originalDrawable,
                 drawableWidth = drawableWidth,
                 drawableHeight = drawableHeight,
                 displayMetrics = displayMetrics,

diff --git a/...n/com/datadog/android/sessionreplay/recorder/mapper/BaseAsyncBackgroundWireframeMapper.kt b/...n/com/datadog/android/sessionreplay/recorder/mapper/BaseAsyncBackgroundWireframeMapper.kt
@@ -124,30 +124,23 @@ abstract class BaseAsyncBackgroundWireframeMapper<in T : View> internal construc
         mappingContext: MappingContext,
         asyncJobStatusCallback: AsyncJobStatusCallback
     ): MobileSegment.Wireframe? {
-        val resources = view.resources
-
-        val drawableCopy = view.background?.constantState?.newDrawable(resources)
-
-        return if (drawableCopy != null) {
-            mappingContext.imageWireframeHelper.createImageWireframe(
-                view = view,
-                imagePrivacy = mappingContext.imagePrivacy,
-                currentWireframeIndex = 0,
-                x = bounds.x,
-                y = bounds.y,
-                width = width,
-                height = height,
-                usePIIPlaceholder = false,
-                drawable = drawableCopy,
-                asyncJobStatusCallback = asyncJobStatusCallback,
-                clipping = MobileSegment.WireframeClip(),
-                shapeStyle = null,
-                border = null,
-                prefix = PREFIX_BACKGROUND_DRAWABLE
-            )
-        } else {
-            null
-        }
+        val background = view.background ?: return null
+        return mappingContext.imageWireframeHelper.createImageWireframe(
+            view = view,
+            imagePrivacy = mappingContext.imagePrivacy,
+            currentWireframeIndex = 0,
+            x = bounds.x,
+            y = bounds.y,
+            width = width,
+            height = height,
+            usePIIPlaceholder = false,
+            drawable = background,
+            asyncJobStatusCallback = asyncJobStatusCallback,
+            clipping = MobileSegment.WireframeClip(),
+            shapeStyle = null,
+            border = null,
+            prefix = PREFIX_BACKGROUND_DRAWABLE
+        )
     }
 
     companion object {

diff --git a/...adog/android/sessionreplay/internal/recorder/resources/DefaultImageWireframeHelperTest.kt b/...adog/android/sessionreplay/internal/recorder/resources/DefaultImageWireframeHelperTest.kt
@@ -435,7 +435,7 @@ internal class DefaultImageWireframeHelperTest {
             resources = any(),
             applicationContext = any(),
             displayMetrics = any(),
-            drawable = any(),
+            originalDrawable = any(),
             drawableWidth = any(),
             drawableHeight = any(),
             resourceResolverCallback = any()
@@ -500,7 +500,7 @@ internal class DefaultImageWireframeHelperTest {
             resources = any(),
             applicationContext = any(),
             displayMetrics = any(),
-            drawable = any(),
+            originalDrawable = any(),
             drawableWidth = any(),
             drawableHeight = any(),
             resourceResolverCallback = argumentCaptor.capture()
@@ -613,7 +613,7 @@ internal class DefaultImageWireframeHelperTest {
             resources = any(),
             applicationContext = any(),
             displayMetrics = any(),
-            drawable = any(),
+            originalDrawable = any(),
             drawableWidth = captor.capture(),
             drawableHeight = captor.capture(),
             resourceResolverCallback = any()
@@ -645,7 +645,7 @@ internal class DefaultImageWireframeHelperTest {
             resources = any(),
             applicationContext = any(),
             displayMetrics = any(),
-            drawable = any(),
+            originalDrawable = any(),
             drawableWidth = captor.capture(),
             drawableHeight = captor.capture(),
             resourceResolverCallback = any()
@@ -722,7 +722,7 @@ internal class DefaultImageWireframeHelperTest {
             resources = any(),
             applicationContext = any(),
             displayMetrics = any(),
-            drawable = any(),
+            originalDrawable = any(),
             drawableWidth = any(),
             drawableHeight = any(),
             resourceResolverCallback = any()