support @id/foo case

Author: abelonogov-ld

sdk/@launchdarkly/observability-android/README.md

@@ -247,7 +247,7 @@ val sessionReplay = SessionReplay(
             ),
             maskXMLViewIds = listOf(
                 // Masks by resource entry name (from resources.getResourceEntryName(view.id)).
-                // Accepts either "@+id/foo" or "foo".
+                // Accepts "@+id/foo", "@id/foo", or "foo".
                 "@+id/password",
                 "credit_card_number",
             ),

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

@@ -18,7 +18,7 @@ import com.launchdarkly.observability.replay.masking.MaskTarget
  * @param maskImageViews Set to true to mask [ImageView] targets by exact class match.
  * @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 either `"@+id/foo"` or `"foo"`.
+ * Accepts `"@+id/foo"`, `"@id/foo"`, or `"foo"`.
  * @param maskAdditionalMatchers Additional custom matchers to apply.
  **/
 data class PrivacyProfile(
@@ -37,8 +37,11 @@ data class PrivacyProfile(
     }
 
     private val maskXMLViewIdSet = maskXMLViewIds.map {
-        if (it.startsWith("@+id/")) return@map it.substring(5)
-        return@map it
+        when {
+            it.startsWith("@+id/") -> it.substring(5)
+            it.startsWith("@id/") -> it.substring(4)
+            else -> it
+        }
     }.toSet()
 
     /**

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

@@ -39,16 +39,18 @@ class PrivacyProfileTest {
     }
 
     @Test
-    fun `maskXMLViewIds normalizes @+id prefix and adds xmlViewIdsMatcher to matchers list`() {
-        val profile = PrivacyProfile(maskXMLViewIds = listOf("@+id/foo", "bar"))
+    fun `maskXMLViewIds normalizes @+id and @id prefixes and adds xmlViewIdsMatcher to matchers list`() {
+        val profile = PrivacyProfile(maskXMLViewIds = listOf("@+id/foo", "@id/baz", "bar"))
 
         val matchers = profile.asMatchersList()
         assertTrue(matchers.contains(profile.xmlViewIdsMatcher))
 
         val idSet = profile.getPrivateSet("maskXMLViewIdSet")
         assertTrue(idSet.contains("foo"))
+        assertTrue(idSet.contains("baz"))
         assertTrue(idSet.contains("bar"))
         assertFalse(idSet.contains("@+id/foo"))
+        assertFalse(idSet.contains("@id/baz"))
     }
 
     @Test