fix:screen attributes filters not working (#385)

* fix:screen attributes filters not working

* fix:screen attributes filters not working

* update submodule

* ktlint fix

---------

Co-authored-by: Brandon Stalnaker <33703490+BrandonStalnaker@users.noreply.github.com>
Co-authored-by: markvdouw <v-mvanderouw@mparticle.com>

Author: 3 people

android-kit-base/src/main/java/com/mparticle/kits/KitConfiguration.java

@@ -435,10 +435,10 @@ public final Map<String, Object> filterEventAttributes(MPEvent event) {
     }
 
     public final Map<String, Object> filterScreenAttributes(MParticle.EventType eventType, String eventName, Map<String, Object> eventAttributes) {
-        return filterEventAttributes(eventType, eventName, mScreenNameFilters, eventAttributes);
+        return filterEventAttributes(eventType, eventName, mScreenAttributeFilters, eventAttributes);
     }
 
-    public final Map<String, Object> filterEventAttributes(MParticle.EventType eventType, String eventName, SparseBooleanArray filter, Map<String, Object> eventAttributes) {
+    public static final Map<String, Object> filterEventAttributes(MParticle.EventType eventType, String eventName, SparseBooleanArray filter, Map<String, Object> eventAttributes) {
         if (eventAttributes != null && eventAttributes.size() > 0 && filter != null && filter.size() > 0) {
             String eventTypeStr = "0";
             if (eventType != null) {

android-kit-base/src/test/kotlin/com/mparticle/kits/KitConfigurationTest.kt

@@ -391,6 +391,24 @@ class KitConfigurationTest {
         )
     }
 
+    @Test
+    @Throws(Exception::class)
+    fun testScreenAttributeFiltering() {
+        val configuration =
+            MockKitConfiguration.createKitConfiguration(JSONObject(" {\"id\":56, \"as\":{\"secretKey\":\"testappkey\", \"eventList\":\"[\\\"test1\\\",\\\"test2\\\",\\\"test3\\\"]\", \"sendTransactionData\":\"True\", \"eventAttributeList\":null }, \"hs\":{\"svea\":{\"1689004688\":0, \"1198002448\":1 } }, }"))
+        val testAttributes = mapOf("screen attribute should not forward" to "testVal", "screen attribute should forward" to "testVal", "screen attribute should also forward" to "testVal")
+        val filterdScreenAttributes = KitConfiguration.filterEventAttributes(null, "testScreenView", configuration.screenAttributeFilters, testAttributes)
+        Assert.assertFalse(
+            filterdScreenAttributes.containsKey("screen attribute should not forward")
+        )
+        Assert.assertTrue(
+            filterdScreenAttributes.containsKey("screen attribute should forward")
+        )
+        Assert.assertTrue(
+            filterdScreenAttributes.containsKey("screen attribute should also forward")
+        )
+    }
+
     @Test
     @Throws(Exception::class)
     fun testConsentForwardingRules() {