fix(android): maskImageViews matches ImageView subclasses

Author: beekld

sdk/@launchdarkly/observability-android/lib/src/main/kotlin/com/launchdarkly/observability/replay/PrivacyProfile.kt

@@ -28,7 +28,7 @@ private fun List<String>.normalizeXmlIds(): Set<String> = map {
  *
  * @param maskTextInputs Set to false to disable masking text input targets.
  * @param maskText Set to false to disable masking text targets.
- * @param maskImageViews Set to true to mask [ImageView] targets by exact class match.
+ * @param maskImageViews Set to true to mask [ImageView] targets.
  * @param maskViews Additional Views to mask by exact class match (see [viewsMatcher]).
  * @param maskXMLViewIds Additional Views to mask by resource entry name (see [xmlViewIdsMatcher]).
  * accepts `"@+id/foo"`, `"@id/foo"`, or `"foo"`. When the React Native library is on the runtime
@@ -56,7 +56,6 @@ data class PrivacyProfile(
 ) {
     private val viewClassSet = buildSet {
         addAll(maskViews.map { it.clazz })
-        if (maskImageViews) add(ImageView::class.java)
     }
 
     private val webViewClassNameSet = if (maskWebViews) webViewClassNames.toSet() else emptySet()
@@ -75,6 +74,15 @@ data class PrivacyProfile(
         }
     }
 
+    /**
+     * Matches targets whose underlying Android View is an [ImageView].
+     */
+    internal val imageViewMatcher: MaskMatcher = object : MaskMatcher {
+        override fun isMatch(target: MaskTarget): Boolean {
+            return target.view is ImageView
+        }
+    }
+
     /**
      * Matches targets whose underlying Android View is a subclass (or implements an interface)
      * with a class name included in [webViewClassNames] when [maskWebViews] is enabled.
@@ -203,6 +211,7 @@ data class PrivacyProfile(
         // Prefer cheaper checks first; heavier checks should be later.
         if (maskTextInputs) add(textInputMatcher)
         if (maskText) add(textMatcher)
+        if (maskImageViews) add(imageViewMatcher)
         if (viewClassSet.isNotEmpty()) add(viewsMatcher)
         if (maskBySemanticsKeywords) add(sensitiveMatcher)
         if (webViewClassNameSet.isNotEmpty()) add(webViewClassHierarchyMatcher)

sdk/@launchdarkly/observability-android/lib/src/test/kotlin/com/launchdarkly/observability/replay/PrivacyProfileTest.kt

@@ -1,6 +1,5 @@
 package com.launchdarkly.observability.replay
 
-import android.widget.ImageView
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Assertions.assertTrue
@@ -84,23 +83,17 @@ class PrivacyProfileTest {
     }
 
     @Test
-    fun `maskImageViews adds ImageView to viewClassSet and includes viewsMatcher even when maskViews is empty`() {
+    fun `maskImageViews true adds imageViewMatcher to global matchers`() {
         val profile = PrivacyProfile(maskImageViews = true, maskViews = emptyList())
 
-        assertTrue(profile.globalMaskMatchers.contains(profile.viewsMatcher))
-
-        val viewClassSet = profile.getPrivateSet("viewClassSet")
-        assertTrue(viewClassSet.contains(ImageView::class.java))
+        assertTrue(profile.globalMaskMatchers.contains(profile.imageViewMatcher))
     }
 
     @Test
-    fun `maskImageViews false does not add ImageView to viewClassSet and does not include viewsMatcher when maskViews is empty`() {
+    fun `maskImageViews false does not include imageViewMatcher in global matchers`() {
         val profile = PrivacyProfile(maskImageViews = false, maskViews = emptyList())
 
-        assertFalse(profile.globalMaskMatchers.contains(profile.viewsMatcher))
-
-        val viewClassSet = profile.getPrivateSet("viewClassSet")
-        assertFalse(viewClassSet.contains(ImageView::class.java))
+        assertFalse(profile.globalMaskMatchers.contains(profile.imageViewMatcher))
     }
 
     @Test