Merge pull request #2545 from DataDog/aleksandr-gringauz/fix-npe-drawable-current-release

Fix NPE when Drawable.getCurrent returns null

Author: aleksandr-gringauz

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/utils/LegacyDrawableToColorMapper.kt

@@ -200,7 +200,9 @@ open class LegacyDrawableToColorMapper(
      * @return the color to map to or null if not applicable
      */
     private fun resolveStateListDrawable(drawable: StateListDrawable, internalLogger: InternalLogger): Int? {
-        return mapDrawableToColor(drawable = drawable.current, internalLogger = internalLogger)
+        // Drawable.getCurrent() can return null in case <selector> doesn't have an item for the default case.
+        @Suppress("UNNECESSARY_SAFE_CALL")
+        return drawable.current?.let { mapDrawableToColor(drawable = it, internalLogger = internalLogger) }
     }
 
     companion object {

features/dd-sdk-android-session-replay/src/test/kotlin/com/datadog/android/sessionreplay/utils/LegacyDrawableToColorMapperTest.kt

@@ -212,4 +212,17 @@ open class LegacyDrawableToColorMapperTest {
         // Then
         assertThat(result).isEqualTo(drawableColor)
     }
+
+    @Test
+    fun `M map StateListDrawable to null W mapDrawableToColor() { Drawable getCurrent returns null }`() {
+        val stateListDrawable = mock<StateListDrawable>().apply {
+            whenever<Drawable?>(this.current) doReturn null
+        }
+
+        // When
+        val result = testedMapper.mapDrawableToColor(stateListDrawable, mockInternalLogger)
+
+        // Then
+        assertThat(result).isNull()
+    }
 }

sample/kotlin/src/main/kotlin/com/datadog/android/sample/sessionreplay/ImageComponentsFragment.kt

@@ -64,6 +64,12 @@ internal class ImageComponentsFragment : Fragment() {
             backgroundId = R.drawable.selector_statelist_images
         )
 
+        setupStateListButton(
+            rootView = rootView,
+            buttonId = R.id.button_statelist_images_no_default,
+            backgroundId = R.drawable.selector_statelist_images_no_default
+        )
+
         return rootView
     }
 

sample/kotlin/src/main/res/drawable/selector_statelist_images_no_default.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_dd_icon_red" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_dd_icon_green" android:state_selected="true" />
+</selector>

sample/kotlin/src/main/res/layout/fragment_image_components.xml

@@ -382,6 +382,17 @@
                     android:contentDescription="@null"
                     />
 
+                <Button
+                    android:id="@+id/button_statelist_images_no_default"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:layout_marginStart="48dp"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:contentDescription="@null"
+                    />
+
             </LinearLayout>
 
         </LinearLayout>