Fix CompoundButton mapper drawable clone issue

DataDog · Oct 31, 2024 · 5e4afc8 · 5e4afc8
1 parent b83e7b6
commit 5e4afc8
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 25 deletions.
diff --git a/...m/datadog/android/sessionreplay/internal/recorder/mapper/CheckableCompoundButtonMapper.kt b/...m/datadog/android/sessionreplay/internal/recorder/mapper/CheckableCompoundButtonMapper.kt
@@ -103,10 +103,10 @@ internal abstract class CheckableCompoundButtonMapper<T : CompoundButton>(
                 null
             }
         }
-        return originCheckableDrawable?.let { cloneCheckableDrawable(view, it) }
+        return originCheckableDrawable
     }
 
-    private fun cloneCheckableDrawable(view: T, drawable: Drawable): Drawable? {
+    override fun cloneCheckableDrawable(view: T, drawable: Drawable): Drawable? {
         return drawable.constantState?.newDrawable(view.resources)?.apply {
             // Set state to make the drawable have correct tint.
             setState(view.drawableState)

diff --git a/...lin/com/datadog/android/sessionreplay/internal/recorder/mapper/CheckableTextViewMapper.kt b/...lin/com/datadog/android/sessionreplay/internal/recorder/mapper/CheckableTextViewMapper.kt
@@ -6,11 +6,13 @@
 
 package com.datadog.android.sessionreplay.internal.recorder.mapper
 
+import android.content.res.Resources
 import android.graphics.drawable.Drawable
 import android.widget.Checkable
 import android.widget.TextView
 import androidx.annotation.UiThread
 import com.datadog.android.api.InternalLogger
+import com.datadog.android.sessionreplay.internal.recorder.resources.DrawableCopier
 import com.datadog.android.sessionreplay.model.MobileSegment
 import com.datadog.android.sessionreplay.recorder.MappingContext
 import com.datadog.android.sessionreplay.recorder.mapper.TextViewMapper
@@ -109,6 +111,11 @@ internal abstract class CheckableTextViewMapper<T>(
                 view,
                 mappingContext.systemInformation.screenDensity
             )
+            val drawableCopier = object : DrawableCopier {
+                override fun copy(originalDrawable: Drawable, resources: Resources): Drawable? {
+                    return cloneCheckableDrawable(view, it)
+                }
+            }
             mappingContext.imageWireframeHelper.createImageWireframe(
                 view = view,
                 imagePrivacy = mapInputPrivacyToImagePrivacy(mappingContext.textAndInputPrivacy),
@@ -117,6 +124,7 @@ internal abstract class CheckableTextViewMapper<T>(
                 y = checkBoxBounds.y,
                 width = it.intrinsicWidth,
                 height = it.intrinsicHeight,
+                drawableCopier = drawableCopier,
                 drawable = it,
                 shapeStyle = null,
                 border = null,
@@ -127,6 +135,8 @@ internal abstract class CheckableTextViewMapper<T>(
         }
     }
 
+    abstract fun cloneCheckableDrawable(view: T, drawable: Drawable): Drawable?
+
     @UiThread
     abstract fun getCheckableDrawable(view: T): Drawable?
 

diff --git a/...otlin/com/datadog/android/sessionreplay/internal/recorder/mapper/CheckedTextViewMapper.kt b/...otlin/com/datadog/android/sessionreplay/internal/recorder/mapper/CheckedTextViewMapper.kt
@@ -75,7 +75,11 @@ internal open class CheckedTextViewMapper(
 
         return (view.checkMarkDrawable?.constantState as? DrawableContainer.DrawableContainerState)?.getChild(
             checkableDrawableIndex
-        )?.constantState?.newDrawable(view.resources)?.apply {
+        )
+    }
+
+    override fun cloneCheckableDrawable(view: CheckedTextView, drawable: Drawable): Drawable? {
+        return drawable.constantState?.newDrawable(view.resources)?.apply {
             // Set state to make the drawable have correct tint according to the state.
             setState(view.drawableState)
             // Set tint list to drawable if the button has declared `checkMarkTint` attribute.

diff --git a/...datadog/android/sessionreplay/internal/recorder/mapper/BaseCheckableTextViewMapperTest.kt b/...datadog/android/sessionreplay/internal/recorder/mapper/BaseCheckableTextViewMapperTest.kt
@@ -87,9 +87,6 @@ internal abstract class BaseCheckableTextViewMapperTest<T> :
     @Mock
     lateinit var mockConstantState: DrawableContainer.DrawableContainerState
 
-    @Mock
-    lateinit var mockCheckedConstantState: DrawableContainer.DrawableContainerState
-
     @IntForgery(min = 0, max = 0xffffff)
     var fakeCurrentTextColor: Int = 0
 
@@ -108,35 +105,27 @@ internal abstract class BaseCheckableTextViewMapperTest<T> :
     @Mock
     lateinit var mockNotCheckedDrawable: Drawable
 
-    @Mock
-    lateinit var mockClonedDrawable: Drawable
-
     @Mock
     lateinit var mockDrawableCopier: DrawableCopier
 
     @IntForgery
-    var mockCloneDrawableIntrinsicHeight: Int = 0
+    var fakeDrawableIntrinsicHeight: Int = 0
 
     @IntForgery
-    var mockCloneDrawableIntrinsicWidth: Int = 0
+    var fakeDrawableIntrinsicWidth: Int = 0
 
     @Forgery
     lateinit var fakeImagePrivacy: ImagePrivacy
 
     @BeforeEach
     fun `set up`() {
-        mockClonedDrawable = mock {
-            whenever(it.intrinsicHeight) doReturn mockCloneDrawableIntrinsicHeight
-            whenever(it.intrinsicWidth) doReturn mockCloneDrawableIntrinsicWidth
-        }
-        mockCheckedConstantState = mock {
-            whenever(it.newDrawable(mockResources)) doReturn mockClonedDrawable
-        }
         mockCheckedDrawable = mock {
-            whenever(it.constantState) doReturn mockCheckedConstantState
+            whenever(it.intrinsicHeight) doReturn fakeDrawableIntrinsicHeight
+            whenever(it.intrinsicWidth) doReturn fakeDrawableIntrinsicWidth
         }
         mockNotCheckedDrawable = mock {
-            whenever(it.constantState) doReturn mockCheckedConstantState
+            whenever(it.intrinsicHeight) doReturn fakeDrawableIntrinsicHeight
+            whenever(it.intrinsicWidth) doReturn fakeDrawableIntrinsicWidth
         }
         mockConstantState = mock {
             whenever(it.getChild(CHECK_BOX_CHECKED_DRAWABLE_INDEX)) doReturn mockCheckedDrawable
@@ -226,8 +215,8 @@ internal abstract class BaseCheckableTextViewMapperTest<T> :
             currentWireframeIndex = anyInt(),
             x = eq(expectedX),
             y = eq(expectedY),
-            width = eq(mockCloneDrawableIntrinsicWidth),
-            height = eq(mockCloneDrawableIntrinsicHeight),
+            width = eq(fakeDrawableIntrinsicWidth),
+            height = eq(fakeDrawableIntrinsicHeight),
             usePIIPlaceholder = anyBoolean(),
             drawable = any(),
             drawableCopier = any(),
@@ -270,10 +259,10 @@ internal abstract class BaseCheckableTextViewMapperTest<T> :
             currentWireframeIndex = anyInt(),
             x = eq(expectedX),
             y = eq(expectedY),
-            width = eq(mockCloneDrawableIntrinsicWidth),
-            height = eq(mockCloneDrawableIntrinsicHeight),
+            width = eq(fakeDrawableIntrinsicWidth),
+            height = eq(fakeDrawableIntrinsicHeight),
             usePIIPlaceholder = anyBoolean(),
-            drawable = eq(mockClonedDrawable),
+            drawable = eq(mockNotCheckedDrawable),
             drawableCopier = any(),
             asyncJobStatusCallback = eq(mockAsyncJobStatusCallback),
             clipping = eq(MobileSegment.WireframeClip()),