Skip to content

Commit 50415b5

Browse files
committed
Use nullable FilteredMParticleUser in onSetUserAttribute overrides
Third parameter is user: FilteredMParticleUser? to match KitManagerImpl and FilteredMParticleUser.getInstance. GA/GA4 use parameter name user. Made-with: Cursor
1 parent cd896a0 commit 50415b5

13 files changed

Lines changed: 13 additions & 19 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ open class AttributeListenerTestKit :
6565
override fun onSetUserAttribute(
6666
key: String?,
6767
value: Any?,
68-
user: FilteredMParticleUser,
68+
user: FilteredMParticleUser?,
6969
) {
7070
if (key == null || value == null || value !is String) {
7171
return

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ abstract class AdobeKitBase :
7474
override fun onSetUserAttribute(
7575
key: String?,
7676
value: Any?,
77-
user: FilteredMParticleUser,
77+
user: FilteredMParticleUser?,
7878
) {
7979
if (key == null || value == null || value !is String) {
8080
return

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ open class AdobeKit :
111111
override fun onSetUserAttribute(
112112
key: String?,
113113
value: Any?,
114-
user: FilteredMParticleUser,
114+
user: FilteredMParticleUser?,
115115
) {
116116
if (key == null || value == null || value !is String) {
117117
return

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ class ApptimizeKit :
155155
override fun onSetUserAttribute(
156156
key: String?,
157157
value: Any?,
158-
user: FilteredMParticleUser,
158+
user: FilteredMParticleUser?,
159159
) {
160160
if (key == null || value == null || value !is String) {
161161
return

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,11 +196,8 @@ class BranchMetricsKit :
196196
override fun onSetUserAttribute(
197197
key: String?,
198198
value: Any?,
199-
user: FilteredMParticleUser,
199+
user: FilteredMParticleUser?,
200200
) {
201-
if (key == null) {
202-
return
203-
}
204201
// No-op: this kit does not implement this feature.
205202
}
206203

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ class CleverTapKit :
239239
override fun onSetUserAttribute(
240240
key: String?,
241241
value: Any?,
242-
user: FilteredMParticleUser,
242+
user: FilteredMParticleUser?,
243243
) {
244244
if (key == null || value == null) {
245245
return

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class ComscoreKit :
124124
override fun onSetUserAttribute(
125125
key: String?,
126126
value: Any?,
127-
user: FilteredMParticleUser,
127+
user: FilteredMParticleUser?,
128128
) {
129129
if (key == null || value == null || value !is String) {
130130
return

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ class GoogleAnalyticsFirebaseKit :
402402
override fun onSetUserAttribute(
403403
key: String?,
404404
value: Any?,
405-
filteredMParticleUser: FilteredMParticleUser,
405+
user: FilteredMParticleUser?,
406406
) {
407407
if (key == null) {
408408
return

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ class GoogleAnalyticsFirebaseGA4Kit :
613613
override fun onSetUserAttribute(
614614
key: String?,
615615
value: Any?,
616-
filteredMParticleUser: FilteredMParticleUser,
616+
user: FilteredMParticleUser?,
617617
) {
618618
if (key == null) {
619619
return

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,8 @@ class KochavaKit :
104104
override fun onSetUserAttribute(
105105
key: String?,
106106
value: Any?,
107-
user: FilteredMParticleUser,
107+
user: FilteredMParticleUser?,
108108
) {
109-
if (key == null) {
110-
return
111-
}
112109
// No-op: this kit does not implement this feature.
113110
}
114111

0 commit comments

Comments
 (0)