Add isValid to DrawableProperties

DataDog · Sep 7, 2023 · e8430b3 · e8430b3
1 parent 0991681
commit e8430b3
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/...kotlin/com/datadog/android/sessionreplay/internal/recorder/base64/ImageWireframeHelper.kt b/...kotlin/com/datadog/android/sessionreplay/internal/recorder/base64/ImageWireframeHelper.kt
@@ -40,17 +40,9 @@ internal class ImageWireframeHelper(
         prefix: String = DRAWABLE_CHILD_NAME
     ): MobileSegment.Wireframe.ImageWireframe? {
         val id = uniqueIdentifierGenerator.resolveChildUniqueIdentifier(view, prefix + currentWireframeIndex)
-        val (currentDrawable, drawableWidth, drawableHeight) = resolveDrawableProperties(view, drawable)
-
-        @Suppress("ComplexCondition")
-        if (
-            currentDrawable == null ||
-            id == null ||
-            drawableWidth <= 0 ||
-            drawableHeight <= 0
-        ) {
-            return null
-        }
+        val drawableProperties = resolveDrawableProperties(view, drawable)
+
+        if (id == null || !drawableProperties.isValid()) return null
 
         val displayMetrics = view.resources.displayMetrics
         val applicationContext = view.context.applicationContext
@@ -70,12 +62,13 @@ internal class ImageWireframeHelper(
                 isEmpty = true
             )
 
+        @Suppress("UnsafeCallOnNullableType") // drawable already checked for null in isValid
         base64Serializer.handleBitmap(
             applicationContext = applicationContext,
             displayMetrics = displayMetrics,
-            drawable = currentDrawable,
-            drawableWidth,
-            drawableHeight,
+            drawable = drawableProperties.drawable!!,
+            drawableWidth = drawableProperties.drawableWidth,
+            drawableHeight = drawableProperties.drawableHeight,
             imageWireframe = imageWireframe
         )
 
@@ -168,7 +161,11 @@ internal class ImageWireframeHelper(
         val drawable: Drawable?,
         val drawableWidth: Int,
         val drawableHeight: Int
-    )
+    ) {
+        fun isValid(): Boolean {
+            return drawable != null && drawableWidth > 0 && drawableHeight > 0
+        }
+    }
 
     internal companion object {
         @VisibleForTesting internal const val DRAWABLE_CHILD_NAME = "drawable"