Align onSetUserAttribute Kotlin overrides with nullable key and value

- Use String? and Any? for parameters matching Java Object/null call paths
- Add early returns when key or value is null where needed
- CleverTap: rename parameters to key/value; use mappedKey/mappedValue for mutations

Made-with: Cursor

Author: denischilik

android-kit-base/src/androidTest/kotlin/com/mparticle/kits/testkits/AttributeListenerTestKit.kt

@@ -63,11 +63,11 @@ open class AttributeListenerTestKit :
     }
 
     override fun onSetUserAttribute(
-        key: String,
+        key: String?,
         value: Any?,
         user: FilteredMParticleUser,
     ) {
-        if (value == null || value !is String) {
+        if (key == null || value == null || value !is String) {
             return
         }
         setUserAttributeCallback?.invoke(key, value)

kits/adobe/adobe-5/src/main/kotlin/com/mparticle/kits/AdobeKitBase.kt

@@ -72,11 +72,11 @@ abstract class AdobeKitBase :
     }
 
     override fun onSetUserAttribute(
-        key: String,
+        key: String?,
         value: Any?,
         user: FilteredMParticleUser,
     ) {
-        if (value == null || value !is String) {
+        if (key == null || value == null || value !is String) {
             return
         }
         syncIds()

kits/adobemedia/adobemedia-5/src/main/kotlin/com/mparticle/kits/AdobeKit.kt

@@ -109,11 +109,11 @@ open class AdobeKit :
     }
 
     override fun onSetUserAttribute(
-        key: String,
+        key: String?,
         value: Any?,
         user: FilteredMParticleUser,
     ) {
-        if (value == null || value !is String) {
+        if (key == null || value == null || value !is String) {
             return
         }
         syncIds()

kits/apptimize/apptimize-3/src/main/kotlin/com/mparticle/kits/ApptimizeKit.kt

@@ -153,11 +153,11 @@ class ApptimizeKit :
     }
 
     override fun onSetUserAttribute(
-        key: String,
+        key: String?,
         value: Any?,
         user: FilteredMParticleUser,
     ) {
-        if (value == null || value !is String) {
+        if (key == null || value == null || value !is String) {
             return
         }
         Apptimize.setUserAttribute(key, value)

kits/branch/branch-5/src/main/kotlin/com/mparticle/kits/BranchMetricsKit.kt

@@ -194,10 +194,13 @@ class BranchMetricsKit :
     }
 
     override fun onSetUserAttribute(
-        key: String,
+        key: String?,
         value: Any?,
         user: FilteredMParticleUser,
     ) {
+        if (key == null) {
+            return
+        }
         // No-op: this kit does not implement this feature.
     }
 

kits/clevertap/clevertap-7/src/main/kotlin/com/mparticle/kits/CleverTapKit.kt

@@ -237,40 +237,43 @@ class CleverTapKit :
     }
 
     override fun onSetUserAttribute(
-        keyIn: String,
-        valueIn: Any,
+        key: String?,
+        value: Any?,
         user: FilteredMParticleUser,
     ) {
-        var key = keyIn
-        var value = valueIn
+        if (key == null || value == null) {
+            return
+        }
+        var mappedKey = key
+        var mappedValue: Any = value
         val profile =
             HashMap<String, Any>()
         when {
-            BIRTHDAY == key -> {
-                key = DOB
+            BIRTHDAY == mappedKey -> {
+                mappedKey = DOB
             }
-            "name" == key -> {
-                key = NAME
+            "name" == mappedKey -> {
+                mappedKey = NAME
             }
-            UserAttributes.GENDER == key -> {
-                val genderValue = value as String
-                value =
+            UserAttributes.GENDER == mappedKey -> {
+                val genderValue = mappedValue as String
+                mappedValue =
                     if (genderValue.contains("fe")) {
                         FEMALE
                     } else {
                         MALE
                     }
             }
-            UserAttributes.MOBILE_NUMBER == key -> {
-                key = PHONE
+            UserAttributes.MOBILE_NUMBER == mappedKey -> {
+                mappedKey = PHONE
             }
             else -> {
-                if (key.startsWith("$")) {
-                    key = key.substring(1)
+                if (mappedKey.startsWith("$")) {
+                    mappedKey = mappedKey.substring(1)
                 }
             }
         }
-        profile[key] = value
+        profile[mappedKey] = mappedValue
         cleverTapInstance?.pushProfile(profile)
     }
 

kits/comscore/comscore-6/src/main/kotlin/com/mparticle/kits/ComscoreKit.kt

@@ -122,11 +122,11 @@ class ComscoreKit :
     }
 
     override fun onSetUserAttribute(
-        key: String,
+        key: String?,
         value: Any?,
         user: FilteredMParticleUser,
     ) {
-        if (value == null || value !is String) {
+        if (key == null || value == null || value !is String) {
             return
         }
         applyEnterpriseScalarUserAttribute(key, value)

kits/ga/ga-23/src/main/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseKit.kt

@@ -400,10 +400,13 @@ class GoogleAnalyticsFirebaseKit :
      * We are going to ignore Lists here, since Firebase only supports String "user property" values
      */
     override fun onSetUserAttribute(
-        key: String,
-        value: Any,
+        key: String?,
+        value: Any?,
         filteredMParticleUser: FilteredMParticleUser,
     ) {
+        if (key == null) {
+            return
+        }
         if (value is String) {
             standardizeName(key, false)?.let {
                 FirebaseAnalytics.getInstance(context).setUserProperty(

kits/ga4/ga4-23/src/main/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseGA4Kit.kt

@@ -611,10 +611,13 @@ class GoogleAnalyticsFirebaseGA4Kit :
      * We are going to ignore Lists here, since Firebase only supports String "user property" values
      */
     override fun onSetUserAttribute(
-        key: String,
-        value: Any,
+        key: String?,
+        value: Any?,
         filteredMParticleUser: FilteredMParticleUser,
     ) {
+        if (key == null) {
+            return
+        }
         if (value is String) {
             standardizeName(key, false)?.let {
                 FirebaseAnalytics.getInstance(context).setUserProperty(

kits/kochava/kochava-5/src/main/kotlin/com/mparticle/kits/KochavaKit.kt

@@ -102,10 +102,13 @@ class KochavaKit :
     }
 
     override fun onSetUserAttribute(
-        key: String,
+        key: String?,
         value: Any?,
         user: FilteredMParticleUser,
     ) {
+        if (key == null) {
+            return
+        }
         // No-op: this kit does not implement this feature.
     }