diff --git a/android-kit-base/src/androidTest/kotlin/com/mparticle/kits/DataplanBlockingUserTests.kt b/android-kit-base/src/androidTest/kotlin/com/mparticle/kits/DataplanBlockingUserTests.kt index 6d92e408a..7a217eef9 100644 --- a/android-kit-base/src/androidTest/kotlin/com/mparticle/kits/DataplanBlockingUserTests.kt +++ b/android-kit-base/src/androidTest/kotlin/com/mparticle/kits/DataplanBlockingUserTests.kt @@ -73,7 +73,7 @@ class DataplanBlockingUserTests : BaseKitOptionsTest() { ), ) - userAttributeListenerKitKit.onSetUserAttribute = { key, _, _ -> + userAttributeListenerKitKit.onSetUserAttribute = { key, _ -> assertTrue(allowedAttributes.containsKey(key)) assertFalse(blockedAttributes.containsKey(key)) } @@ -146,7 +146,7 @@ class DataplanBlockingUserTests : BaseKitOptionsTest() { count++ } } - userAttributeListenerKitKit.onRemoveUserAttribute = { key, _ -> + userAttributeListenerKitKit.onRemoveUserAttribute = { key -> assertTrue(allowedAttributes.containsKey(key)) assertFalse(blockedAttributes.containsKey(key)) // make sure these are the attributes that are being removed @@ -221,7 +221,7 @@ class DataplanBlockingUserTests : BaseKitOptionsTest() { count++ } } - userAttributeListenerKitKit.onSetUserAttributeList = { key, _, _ -> + userAttributeListenerKitKit.onSetUserAttributeList = { key, _ -> assertTrue(allowedAttributes.containsKey(key)) assertFalse(blockedAttributes.containsKey(key)) count++ diff --git a/android-kit-base/src/androidTest/kotlin/com/mparticle/kits/testkits/ModifyIdentityListenerTestKit.kt b/android-kit-base/src/androidTest/kotlin/com/mparticle/kits/testkits/ModifyIdentityListenerTestKit.kt index e17d4308f..9a7b644b6 100644 --- a/android-kit-base/src/androidTest/kotlin/com/mparticle/kits/testkits/ModifyIdentityListenerTestKit.kt +++ b/android-kit-base/src/androidTest/kotlin/com/mparticle/kits/testkits/ModifyIdentityListenerTestKit.kt @@ -2,7 +2,6 @@ package com.mparticle.kits.testkits import com.mparticle.MParticle import com.mparticle.consent.ConsentState -import com.mparticle.kits.FilteredMParticleUser import com.mparticle.kits.KitIntegration.LogoutListener import com.mparticle.kits.KitIntegration.ModifyIdentityListener import com.mparticle.kits.KitIntegration.UserAttributeListener @@ -30,7 +29,6 @@ open class ModifyIdentityListenerTestKit : override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { setUserAttributeList?.invoke(attributeKey, attributeValueList) onAttributeReceived?.invoke(attributeKey, attributeValueList) @@ -39,7 +37,6 @@ open class ModifyIdentityListenerTestKit : override fun onSetAllUserAttributes( userAttributes: Map, userAttributeLists: Map>, - user: FilteredMParticleUser, ) { setAllUserAttributes?.invoke(userAttributes, userAttributeLists) userAttributes.forEach { onAttributeReceived?.invoke(it.key, it.value) } @@ -61,7 +58,6 @@ open class ModifyIdentityListenerTestKit : override fun onRemoveUserAttribute( key: String, - user: FilteredMParticleUser, ) { removeUserAttributeListener?.invoke(key) onAttributeReceived?.invoke(key, null) @@ -70,7 +66,6 @@ open class ModifyIdentityListenerTestKit : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { if (key == null || value == null || value !is String) { return @@ -83,20 +78,17 @@ open class ModifyIdentityListenerTestKit : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { } override fun onSetUserTag( key: String?, - user: FilteredMParticleUser?, ) { } override fun onConsentStateUpdated( oldState: ConsentState?, newState: ConsentState?, - user: FilteredMParticleUser?, ) { } diff --git a/android-kit-base/src/androidTest/kotlin/com/mparticle/kits/testkits/UserAttributeListenerTestKit.kt b/android-kit-base/src/androidTest/kotlin/com/mparticle/kits/testkits/UserAttributeListenerTestKit.kt index 8f397a008..5f8c041a9 100644 --- a/android-kit-base/src/androidTest/kotlin/com/mparticle/kits/testkits/UserAttributeListenerTestKit.kt +++ b/android-kit-base/src/androidTest/kotlin/com/mparticle/kits/testkits/UserAttributeListenerTestKit.kt @@ -1,95 +1,86 @@ package com.mparticle.kits.testkits import com.mparticle.consent.ConsentState -import com.mparticle.kits.FilteredMParticleUser import com.mparticle.kits.KitIntegration open class UserAttributeListenerTestKit : ListenerTestKit(), KitIntegration.UserAttributeListener { - var onIncrementUserAttribute: ((key: String?, incrementedBy: Number, value: String?, user: FilteredMParticleUser?) -> Unit)? = + var onIncrementUserAttribute: ((key: String?, incrementedBy: Number, value: String?) -> Unit)? = null - var onRemoveUserAttribute: ((key: String?, user: FilteredMParticleUser?) -> Unit)? = null - var onSetUserAttribute: ((key: String?, value: Any?, user: FilteredMParticleUser?) -> Unit)? = + var onRemoveUserAttribute: ((key: String?) -> Unit)? = null + var onSetUserAttribute: ((key: String?, value: Any?) -> Unit)? = null - var onSetUserTag: ((key: String?, user: FilteredMParticleUser?) -> Unit)? = null - var onSetUserAttributeList: ((attributeKey: String?, attributeValueList: List?, user: FilteredMParticleUser?) -> Unit)? = + var onSetUserTag: ((key: String?) -> Unit)? = null + var onSetUserAttributeList: ((attributeKey: String?, attributeValueList: List?) -> Unit)? = null var onSetAllUserAttributes: ( ( userAttributes: Map?, userAttributeLists: Map?>?, - user: FilteredMParticleUser?, ) -> Unit )? = null var supportsAttributeLists: (() -> Boolean)? = null - var onConsentStateUpdated: ((oldState: ConsentState?, newState: ConsentState?, user: FilteredMParticleUser?) -> Unit)? = + var onConsentStateUpdated: ((oldState: ConsentState?, newState: ConsentState?) -> Unit)? = null override fun onConsentStateUpdated( oldState: ConsentState?, newState: ConsentState?, - user: FilteredMParticleUser?, ) { - onConsentStateUpdated?.invoke(oldState, newState, user) + onConsentStateUpdated?.invoke(oldState, newState) } override fun onSetAllUserAttributes( userAttributes: Map?, userAttributeLists: Map>?, - user: FilteredMParticleUser?, ) { - onSetAllUserAttributes?.invoke(userAttributes, userAttributeLists, user) + onSetAllUserAttributes?.invoke(userAttributes, userAttributeLists) userAttributes?.forEach { onAttributeReceived?.invoke(it.key, it.value) } } override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { - onSetUserAttribute?.invoke(key, value, user) + onSetUserAttribute?.invoke(key, value) onAttributeReceived?.invoke(key, value) - onUserReceived?.invoke(user) + onUserReceived?.invoke(null) } override fun onSetUserTag( key: String?, - user: FilteredMParticleUser?, ) { - onSetUserTag?.invoke(key, user) + onSetUserTag?.invoke(key) onAttributeReceived?.invoke(key, null) - onUserReceived?.invoke(user) + onUserReceived?.invoke(null) } override fun onIncrementUserAttribute( key: String?, incrementedBy: Number, value: String?, - user: FilteredMParticleUser?, ) { - onIncrementUserAttribute?.invoke(key, incrementedBy, value, user) + onIncrementUserAttribute?.invoke(key, incrementedBy, value) onAttributeReceived?.invoke(key, value) - onUserReceived?.invoke(user) + onUserReceived?.invoke(null) } override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { - onSetUserAttributeList?.invoke(attributeKey, attributeValueList, user) + onSetUserAttributeList?.invoke(attributeKey, attributeValueList) onAttributeReceived?.invoke(attributeKey, attributeValueList) - onUserReceived?.invoke(user) + onUserReceived?.invoke(null) } override fun onRemoveUserAttribute( key: String?, - user: FilteredMParticleUser?, ) { - onRemoveUserAttribute?.invoke(key, user) + onRemoveUserAttribute?.invoke(key) onAttributeReceived?.invoke(key, null) - onUserReceived?.invoke(user) + onUserReceived?.invoke(null) } override fun supportsAttributeLists() = supportsAttributeLists?.invoke() ?: true diff --git a/android-kit-base/src/main/java/com/mparticle/kits/KitIntegration.java b/android-kit-base/src/main/java/com/mparticle/kits/KitIntegration.java index 5b3ebbc1e..c7b35f924 100644 --- a/android-kit-base/src/main/java/com/mparticle/kits/KitIntegration.java +++ b/android-kit-base/src/main/java/com/mparticle/kits/KitIntegration.java @@ -539,31 +539,27 @@ public interface UserAttributeListener { /** * Called when a user attribute is removed for the current user. * - * @param key attribute key - * @param user filtered user context for this kit + * @param key attribute key */ - void onRemoveUserAttribute(String key, FilteredMParticleUser user); + void onRemoveUserAttribute(String key); /** * Called when a scalar user attribute is set for the current user. * * @param key attribute key * @param value attribute value (may be non-String for some call paths) - * @param user filtered user context for this kit */ - void onSetUserAttribute(String key, Object value, FilteredMParticleUser user); + void onSetUserAttribute(String key, Object value); /** * Called when a list-valued user attribute is set and {@link #supportsAttributeLists()} returns true. * * @param attributeKey attribute key (may be null) * @param attributeValueList attribute values (may be null) - * @param user filtered user context for this kit (may be null) */ void onSetUserAttributeList( @Nullable String attributeKey, - @Nullable List attributeValueList, - @Nullable FilteredMParticleUser user); + @Nullable List attributeValueList); /** * Called when the full set of user attributes is synchronized for the current user. @@ -571,18 +567,20 @@ void onSetUserAttributeList( * @param userAttributes scalar user attributes * @param userAttributeLists list-valued user attributes when {@link #supportsAttributeLists()} is true; * otherwise list values may be merged into scalars by the framework - * @param user filtered user context for this kit */ void onSetAllUserAttributes( Map userAttributes, - Map> userAttributeLists, - FilteredMParticleUser user); + Map> userAttributeLists); - void onIncrementUserAttribute(String key, Number incrementedBy, String value, FilteredMParticleUser user); + void onIncrementUserAttribute(String key, Number incrementedBy, String value); - void onSetUserTag(String key, FilteredMParticleUser user); + void onSetUserTag(String key); - void onConsentStateUpdated(ConsentState oldState, ConsentState newState, FilteredMParticleUser user); + void onConsentStateUpdated(ConsentState oldState, ConsentState newState); + + KitConfiguration getConfiguration(); + + String getName(); } public interface BatchListener { diff --git a/android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java b/android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java index d65c9d638..0374be214 100644 --- a/android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java +++ b/android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java @@ -87,6 +87,27 @@ public class KitManagerImpl implements KitManager, AttributionListener, Identity ConcurrentHashMap providers = new ConcurrentHashMap(); + + List activeKits() { + List activeKits = new ArrayList<>(); + for (KitIntegration kit : providers.values()) { + if (!kit.isDisabled()) { + activeKits.add(kit); + } + } + return activeKits; + } + + private List userAttributeListeners() { + List listeners = new ArrayList<>(); + for (KitIntegration kit : activeKits()) { + if (kit instanceof KitIntegration.UserAttributeListener listener) { + listeners.add(listener); + } + } + return listeners; + } + private final Context mContext; public KitManagerImpl(Context context, ReportingManager reportingManager, CoreCallbacks coreCallbacks, MParticleOptions options) { @@ -597,45 +618,44 @@ public boolean onPushRegistration(String token, String senderId) { public void onUserAttributesReceived(Map userAttributes, Map> userAttributeLists, Long mpid) { userAttributes = mDataplanFilter.transformUserAttributes(userAttributes); userAttributeLists = mDataplanFilter.transformUserAttributes(userAttributeLists); - for (KitIntegration provider : providers.values()) { + for (KitIntegration.UserAttributeListener listener : userAttributeListeners()) { try { - if ((provider instanceof KitIntegration.UserAttributeListener listener) - && !provider.isDisabled()) { - Map filteredAttributeSingles = (Map) KitConfiguration.filterAttributes(provider.getConfiguration().getUserAttributeFilters(), - userAttributes); - Map> filteredAttributeLists = (Map>) KitConfiguration.filterAttributes(provider.getConfiguration().getUserAttributeFilters(), - userAttributeLists); - boolean supportsAttributeLists = listener.supportsAttributeLists(); - FilteredMParticleUser filteredUser = FilteredMParticleUser.getInstance(mpid, provider); - if (supportsAttributeLists) { - listener.onSetAllUserAttributes(filteredAttributeSingles, filteredAttributeLists, filteredUser); - } else { - Map singlesCopy = new HashMap<>(filteredAttributeSingles); - for (Map.Entry> entry : filteredAttributeLists.entrySet()) { - singlesCopy.put(entry.getKey(), KitUtils.join(entry.getValue())); - } - listener.onSetAllUserAttributes(singlesCopy, new HashMap>(), filteredUser); + Map filteredAttributeSingles = (Map) KitConfiguration.filterAttributes(listener.getConfiguration().getUserAttributeFilters(), + userAttributes); + Map> filteredAttributeLists = (Map>) KitConfiguration.filterAttributes(listener.getConfiguration().getUserAttributeFilters(), + userAttributeLists); + boolean supportsAttributeLists = listener.supportsAttributeLists(); + if (supportsAttributeLists) { + listener.onSetAllUserAttributes(filteredAttributeSingles, filteredAttributeLists); + } else { + Map singlesCopy = new HashMap<>(filteredAttributeSingles); + for (Map.Entry> entry : filteredAttributeLists.entrySet()) { + singlesCopy.put(entry.getKey(), KitUtils.join(entry.getValue())); } + listener.onSetAllUserAttributes(singlesCopy, new HashMap>()); } } catch (Exception e) { - Logger.warning("Failed to call setUserAttributes for kit: " + provider.getName() + ": " + e.getMessage()); + Logger.warning("Failed to call setUserAttributes for kit: " + listener.getName() + ": " + e.getMessage()); } } } private void syncUserIdentities(KitIntegration.ModifyIdentityListener listener, KitConfiguration configuration) { MParticle instance = MParticle.getInstance(); - if (instance != null) { - MParticleUser user = instance.Identity().getCurrentUser(); - if (user != null) { - Map identities = user.getUserIdentities(); - if (identities != null) { - for (Map.Entry entry : identities.entrySet()) { - if (configuration.shouldSetIdentity(entry.getKey())) { - listener.setUserIdentity(entry.getKey(), entry.getValue()); - } - } - } + if (instance == null) { + return; + } + + MParticleUser user = instance.Identity().getCurrentUser(); + if (user == null) { + return; + } + + Map identities = user.getUserIdentities(); + + for (Map.Entry entry : identities.entrySet()) { + if (configuration.shouldSetIdentity(entry.getKey())) { + listener.setUserIdentity(entry.getKey(), entry.getValue()); } } } @@ -645,11 +665,14 @@ public void setUserAttribute(String attributeKey, String attributeValue, long mp if (mDataplanFilter.isUserAttributeBlocked(attributeKey)) { return; } - for (KitIntegration provider : providers.values()) { + for (KitIntegration.UserAttributeListener listener : userAttributeListeners()) { try { - setUserAttribute(provider, attributeKey, attributeValue, mpid); + if (KitConfiguration.shouldForwardAttribute(listener.getConfiguration().getUserAttributeFilters(), + attributeKey)) { + listener.onSetUserAttribute(attributeKey, attributeValue); + } } catch (Exception e) { - Logger.warning("Failed to call setUserAttributes/onSetUserAttribute for kit: " + provider.getName() + ": " + e.getMessage()); + Logger.warning("Failed to call setUserAttributes/onSetUserAttribute for kit: " + listener.getName() + ": " + e.getMessage()); } } } @@ -659,52 +682,34 @@ public void setUserAttributeList(String attributeKey, List valuesList, l if (mDataplanFilter.isUserAttributeBlocked(attributeKey)) { return; } - for (KitIntegration provider : providers.values()) { + for (KitIntegration.UserAttributeListener listener : userAttributeListeners()) { try { - setUserAttribute(provider, attributeKey, valuesList, mpid); + if (KitConfiguration.shouldForwardAttribute(listener.getConfiguration().getUserAttributeFilters(), attributeKey)) { + boolean supportsAttributeLists = listener.supportsAttributeLists(); + if (supportsAttributeLists) { + listener.onSetUserAttributeList(attributeKey, valuesList); + } else { + listener.onSetUserAttribute(attributeKey, KitUtils.join(valuesList)); + } + } } catch (Exception e) { - Logger.warning("Failed to call setUserAttributes/onSetUserAttribute for kit: " + provider.getName() + ": " + e.getMessage()); - } - } - } - - private void setUserAttribute(KitIntegration provider, String attributeKey, List valueList, long mpid) { - if ((provider instanceof KitIntegration.UserAttributeListener listener) - && !provider.isDisabled() - && KitConfiguration.shouldForwardAttribute(provider.getConfiguration().getUserAttributeFilters(), attributeKey)) { - boolean supportsAttributeLists = listener.supportsAttributeLists(); - FilteredMParticleUser user = FilteredMParticleUser.getInstance(mpid, provider); - if (supportsAttributeLists) { - listener.onSetUserAttributeList(attributeKey, valueList, user); - } else { - listener.onSetUserAttribute(attributeKey, KitUtils.join(valueList), user); + Logger.warning("Failed to call setUserAttributes/onSetUserAttribute for kit: " + listener.getName() + ": " + e.getMessage()); } } } - private void setUserAttribute(KitIntegration provider, String attributeKey, String attributeValue, long mpid) { - if ((provider instanceof KitIntegration.UserAttributeListener listener) - && !provider.isDisabled() - && KitConfiguration.shouldForwardAttribute(provider.getConfiguration().getUserAttributeFilters(), - attributeKey)) { - listener.onSetUserAttribute(attributeKey, attributeValue, FilteredMParticleUser.getInstance(mpid, provider)); - } - } - @Override public void removeUserAttribute(String key, long mpid) { if (mDataplanFilter.isUserAttributeBlocked(key)) { return; } - for (KitIntegration provider : providers.values()) { + for (KitIntegration.UserAttributeListener listener : userAttributeListeners()) { try { - if ((provider instanceof KitIntegration.UserAttributeListener listener) - && !provider.isDisabled() - && KitConfiguration.shouldForwardAttribute(provider.getConfiguration().getUserAttributeFilters(), key)) { - listener.onRemoveUserAttribute(key, FilteredMParticleUser.getInstance(mpid, provider)); + if (KitConfiguration.shouldForwardAttribute(listener.getConfiguration().getUserAttributeFilters(), key)) { + listener.onRemoveUserAttribute(key); } } catch (Exception e) { - Logger.warning("Failed to call removeUserAttribute/onRemoveUserAttribute for kit: " + provider.getName() + ": " + e.getMessage()); + Logger.warning("Failed to call removeUserAttribute/onRemoveUserAttribute for kit: " + listener.getName() + ": " + e.getMessage()); } } } @@ -714,16 +719,14 @@ public void incrementUserAttribute(String key, Number incrementedBy, String newV if (mDataplanFilter.isUserAttributeBlocked(key)) { return; } - for (KitIntegration provider : providers.values()) { + for (KitIntegration.UserAttributeListener listener : userAttributeListeners()) { try { - if (!provider.isDisabled() && KitConfiguration.shouldForwardAttribute(provider.getConfiguration().getUserAttributeFilters(), key)) { - if (provider instanceof KitIntegration.UserAttributeListener listener) { - listener.onIncrementUserAttribute(key, incrementedBy, newValue, FilteredMParticleUser.getInstance(mpid, provider)); - listener.onSetUserAttribute(key, newValue, FilteredMParticleUser.getInstance(mpid, provider)); - } + if (KitConfiguration.shouldForwardAttribute(listener.getConfiguration().getUserAttributeFilters(), key)) { + listener.onIncrementUserAttribute(key, incrementedBy, newValue); + listener.onSetUserAttribute(key, newValue); } } catch (Exception e) { - Logger.warning("Failed to call onIncrementUserAttribute for kit: " + provider.getName() + ": " + e.getMessage()); + Logger.warning("Failed to call onIncrementUserAttribute for kit: " + listener.getName() + ": " + e.getMessage()); } } } @@ -733,14 +736,13 @@ public void setUserTag(String tag, long mpid) { if (mDataplanFilter.isUserAttributeBlocked(tag)) { return; } - for (KitIntegration provider : providers.values()) { + for (KitIntegration.UserAttributeListener listener : userAttributeListeners()) { try { - if (provider instanceof KitIntegration.UserAttributeListener && !provider.isDisabled() - && KitConfiguration.shouldForwardAttribute(provider.getConfiguration().getUserAttributeFilters(), tag)) { - ((KitIntegration.UserAttributeListener) provider).onSetUserTag(tag, FilteredMParticleUser.getInstance(mpid, provider)); + if (KitConfiguration.shouldForwardAttribute(listener.getConfiguration().getUserAttributeFilters(), tag)) { + listener.onSetUserTag(tag); } } catch (Exception e) { - Logger.warning("Failed to call onSetUserTag for kit: " + provider.getName() + ": " + e.getMessage()); + Logger.warning("Failed to call onSetUserTag for kit: " + listener.getName() + ": " + e.getMessage()); } } } @@ -750,13 +752,13 @@ public void setUserIdentity(String id, MParticle.IdentityType identityType) { if (mDataplanFilter.isUserIdentityBlocked(identityType)) { return; } - for (KitIntegration provider : providers.values()) { + for (KitIntegration kit : activeKits()) { try { - if (provider instanceof KitIntegration.ModifyIdentityListener && !provider.isDisabled() && provider.getConfiguration().shouldSetIdentity(identityType)) { - ((KitIntegration.ModifyIdentityListener) provider).setUserIdentity(identityType, id); + if (kit instanceof KitIntegration.ModifyIdentityListener listener && kit.getConfiguration().shouldSetIdentity(identityType)) { + listener.setUserIdentity(identityType, id); } } catch (Exception e) { - Logger.warning("Failed to call setUserIdentity for kit: " + provider.getName() + ": " + e.getMessage()); + Logger.warning("Failed to call setUserIdentity for kit: " + kit.getName() + ": " + e.getMessage()); } } } @@ -766,26 +768,26 @@ public void removeUserIdentity(MParticle.IdentityType identityType) { if (mDataplanFilter.isUserIdentityBlocked(identityType)) { return; } - for (KitIntegration provider : providers.values()) { + for (KitIntegration kit : activeKits()) { try { - if (provider instanceof KitIntegration.ModifyIdentityListener && !provider.isDisabled()) { - ((KitIntegration.ModifyIdentityListener) provider).removeUserIdentity(identityType); + if (kit instanceof KitIntegration.ModifyIdentityListener listener) { + listener.removeUserIdentity(identityType); } } catch (Exception e) { - Logger.warning("Failed to call removeUserIdentity for kit: " + provider.getName() + ": " + e.getMessage()); + Logger.warning("Failed to call removeUserIdentity for kit: " + kit.getName() + ": " + e.getMessage()); } } } @Override public void logout() { - for (KitIntegration provider : providers.values()) { + for (KitIntegration kit : activeKits()) { try { - if (provider instanceof LogoutListener listener && !provider.isDisabled()) { + if (kit instanceof LogoutListener listener) { getReportingManager().logAll(listener.logout()); } } catch (Exception e) { - Logger.warning("Failed to call logout for kit: " + provider.getName() + ": " + e.getMessage()); + Logger.warning("Failed to call logout for kit: " + kit.getName() + ": " + e.getMessage()); } } } @@ -1300,7 +1302,7 @@ public void onConsentStateUpdated(final ConsentState oldState, final ConsentStat for (KitIntegration provider : providers.values()) { if (provider instanceof KitIntegration.UserAttributeListener && !provider.isDisabled()) { try { - ((KitIntegration.UserAttributeListener) provider).onConsentStateUpdated(oldState, newState, FilteredMParticleUser.getInstance(mpid, provider)); + ((KitIntegration.UserAttributeListener) provider).onConsentStateUpdated(oldState, newState); } catch (Exception e) { Logger.warning("Failed to call onConsentStateUpdated for kit: " + provider.getName() + ": " + e.getMessage()); } diff --git a/android-kit-base/src/test/kotlin/com/mparticle/kits/KitManagerImplTest.kt b/android-kit-base/src/test/kotlin/com/mparticle/kits/KitManagerImplTest.kt index 635ed2625..95de0b0c5 100644 --- a/android-kit-base/src/test/kotlin/com/mparticle/kits/KitManagerImplTest.kt +++ b/android-kit-base/src/test/kotlin/com/mparticle/kits/KitManagerImplTest.kt @@ -51,7 +51,6 @@ import org.junit.runner.RunWith import org.mockito.ArgumentCaptor import org.mockito.ArgumentMatchers.any import org.mockito.ArgumentMatchers.eq -import org.mockito.ArgumentMatchers.isNull import org.mockito.Mockito import org.mockito.Mockito.mock import org.mockito.Mockito.never @@ -94,6 +93,25 @@ class KitManagerImplTest { Assert.assertEquals(factory, manager.mKitIntegrationFactory) } + @Test + fun testActiveKitsExcludesDisabled() { + val manager: KitManagerImpl = MockKitManagerImpl() + val enabled1 = mock(KitIntegration::class.java) + val enabled2 = mock(KitIntegration::class.java) + val disabled = mock(KitIntegration::class.java) + `when`(enabled1.isDisabled()).thenReturn(false) + `when`(enabled2.isDisabled()).thenReturn(false) + `when`(disabled.isDisabled()).thenReturn(true) + manager.providers[1] = enabled1 + manager.providers[2] = disabled + manager.providers[3] = enabled2 + val active = manager.activeKits() + assertEquals(2, active.size) + assertTrue(active.contains(enabled1)) + assertTrue(active.contains(enabled2)) + Assert.assertFalse(active.contains(disabled)) + } + private fun createKitsMap( ids: List, type: Class<*> = KitIntegration::class.java, @@ -520,14 +538,14 @@ class KitManagerImplTest { userAttributeLists["test 3"] = attributeList manager.onUserAttributesReceived(userAttributeSingles, userAttributeLists, 1L) verify(integration as UserAttributeListener, Mockito.times(1)) - .onSetAllUserAttributes(eq(userAttributeSingles), eq(userAttributeLists), any()) + .onSetAllUserAttributes(eq(userAttributeSingles), eq(userAttributeLists)) val userAttributesCombined: MutableMap = HashMap() userAttributesCombined["test"] = "whatever" userAttributesCombined["test 2"] = "whatever 2" userAttributesCombined["test 3"] = "1,2,3" val clearedOutList: Map> = HashMap() verify(integration2 as UserAttributeListener, Mockito.times(1)) - .onSetAllUserAttributes(eq(userAttributesCombined), eq(clearedOutList), any()) + .onSetAllUserAttributes(eq(userAttributesCombined), eq(clearedOutList)) } @Test @@ -559,9 +577,9 @@ class KitManagerImplTest { attributeList.add("3") manager.setUserAttributeList("test key", attributeList, 1) verify(integration as UserAttributeListener, Mockito.times(1)) - .onSetUserAttributeList(eq("test key"), eq(attributeList), any()) + .onSetUserAttributeList(eq("test key"), eq(attributeList)) verify(integration2 as UserAttributeListener, Mockito.times(1)) - .onSetUserAttribute(eq("test key"), eq("1,2,3"), isNull()) + .onSetUserAttribute(eq("test key"), eq("1,2,3")) } @Test diff --git a/kits/adobe/adobe-5/src/main/kotlin/com/mparticle/kits/AdobeKitBase.kt b/kits/adobe/adobe-5/src/main/kotlin/com/mparticle/kits/AdobeKitBase.kt index 307d08999..bee7afe71 100644 --- a/kits/adobe/adobe-5/src/main/kotlin/com/mparticle/kits/AdobeKitBase.kt +++ b/kits/adobe/adobe-5/src/main/kotlin/com/mparticle/kits/AdobeKitBase.kt @@ -54,7 +54,6 @@ abstract class AdobeKitBase : override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { syncIds() } @@ -64,14 +63,12 @@ abstract class AdobeKitBase : override fun onSetAllUserAttributes( userAttributes: Map, userAttributeLists: Map>, - user: FilteredMParticleUser, ) { syncIds() } override fun onRemoveUserAttribute( key: String, - user: FilteredMParticleUser, ) { syncIds() } @@ -79,7 +76,6 @@ abstract class AdobeKitBase : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { if (key == null || value == null || value !is String) { return @@ -91,20 +87,17 @@ abstract class AdobeKitBase : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { } override fun onSetUserTag( key: String?, - user: FilteredMParticleUser?, ) { } override fun onConsentStateUpdated( oldState: ConsentState?, newState: ConsentState?, - user: FilteredMParticleUser?, ) { } diff --git a/kits/adobemedia/adobemedia-5/src/main/kotlin/com/mparticle/kits/AdobeKit.kt b/kits/adobemedia/adobemedia-5/src/main/kotlin/com/mparticle/kits/AdobeKit.kt index 3f62c44fe..7ac44696d 100644 --- a/kits/adobemedia/adobemedia-5/src/main/kotlin/com/mparticle/kits/AdobeKit.kt +++ b/kits/adobemedia/adobemedia-5/src/main/kotlin/com/mparticle/kits/AdobeKit.kt @@ -91,7 +91,6 @@ open class AdobeKit : override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { syncIds() } @@ -101,14 +100,12 @@ open class AdobeKit : override fun onSetAllUserAttributes( userAttributes: Map, userAttributeLists: Map>, - user: FilteredMParticleUser, ) { syncIds() } override fun onRemoveUserAttribute( key: String, - user: FilteredMParticleUser, ) { syncIds() } @@ -116,7 +113,6 @@ open class AdobeKit : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { if (key == null || value == null || value !is String) { return @@ -128,20 +124,17 @@ open class AdobeKit : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { } override fun onSetUserTag( key: String?, - user: FilteredMParticleUser?, ) { } override fun onConsentStateUpdated( oldState: ConsentState?, newState: ConsentState?, - user: FilteredMParticleUser?, ) { } diff --git a/kits/appsflyer/appsflyer-6/src/main/kotlin/com/mparticle/kits/AppsFlyerKit.kt b/kits/appsflyer/appsflyer-6/src/main/kotlin/com/mparticle/kits/AppsFlyerKit.kt index f45d59e61..bf38ca82f 100644 --- a/kits/appsflyer/appsflyer-6/src/main/kotlin/com/mparticle/kits/AppsFlyerKit.kt +++ b/kits/appsflyer/appsflyer-6/src/main/kotlin/com/mparticle/kits/AppsFlyerKit.kt @@ -252,34 +252,29 @@ class AppsFlyerKit : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { } override fun onRemoveUserAttribute( key: String?, - user: FilteredMParticleUser?, ) { } override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { // No-op: this kit does not implement this feature. } override fun onSetUserTag( key: String?, - user: FilteredMParticleUser?, ) { } override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { // not supported } @@ -287,7 +282,6 @@ class AppsFlyerKit : override fun onSetAllUserAttributes( userAttributes: MutableMap?, userAttributeLists: MutableMap>?, - user: FilteredMParticleUser?, ) { // No-op: this kit does not implement this feature. } @@ -375,7 +369,6 @@ class AppsFlyerKit : override fun onConsentStateUpdated( consentState: ConsentState, consentState1: ConsentState, - filteredMParticleUser: FilteredMParticleUser, ) { setConsent(consentState1) } diff --git a/kits/appsflyer/appsflyer-6/src/test/kotlin/com/mparticle/kits/AppsflyerKitTests.kt b/kits/appsflyer/appsflyer-6/src/test/kotlin/com/mparticle/kits/AppsflyerKitTests.kt index f83866d2b..64076c834 100644 --- a/kits/appsflyer/appsflyer-6/src/test/kotlin/com/mparticle/kits/AppsflyerKitTests.kt +++ b/kits/appsflyer/appsflyer-6/src/test/kotlin/com/mparticle/kits/AppsflyerKitTests.kt @@ -34,9 +34,6 @@ class AppsflyerKitTests { private var kit = AppsFlyerKit() private var appsflyer = AppsFlyerLib() - @Mock - lateinit var filteredMParticleUser: FilteredMParticleUser - @Mock lateinit var user: MParticleUser @@ -226,9 +223,7 @@ class AppsflyerKitTests { .builder() .addGDPRConsentState("Marketing", marketingConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) val afConsentResults = appsflyer.getConsentState() val expectedConsentValue = @@ -275,9 +270,7 @@ class AppsflyerKitTests { .builder() .addGDPRConsentState("test1", marketingConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) val afConsentResults = appsflyer.getConsentState() val expectedConsentValue = @@ -324,9 +317,7 @@ class AppsflyerKitTests { .builder() .addGDPRConsentState("test1", marketingConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) val afConsentResults = appsflyer.getConsentState() val expectedConsentValue = @@ -392,9 +383,7 @@ class AppsflyerKitTests { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("testconsent", testConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) val afConsentResults = appsflyer.getConsentState() val expectedConsentValue = @@ -453,9 +442,7 @@ class AppsflyerKitTests { .addGDPRConsentState("Performance", performanceConsent) .addGDPRConsentState("Marketing", marketingConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) val afConsentResults = appsflyer.getConsentState() val expectedConsentValue = @@ -511,9 +498,7 @@ class AppsflyerKitTests { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) val afConsentResults = appsflyer.getConsentState() val expectedConsentValue = afConsentResults @@ -559,9 +544,7 @@ class AppsflyerKitTests { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals(0, appsflyer.getConsentState().size) } @@ -599,9 +582,7 @@ class AppsflyerKitTests { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) val afConsentResults = appsflyer.getConsentState() val expectedConsentValue = @@ -657,9 +638,7 @@ class AppsflyerKitTests { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals(1, appsflyer.getConsentState().size) val afConsentResults = appsflyer.getConsentState() diff --git a/kits/apptentive/apptentive-6/src/main/kotlin/com/mparticle/kits/ApptentiveKit.kt b/kits/apptentive/apptentive-6/src/main/kotlin/com/mparticle/kits/ApptentiveKit.kt index f34e4bf0f..e0e46217c 100644 --- a/kits/apptentive/apptentive-6/src/main/kotlin/com/mparticle/kits/ApptentiveKit.kt +++ b/kits/apptentive/apptentive-6/src/main/kotlin/com/mparticle/kits/ApptentiveKit.kt @@ -79,7 +79,6 @@ class ApptentiveKit : override fun onConsentStateUpdated( oldState: ConsentState?, newState: ConsentState?, - user: FilteredMParticleUser?, ) { // Ignored } @@ -91,14 +90,12 @@ class ApptentiveKit : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { // Ignored } override fun onRemoveUserAttribute( key: String?, - user: FilteredMParticleUser?, ) { key?.let { Apptentive.removeCustomPersonData(it) @@ -108,7 +105,6 @@ class ApptentiveKit : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { if (key != null && value != null) { when (key.lowercase()) { @@ -136,7 +132,6 @@ class ApptentiveKit : override fun onSetUserTag( key: String?, - user: FilteredMParticleUser?, ) { // Ignored } @@ -144,7 +139,6 @@ class ApptentiveKit : override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { // Ignored } @@ -152,7 +146,6 @@ class ApptentiveKit : override fun onSetAllUserAttributes( userAttributes: MutableMap?, userAttributeLists: MutableMap>?, - user: FilteredMParticleUser?, ) { userAttributes?.let { userAttribute -> val firstName = userAttribute[MParticle.UserAttributes.FIRSTNAME] ?: "" diff --git a/kits/apptentive/apptentive-6/src/test/kotlin/com/mparticle/kits/ApptentiveKitTest.kt b/kits/apptentive/apptentive-6/src/test/kotlin/com/mparticle/kits/ApptentiveKitTest.kt index 46645a995..64a70cc07 100644 --- a/kits/apptentive/apptentive-6/src/test/kotlin/com/mparticle/kits/ApptentiveKitTest.kt +++ b/kits/apptentive/apptentive-6/src/test/kotlin/com/mparticle/kits/ApptentiveKitTest.kt @@ -60,14 +60,13 @@ class ApptentiveKitTest { @Test fun testLastNameValueOnSetUserAttribute() { - val user = mockk() mockkStatic(Apptentive::class) every { Apptentive.setPersonName(any()) } returns Unit val key = MParticle.UserAttributes.LASTNAME val value = "Doe" // when - kit.onSetUserAttribute(key, value, user) + kit.onSetUserAttribute(key, value) // then verify { Apptentive.setPersonName("Doe") } @@ -76,7 +75,6 @@ class ApptentiveKitTest { @OptIn(InternalUseOnly::class) @Test fun testFirstNameValueOnSetUserAttribute() { - val user = mockk() mockkStatic(Apptentive::class) every { Apptentive.setPersonName(any()) } returns Unit @@ -84,7 +82,7 @@ class ApptentiveKitTest { val value = "John" // when - kit.onSetUserAttribute(key, value, user) + kit.onSetUserAttribute(key, value) // then verify { Apptentive.setPersonName("John") } @@ -92,7 +90,6 @@ class ApptentiveKitTest { @Test fun testPersonCustomData() { - val user = mockk() mockkStatic(Apptentive::class) every { Apptentive.addCustomPersonData(any(), any()) } returns Unit every { Apptentive.addCustomPersonData(any(), 30) } returns Unit @@ -100,7 +97,7 @@ class ApptentiveKitTest { val value = "30" // when - kit.onSetUserAttribute(key, value, user) + kit.onSetUserAttribute(key, value) // then // enableTypeDetection is false & 30 will be passed as string @@ -109,14 +106,13 @@ class ApptentiveKitTest { @Test fun testOnSetUserAttributeWithNullKey() { - val user = mockk() mockkStatic(Apptentive::class) val key = null val value = "30" // when - kit.onSetUserAttribute(key, value, user) + kit.onSetUserAttribute(key, value) // then verify(exactly = 0) { Apptentive.setPersonName(any()) } @@ -135,12 +131,11 @@ class ApptentiveKitTest { MParticle.UserAttributes.LASTNAME to "Doe", ) - val user = mockk() mockkStatic(Apptentive::class) every { Apptentive.setPersonName(any()) } returns Unit // when - kit.onSetAllUserAttributes(userAttributes, null, user) + kit.onSetAllUserAttributes(userAttributes, null) verify { Apptentive.setPersonName("John Doe") @@ -154,11 +149,10 @@ class ApptentiveKitTest { "key1" to "value1", "key2" to "20", ) - val user = mockk() mockkStatic(Apptentive::class) every { Apptentive.addCustomPersonData(any(), any()) } returns Unit every { Apptentive.addCustomPersonData(any(), 20) } returns Unit - kit.onSetAllUserAttributes(userAttributes, null, user) + kit.onSetAllUserAttributes(userAttributes, null) verify { Apptentive.addCustomPersonData("key1", "value1") diff --git a/kits/apptimize/apptimize-3/src/main/kotlin/com/mparticle/kits/ApptimizeKit.kt b/kits/apptimize/apptimize-3/src/main/kotlin/com/mparticle/kits/ApptimizeKit.kt index 5b8208d82..12e6f75e8 100644 --- a/kits/apptimize/apptimize-3/src/main/kotlin/com/mparticle/kits/ApptimizeKit.kt +++ b/kits/apptimize/apptimize-3/src/main/kotlin/com/mparticle/kits/ApptimizeKit.kt @@ -127,7 +127,6 @@ class ApptimizeKit : override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { // not supported by the Apptimize kit } @@ -140,7 +139,6 @@ class ApptimizeKit : override fun onSetAllUserAttributes( userAttributes: Map, userAttributeLists: Map>, - user: FilteredMParticleUser, ) { for ((key, value) in userAttributes) { Apptimize.setUserAttribute(key, value) @@ -149,7 +147,6 @@ class ApptimizeKit : override fun onRemoveUserAttribute( key: String, - user: FilteredMParticleUser, ) { Apptimize.clearUserAttribute(key) } @@ -157,7 +154,6 @@ class ApptimizeKit : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { if (key == null || value == null || value !is String) { return @@ -169,20 +165,17 @@ class ApptimizeKit : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { } override fun onSetUserTag( key: String?, - user: FilteredMParticleUser?, ) { } override fun onConsentStateUpdated( oldState: ConsentState?, newState: ConsentState?, - user: FilteredMParticleUser?, ) { } diff --git a/kits/branch/branch-5/src/main/kotlin/com/mparticle/kits/BranchMetricsKit.kt b/kits/branch/branch-5/src/main/kotlin/com/mparticle/kits/BranchMetricsKit.kt index 75f1f6146..9c863b57f 100644 --- a/kits/branch/branch-5/src/main/kotlin/com/mparticle/kits/BranchMetricsKit.kt +++ b/kits/branch/branch-5/src/main/kotlin/com/mparticle/kits/BranchMetricsKit.kt @@ -180,7 +180,6 @@ class BranchMetricsKit : override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { // not supported } @@ -190,13 +189,11 @@ class BranchMetricsKit : override fun onSetAllUserAttributes( userAttributes: Map, userAttributeLists: Map>, - user: FilteredMParticleUser, ) { } override fun onRemoveUserAttribute( key: String, - user: FilteredMParticleUser, ) { // No-op: this kit does not implement this feature. } @@ -204,7 +201,6 @@ class BranchMetricsKit : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { // No-op: this kit does not implement this feature. } @@ -213,20 +209,17 @@ class BranchMetricsKit : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { } override fun onSetUserTag( key: String?, - user: FilteredMParticleUser?, ) { } override fun onConsentStateUpdated( oldState: ConsentState?, newState: ConsentState?, - user: FilteredMParticleUser?, ) { } diff --git a/kits/braze/braze-38/src/main/kotlin/com/mparticle/kits/AppboyKit.kt b/kits/braze/braze-38/src/main/kotlin/com/mparticle/kits/AppboyKit.kt index 00b534708..943d5b5d3 100644 --- a/kits/braze/braze-38/src/main/kotlin/com/mparticle/kits/AppboyKit.kt +++ b/kits/braze/braze-38/src/main/kotlin/com/mparticle/kits/AppboyKit.kt @@ -444,13 +444,11 @@ open class AppboyKit : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { } override fun onRemoveUserAttribute( key: String?, - user: FilteredMParticleUser?, ) { if (key == null) { return @@ -488,7 +486,6 @@ open class AppboyKit : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { if (key == null || value == null || value !is String) { return @@ -498,7 +495,6 @@ open class AppboyKit : override fun onSetUserTag( key: String?, - user: FilteredMParticleUser?, ) { // No-op: this kit does not implement this feature. } @@ -506,7 +502,6 @@ open class AppboyKit : override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { if (attributeKey == null || attributeValueList == null) { return @@ -533,7 +528,6 @@ open class AppboyKit : override fun onSetAllUserAttributes( userAttributes: MutableMap?, userAttributeLists: MutableMap>?, - user: FilteredMParticleUser?, ) { val attributes = userAttributes ?: emptyMap() val attributeLists = userAttributeLists ?: emptyMap() @@ -567,7 +561,6 @@ open class AppboyKit : override fun onConsentStateUpdated( oldState: ConsentState, newState: ConsentState, - user: FilteredMParticleUser, ) { setConsent(newState) } diff --git a/kits/braze/braze-38/src/test/kotlin/com/mparticle/kits/AppboyKitTests.kt b/kits/braze/braze-38/src/test/kotlin/com/mparticle/kits/AppboyKitTests.kt index 86c64652b..d4168c4f5 100644 --- a/kits/braze/braze-38/src/test/kotlin/com/mparticle/kits/AppboyKitTests.kt +++ b/kits/braze/braze-38/src/test/kotlin/com/mparticle/kits/AppboyKitTests.kt @@ -43,9 +43,6 @@ class AppboyKitTests { @Mock private val mTypeFilters: SparseBooleanArray? = null - @Mock - lateinit var filteredMParticleUser: FilteredMParticleUser - @Mock lateinit var user: MParticleUser @@ -258,10 +255,9 @@ class AppboyKitTests { val currentUser = braze.currentUser kit.onKitCreate(settings, MockContextApplication()) - val filteredUser = Mockito.mock(FilteredMParticleUser::class.java) - kit.onSetUserAttribute("test1", "true", filteredUser) - kit.onSetUserAttribute("test2", "false", filteredUser) - kit.onSetUserAttribute("test3", "notABoolean", filteredUser) + kit.onSetUserAttribute("test1", "true") + kit.onSetUserAttribute("test2", "false") + kit.onSetUserAttribute("test3", "notABoolean") Assert.assertEquals(2, currentUser.getCustomUserAttribute().size.toLong()) } @@ -1334,9 +1330,7 @@ class AppboyKitTests { .builder() .addGDPRConsentState("Marketing", marketingConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals( false, currentUser.getCustomUserAttribute()["\$google_ad_personalization"], @@ -1382,9 +1376,7 @@ class AppboyKitTests { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals(true, currentUser.getCustomUserAttribute()["\$google_ad_user_data"]) TestCase.assertEquals( true, @@ -1419,8 +1411,7 @@ class AppboyKitTests { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals(0, currentUser.getCustomUserAttribute().size) } @@ -1460,9 +1451,7 @@ class AppboyKitTests { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals(0, currentUser.getCustomUserAttribute().size) } diff --git a/kits/braze/braze-39/src/main/kotlin/com/mparticle/kits/AppboyKit.kt b/kits/braze/braze-39/src/main/kotlin/com/mparticle/kits/AppboyKit.kt index 00b534708..943d5b5d3 100644 --- a/kits/braze/braze-39/src/main/kotlin/com/mparticle/kits/AppboyKit.kt +++ b/kits/braze/braze-39/src/main/kotlin/com/mparticle/kits/AppboyKit.kt @@ -444,13 +444,11 @@ open class AppboyKit : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { } override fun onRemoveUserAttribute( key: String?, - user: FilteredMParticleUser?, ) { if (key == null) { return @@ -488,7 +486,6 @@ open class AppboyKit : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { if (key == null || value == null || value !is String) { return @@ -498,7 +495,6 @@ open class AppboyKit : override fun onSetUserTag( key: String?, - user: FilteredMParticleUser?, ) { // No-op: this kit does not implement this feature. } @@ -506,7 +502,6 @@ open class AppboyKit : override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { if (attributeKey == null || attributeValueList == null) { return @@ -533,7 +528,6 @@ open class AppboyKit : override fun onSetAllUserAttributes( userAttributes: MutableMap?, userAttributeLists: MutableMap>?, - user: FilteredMParticleUser?, ) { val attributes = userAttributes ?: emptyMap() val attributeLists = userAttributeLists ?: emptyMap() @@ -567,7 +561,6 @@ open class AppboyKit : override fun onConsentStateUpdated( oldState: ConsentState, newState: ConsentState, - user: FilteredMParticleUser, ) { setConsent(newState) } diff --git a/kits/braze/braze-39/src/test/kotlin/com/mparticle/kits/AppboyKitTests.kt b/kits/braze/braze-39/src/test/kotlin/com/mparticle/kits/AppboyKitTests.kt index 86c64652b..d4168c4f5 100644 --- a/kits/braze/braze-39/src/test/kotlin/com/mparticle/kits/AppboyKitTests.kt +++ b/kits/braze/braze-39/src/test/kotlin/com/mparticle/kits/AppboyKitTests.kt @@ -43,9 +43,6 @@ class AppboyKitTests { @Mock private val mTypeFilters: SparseBooleanArray? = null - @Mock - lateinit var filteredMParticleUser: FilteredMParticleUser - @Mock lateinit var user: MParticleUser @@ -258,10 +255,9 @@ class AppboyKitTests { val currentUser = braze.currentUser kit.onKitCreate(settings, MockContextApplication()) - val filteredUser = Mockito.mock(FilteredMParticleUser::class.java) - kit.onSetUserAttribute("test1", "true", filteredUser) - kit.onSetUserAttribute("test2", "false", filteredUser) - kit.onSetUserAttribute("test3", "notABoolean", filteredUser) + kit.onSetUserAttribute("test1", "true") + kit.onSetUserAttribute("test2", "false") + kit.onSetUserAttribute("test3", "notABoolean") Assert.assertEquals(2, currentUser.getCustomUserAttribute().size.toLong()) } @@ -1334,9 +1330,7 @@ class AppboyKitTests { .builder() .addGDPRConsentState("Marketing", marketingConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals( false, currentUser.getCustomUserAttribute()["\$google_ad_personalization"], @@ -1382,9 +1376,7 @@ class AppboyKitTests { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals(true, currentUser.getCustomUserAttribute()["\$google_ad_user_data"]) TestCase.assertEquals( true, @@ -1419,8 +1411,7 @@ class AppboyKitTests { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals(0, currentUser.getCustomUserAttribute().size) } @@ -1460,9 +1451,7 @@ class AppboyKitTests { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals(0, currentUser.getCustomUserAttribute().size) } diff --git a/kits/braze/braze-40/src/main/kotlin/com/mparticle/kits/AppboyKit.kt b/kits/braze/braze-40/src/main/kotlin/com/mparticle/kits/AppboyKit.kt index 00b534708..943d5b5d3 100644 --- a/kits/braze/braze-40/src/main/kotlin/com/mparticle/kits/AppboyKit.kt +++ b/kits/braze/braze-40/src/main/kotlin/com/mparticle/kits/AppboyKit.kt @@ -444,13 +444,11 @@ open class AppboyKit : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { } override fun onRemoveUserAttribute( key: String?, - user: FilteredMParticleUser?, ) { if (key == null) { return @@ -488,7 +486,6 @@ open class AppboyKit : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { if (key == null || value == null || value !is String) { return @@ -498,7 +495,6 @@ open class AppboyKit : override fun onSetUserTag( key: String?, - user: FilteredMParticleUser?, ) { // No-op: this kit does not implement this feature. } @@ -506,7 +502,6 @@ open class AppboyKit : override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { if (attributeKey == null || attributeValueList == null) { return @@ -533,7 +528,6 @@ open class AppboyKit : override fun onSetAllUserAttributes( userAttributes: MutableMap?, userAttributeLists: MutableMap>?, - user: FilteredMParticleUser?, ) { val attributes = userAttributes ?: emptyMap() val attributeLists = userAttributeLists ?: emptyMap() @@ -567,7 +561,6 @@ open class AppboyKit : override fun onConsentStateUpdated( oldState: ConsentState, newState: ConsentState, - user: FilteredMParticleUser, ) { setConsent(newState) } diff --git a/kits/braze/braze-40/src/test/kotlin/com/mparticle/kits/AppboyKitTests.kt b/kits/braze/braze-40/src/test/kotlin/com/mparticle/kits/AppboyKitTests.kt index 86c64652b..d4168c4f5 100644 --- a/kits/braze/braze-40/src/test/kotlin/com/mparticle/kits/AppboyKitTests.kt +++ b/kits/braze/braze-40/src/test/kotlin/com/mparticle/kits/AppboyKitTests.kt @@ -43,9 +43,6 @@ class AppboyKitTests { @Mock private val mTypeFilters: SparseBooleanArray? = null - @Mock - lateinit var filteredMParticleUser: FilteredMParticleUser - @Mock lateinit var user: MParticleUser @@ -258,10 +255,9 @@ class AppboyKitTests { val currentUser = braze.currentUser kit.onKitCreate(settings, MockContextApplication()) - val filteredUser = Mockito.mock(FilteredMParticleUser::class.java) - kit.onSetUserAttribute("test1", "true", filteredUser) - kit.onSetUserAttribute("test2", "false", filteredUser) - kit.onSetUserAttribute("test3", "notABoolean", filteredUser) + kit.onSetUserAttribute("test1", "true") + kit.onSetUserAttribute("test2", "false") + kit.onSetUserAttribute("test3", "notABoolean") Assert.assertEquals(2, currentUser.getCustomUserAttribute().size.toLong()) } @@ -1334,9 +1330,7 @@ class AppboyKitTests { .builder() .addGDPRConsentState("Marketing", marketingConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals( false, currentUser.getCustomUserAttribute()["\$google_ad_personalization"], @@ -1382,9 +1376,7 @@ class AppboyKitTests { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals(true, currentUser.getCustomUserAttribute()["\$google_ad_user_data"]) TestCase.assertEquals( true, @@ -1419,8 +1411,7 @@ class AppboyKitTests { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals(0, currentUser.getCustomUserAttribute().size) } @@ -1460,9 +1451,7 @@ class AppboyKitTests { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals(0, currentUser.getCustomUserAttribute().size) } diff --git a/kits/braze/braze-41/src/main/kotlin/com/mparticle/kits/AppboyKit.kt b/kits/braze/braze-41/src/main/kotlin/com/mparticle/kits/AppboyKit.kt index 00b534708..943d5b5d3 100644 --- a/kits/braze/braze-41/src/main/kotlin/com/mparticle/kits/AppboyKit.kt +++ b/kits/braze/braze-41/src/main/kotlin/com/mparticle/kits/AppboyKit.kt @@ -444,13 +444,11 @@ open class AppboyKit : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { } override fun onRemoveUserAttribute( key: String?, - user: FilteredMParticleUser?, ) { if (key == null) { return @@ -488,7 +486,6 @@ open class AppboyKit : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { if (key == null || value == null || value !is String) { return @@ -498,7 +495,6 @@ open class AppboyKit : override fun onSetUserTag( key: String?, - user: FilteredMParticleUser?, ) { // No-op: this kit does not implement this feature. } @@ -506,7 +502,6 @@ open class AppboyKit : override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { if (attributeKey == null || attributeValueList == null) { return @@ -533,7 +528,6 @@ open class AppboyKit : override fun onSetAllUserAttributes( userAttributes: MutableMap?, userAttributeLists: MutableMap>?, - user: FilteredMParticleUser?, ) { val attributes = userAttributes ?: emptyMap() val attributeLists = userAttributeLists ?: emptyMap() @@ -567,7 +561,6 @@ open class AppboyKit : override fun onConsentStateUpdated( oldState: ConsentState, newState: ConsentState, - user: FilteredMParticleUser, ) { setConsent(newState) } diff --git a/kits/braze/braze-41/src/test/kotlin/com/mparticle/kits/AppboyKitTests.kt b/kits/braze/braze-41/src/test/kotlin/com/mparticle/kits/AppboyKitTests.kt index 86c64652b..d4168c4f5 100644 --- a/kits/braze/braze-41/src/test/kotlin/com/mparticle/kits/AppboyKitTests.kt +++ b/kits/braze/braze-41/src/test/kotlin/com/mparticle/kits/AppboyKitTests.kt @@ -43,9 +43,6 @@ class AppboyKitTests { @Mock private val mTypeFilters: SparseBooleanArray? = null - @Mock - lateinit var filteredMParticleUser: FilteredMParticleUser - @Mock lateinit var user: MParticleUser @@ -258,10 +255,9 @@ class AppboyKitTests { val currentUser = braze.currentUser kit.onKitCreate(settings, MockContextApplication()) - val filteredUser = Mockito.mock(FilteredMParticleUser::class.java) - kit.onSetUserAttribute("test1", "true", filteredUser) - kit.onSetUserAttribute("test2", "false", filteredUser) - kit.onSetUserAttribute("test3", "notABoolean", filteredUser) + kit.onSetUserAttribute("test1", "true") + kit.onSetUserAttribute("test2", "false") + kit.onSetUserAttribute("test3", "notABoolean") Assert.assertEquals(2, currentUser.getCustomUserAttribute().size.toLong()) } @@ -1334,9 +1330,7 @@ class AppboyKitTests { .builder() .addGDPRConsentState("Marketing", marketingConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals( false, currentUser.getCustomUserAttribute()["\$google_ad_personalization"], @@ -1382,9 +1376,7 @@ class AppboyKitTests { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals(true, currentUser.getCustomUserAttribute()["\$google_ad_user_data"]) TestCase.assertEquals( true, @@ -1419,8 +1411,7 @@ class AppboyKitTests { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals(0, currentUser.getCustomUserAttribute().size) } @@ -1460,9 +1451,7 @@ class AppboyKitTests { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kit) - - kit.onConsentStateUpdated(state, state, filteredMParticleUser) + kit.onConsentStateUpdated(state, state) TestCase.assertEquals(0, currentUser.getCustomUserAttribute().size) } diff --git a/kits/clevertap/clevertap-7/src/main/kotlin/com/mparticle/kits/CleverTapKit.kt b/kits/clevertap/clevertap-7/src/main/kotlin/com/mparticle/kits/CleverTapKit.kt index 6151416d9..24914b97c 100644 --- a/kits/clevertap/clevertap-7/src/main/kotlin/com/mparticle/kits/CleverTapKit.kt +++ b/kits/clevertap/clevertap-7/src/main/kotlin/com/mparticle/kits/CleverTapKit.kt @@ -18,7 +18,6 @@ import com.mparticle.internal.Logger import com.mparticle.internal.MPUtility import com.mparticle.kits.CommerceEventUtils import com.mparticle.kits.FilteredIdentityApiRequest -import com.mparticle.kits.FilteredMParticleUser import com.mparticle.kits.KitIntegration.CommerceListener import com.mparticle.kits.KitIntegration.IdentityListener import com.mparticle.kits.KitIntegration.PushListener @@ -205,7 +204,6 @@ class CleverTapKit : override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { if (attributeKey == null || attributeValueList == null) { return @@ -219,14 +217,12 @@ class CleverTapKit : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { // not supported } override fun onRemoveUserAttribute( keyIn: String, - user: FilteredMParticleUser, ) { var key = keyIn if (UserAttributes.MOBILE_NUMBER == key) { @@ -242,7 +238,6 @@ class CleverTapKit : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { if (key == null || value == null) { return @@ -282,7 +277,6 @@ class CleverTapKit : override fun onSetUserTag( key: String, - user: FilteredMParticleUser, ) { // not supported } @@ -290,14 +284,13 @@ class CleverTapKit : override fun onSetAllUserAttributes( userAttributes: Map, userAttributeLists: Map>, - user: FilteredMParticleUser, ) { if (!kitPreferences.getBoolean(PREF_KEY_HAS_SYNCED_ATTRIBUTES, false)) { for ((key, value) in userAttributes) { - onSetUserAttribute(key, value, user) + onSetUserAttribute(key, value) } for ((attributeKey, attributeValueList) in userAttributeLists) { - onSetUserAttributeList(attributeKey, attributeValueList, user) + onSetUserAttributeList(attributeKey, attributeValueList) } kitPreferences.edit().putBoolean(PREF_KEY_HAS_SYNCED_ATTRIBUTES, true).apply() } @@ -306,7 +299,6 @@ class CleverTapKit : override fun onConsentStateUpdated( oldState: ConsentState, newState: ConsentState, - user: FilteredMParticleUser, ) { // not supported } diff --git a/kits/comscore/comscore-6/src/main/kotlin/com/mparticle/kits/ComscoreKit.kt b/kits/comscore/comscore-6/src/main/kotlin/com/mparticle/kits/ComscoreKit.kt index f7be2fd66..f311062e8 100644 --- a/kits/comscore/comscore-6/src/main/kotlin/com/mparticle/kits/ComscoreKit.kt +++ b/kits/comscore/comscore-6/src/main/kotlin/com/mparticle/kits/ComscoreKit.kt @@ -100,7 +100,6 @@ class ComscoreKit : override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { // not supported } @@ -110,7 +109,6 @@ class ComscoreKit : override fun onSetAllUserAttributes( userAttributes: Map, userAttributeLists: Map>, - user: FilteredMParticleUser, ) { if (isEnterprise) { for ((key, value) in userAttributes) { @@ -121,7 +119,6 @@ class ComscoreKit : override fun onRemoveUserAttribute( key: String, - user: FilteredMParticleUser, ) { if (isEnterprise) { Analytics.getConfiguration().removePersistentLabel(KitUtils.sanitizeAttributeKey(key)) @@ -131,7 +128,6 @@ class ComscoreKit : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { if (key == null || value == null || value !is String) { return @@ -143,20 +139,17 @@ class ComscoreKit : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { } override fun onSetUserTag( key: String?, - user: FilteredMParticleUser?, ) { } override fun onConsentStateUpdated( oldState: ConsentState?, newState: ConsentState?, - user: FilteredMParticleUser?, ) { } diff --git a/kits/ga/ga-23/src/main/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseKit.kt b/kits/ga/ga-23/src/main/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseKit.kt index a11dea821..ae99ba398 100644 --- a/kits/ga/ga-23/src/main/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseKit.kt +++ b/kits/ga/ga-23/src/main/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseKit.kt @@ -164,7 +164,7 @@ class GoogleAnalyticsFirebaseKit : ) { @Suppress("UNCHECKED_CAST") val stringAttributes = userAttributes.mapValues { it.value?.toString() }.filterValues { it != null } as Map - onSetAllUserAttributes(stringAttributes, null, null) + onSetAllUserAttributes(stringAttributes, null) } }, ) @@ -188,7 +188,7 @@ class GoogleAnalyticsFirebaseKit : ) { @Suppress("UNCHECKED_CAST") val stringAttributes = userAttributes.mapValues { it.value?.toString() }.filterValues { it != null } as Map - onSetAllUserAttributes(stringAttributes, null, null) + onSetAllUserAttributes(stringAttributes, null) } }, ) @@ -219,7 +219,7 @@ class GoogleAnalyticsFirebaseKit : ) { @Suppress("UNCHECKED_CAST") val stringAttributes = userAttributes.mapValues { it.value?.toString() }.filterValues { it != null } as Map - onSetAllUserAttributes(stringAttributes, null, null) + onSetAllUserAttributes(stringAttributes, null) } }, ) @@ -374,7 +374,6 @@ class GoogleAnalyticsFirebaseKit : key: String, incrementedBy: Number, value: String, - filteredMParticleUser: FilteredMParticleUser, ) { standardizeName(key, false)?.let { FirebaseAnalytics.getInstance(context).setUserProperty( @@ -386,7 +385,6 @@ class GoogleAnalyticsFirebaseKit : override fun onRemoveUserAttribute( key: String, - filteredMParticleUser: FilteredMParticleUser, ) { standardizeName(key, false)?.let { FirebaseAnalytics.getInstance(context).setUserProperty( @@ -402,7 +400,6 @@ class GoogleAnalyticsFirebaseKit : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { if (key == null) { return @@ -419,13 +416,11 @@ class GoogleAnalyticsFirebaseKit : override fun onSetUserTag( s: String, - filteredMParticleUser: FilteredMParticleUser, ) {} override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { // not supported } @@ -433,7 +428,6 @@ class GoogleAnalyticsFirebaseKit : override fun onSetAllUserAttributes( userAttributes: Map, userAttributeLists: Map>?, - filteredMParticleUser: FilteredMParticleUser?, ) { var userAttributes: Map? = userAttributes userAttributes = standardizeAttributes(userAttributes, false) @@ -449,7 +443,6 @@ class GoogleAnalyticsFirebaseKit : override fun onConsentStateUpdated( consentState: ConsentState, consentState1: ConsentState, - filteredMParticleUser: FilteredMParticleUser, ) { setConsent(consentState1) } diff --git a/kits/ga/ga-23/src/test/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseKitTest.kt b/kits/ga/ga-23/src/test/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseKitTest.kt index 37d24452d..e81666b7b 100644 --- a/kits/ga/ga-23/src/test/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseKitTest.kt +++ b/kits/ga/ga-23/src/test/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseKitTest.kt @@ -49,9 +49,6 @@ class GoogleAnalyticsFirebaseKitTest { @Mock lateinit var user: MParticleUser - @Mock - lateinit var filteredMParticleUser: FilteredMParticleUser - @Before @Throws(JSONException::class) fun before() { @@ -193,9 +190,7 @@ class GoogleAnalyticsFirebaseKitTest { .builder() .addGDPRConsentState("Marketing", marketingConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) val expectedConsentValue = firebaseSdk.getConsentState().getKeyByValue("AD_PERSONALIZATION").toString() @@ -236,9 +231,7 @@ class GoogleAnalyticsFirebaseKitTest { .builder() .addGDPRConsentState("Marketing", marketingConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) val expectedConsentValue = firebaseSdk.getConsentState().getKeyByValue("AD_PERSONALIZATION").toString() @@ -279,9 +272,7 @@ class GoogleAnalyticsFirebaseKitTest { .builder() .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) val expectedConsentValue = firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString() @@ -323,9 +314,7 @@ class GoogleAnalyticsFirebaseKitTest { .builder() .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) val expectedConsentValue = firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString() @@ -376,9 +365,7 @@ class GoogleAnalyticsFirebaseKitTest { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) val expectedConsentValue = firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString() @@ -425,9 +412,7 @@ class GoogleAnalyticsFirebaseKitTest { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) val expectedConsentValue = firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString() @@ -462,9 +447,7 @@ class GoogleAnalyticsFirebaseKitTest { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) TestCase.assertEquals(0, firebaseSdk.getConsentState().size) } @@ -502,9 +485,7 @@ class GoogleAnalyticsFirebaseKitTest { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) val expectedConsentValue = firebaseSdk.getConsentState().getKeyByValue("AD_STORAGE").toString() @@ -553,9 +534,7 @@ class GoogleAnalyticsFirebaseKitTest { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) TestCase.assertEquals(0, firebaseSdk.getConsentState().size) } @@ -594,9 +573,7 @@ class GoogleAnalyticsFirebaseKitTest { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) val expectedConsentValue = firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString() diff --git a/kits/ga4/ga4-23/src/main/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseGA4Kit.kt b/kits/ga4/ga4-23/src/main/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseGA4Kit.kt index 6da1aa7e8..500ed4b66 100644 --- a/kits/ga4/ga4-23/src/main/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseGA4Kit.kt +++ b/kits/ga4/ga4-23/src/main/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseGA4Kit.kt @@ -230,7 +230,7 @@ class GoogleAnalyticsFirebaseGA4Kit : ) { @Suppress("UNCHECKED_CAST") val stringAttributes = userAttributes.mapValues { it.value?.toString() }.filterValues { it != null } as Map - onSetAllUserAttributes(stringAttributes, null, null) + onSetAllUserAttributes(stringAttributes, null) } }, ) @@ -256,7 +256,7 @@ class GoogleAnalyticsFirebaseGA4Kit : ) { @Suppress("UNCHECKED_CAST") val stringAttributes = userAttributes.mapValues { it.value?.toString() }.filterValues { it != null } as Map - onSetAllUserAttributes(stringAttributes, null, null) + onSetAllUserAttributes(stringAttributes, null) } }, ) @@ -291,7 +291,7 @@ class GoogleAnalyticsFirebaseGA4Kit : ) { @Suppress("UNCHECKED_CAST") val stringAttributes = userAttributes.mapValues { it.value?.toString() }.filterValues { it != null } as Map - onSetAllUserAttributes(stringAttributes, null, null) + onSetAllUserAttributes(stringAttributes, null) } }, ) @@ -585,7 +585,6 @@ class GoogleAnalyticsFirebaseGA4Kit : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { standardizeName(key, false)?.let { FirebaseAnalytics.getInstance(context).setUserProperty( @@ -597,7 +596,6 @@ class GoogleAnalyticsFirebaseGA4Kit : override fun onRemoveUserAttribute( key: String, - filteredMParticleUser: FilteredMParticleUser, ) { standardizeName(key, false)?.let { FirebaseAnalytics.getInstance(context).setUserProperty( @@ -613,7 +611,6 @@ class GoogleAnalyticsFirebaseGA4Kit : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { if (key == null) { return @@ -630,13 +627,11 @@ class GoogleAnalyticsFirebaseGA4Kit : override fun onSetUserTag( s: String, - filteredMParticleUser: FilteredMParticleUser, ) {} override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { // not supported } @@ -644,7 +639,6 @@ class GoogleAnalyticsFirebaseGA4Kit : override fun onSetAllUserAttributes( userAttributesIn: Map, userAttributeLists: Map>?, - filteredMParticleUser: FilteredMParticleUser?, ) { var userAttributes: Map? = userAttributesIn userAttributes = standardizeAttributes(userAttributes, false) @@ -710,7 +704,6 @@ class GoogleAnalyticsFirebaseGA4Kit : override fun onConsentStateUpdated( consentState: ConsentState, consentState1: ConsentState, - filteredMParticleUser: FilteredMParticleUser, ) { setConsent(consentState1) } diff --git a/kits/ga4/ga4-23/src/test/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseGA4KitTest.kt b/kits/ga4/ga4-23/src/test/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseGA4KitTest.kt index ac6b29ba4..c0e4c8e36 100644 --- a/kits/ga4/ga4-23/src/test/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseGA4KitTest.kt +++ b/kits/ga4/ga4-23/src/test/kotlin/com/mparticle/kits/GoogleAnalyticsFirebaseGA4KitTest.kt @@ -51,9 +51,6 @@ class GoogleAnalyticsFirebaseGA4KitTest { @Mock lateinit var user: MParticleUser - @Mock - lateinit var filteredMParticleUser: FilteredMParticleUser - @Before @Throws(JSONException::class) fun before() { @@ -167,9 +164,7 @@ class GoogleAnalyticsFirebaseGA4KitTest { .builder() .addGDPRConsentState("Marketing", marketingConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) val expectedConsentValue = firebaseSdk.getConsentState().getKeyByValue("AD_PERSONALIZATION").toString() @@ -210,9 +205,7 @@ class GoogleAnalyticsFirebaseGA4KitTest { .builder() .addGDPRConsentState("Marketing", marketingConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) val expectedConsentValue = firebaseSdk.getConsentState().getKeyByValue("AD_PERSONALIZATION").toString() @@ -253,9 +246,7 @@ class GoogleAnalyticsFirebaseGA4KitTest { .builder() .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) val expectedConsentValue = firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString() @@ -297,9 +288,7 @@ class GoogleAnalyticsFirebaseGA4KitTest { .builder() .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) val expectedConsentValue = firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString() @@ -350,9 +339,7 @@ class GoogleAnalyticsFirebaseGA4KitTest { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) val expectedConsentValue = firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString() @@ -399,9 +386,7 @@ class GoogleAnalyticsFirebaseGA4KitTest { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) val expectedConsentValue = firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString() @@ -436,9 +421,7 @@ class GoogleAnalyticsFirebaseGA4KitTest { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) TestCase.assertEquals(0, firebaseSdk.getConsentState().size) } @@ -476,9 +459,7 @@ class GoogleAnalyticsFirebaseGA4KitTest { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) val expectedConsentValue = firebaseSdk.getConsentState().getKeyByValue("AD_STORAGE").toString() @@ -527,9 +508,7 @@ class GoogleAnalyticsFirebaseGA4KitTest { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) TestCase.assertEquals(0, firebaseSdk.getConsentState().size) } @@ -568,9 +547,7 @@ class GoogleAnalyticsFirebaseGA4KitTest { .addGDPRConsentState("Marketing", marketingConsent) .addGDPRConsentState("Performance", performanceConsent) .build() - filteredMParticleUser = FilteredMParticleUser.getInstance(user, kitInstance) - - kitInstance.onConsentStateUpdated(state, state, filteredMParticleUser) + kitInstance.onConsentStateUpdated(state, state) val expectedConsentValue = firebaseSdk.getConsentState().getKeyByValue("AD_USER_DATA").toString() diff --git a/kits/kochava/kochava-5/src/main/kotlin/com/mparticle/kits/KochavaKit.kt b/kits/kochava/kochava-5/src/main/kotlin/com/mparticle/kits/KochavaKit.kt index 96e7dfd6e..64c614296 100644 --- a/kits/kochava/kochava-5/src/main/kotlin/com/mparticle/kits/KochavaKit.kt +++ b/kits/kochava/kochava-5/src/main/kotlin/com/mparticle/kits/KochavaKit.kt @@ -88,7 +88,6 @@ class KochavaKit : override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { // not supported } @@ -98,13 +97,11 @@ class KochavaKit : override fun onSetAllUserAttributes( userAttributes: Map, userAttributeLists: Map>, - user: FilteredMParticleUser, ) { } override fun onRemoveUserAttribute( key: String, - user: FilteredMParticleUser, ) { // No-op: this kit does not implement this feature. } @@ -112,7 +109,6 @@ class KochavaKit : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { // No-op: this kit does not implement this feature. } @@ -121,20 +117,17 @@ class KochavaKit : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { } override fun onSetUserTag( key: String?, - user: FilteredMParticleUser?, ) { } override fun onConsentStateUpdated( oldState: ConsentState?, newState: ConsentState?, - user: FilteredMParticleUser?, ) { } diff --git a/kits/leanplum/leanplum-7/src/main/kotlin/com/mparticle/kits/LeanplumKit.kt b/kits/leanplum/leanplum-7/src/main/kotlin/com/mparticle/kits/LeanplumKit.kt index c45d75e38..956ef33fd 100644 --- a/kits/leanplum/leanplum-7/src/main/kotlin/com/mparticle/kits/LeanplumKit.kt +++ b/kits/leanplum/leanplum-7/src/main/kotlin/com/mparticle/kits/LeanplumKit.kt @@ -17,7 +17,6 @@ import com.mparticle.consent.ConsentState import com.mparticle.identity.MParticleUser import com.mparticle.internal.Logger import com.mparticle.kits.FilteredIdentityApiRequest -import com.mparticle.kits.FilteredMParticleUser import com.mparticle.kits.KitIntegration.CommerceListener import com.mparticle.kits.KitIntegration.EventListener import com.mparticle.kits.KitIntegration.IdentityListener @@ -216,7 +215,6 @@ class LeanplumKit : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { if (key == null) { return @@ -228,13 +226,11 @@ class LeanplumKit : override fun onSetUserTag( s: String, - filteredMParticleUser: FilteredMParticleUser, ) {} override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { if (attributeKey == null || attributeValueList == null) { return @@ -248,7 +244,6 @@ class LeanplumKit : key: String?, incrementedBy: Number?, newValue: String, - user: FilteredMParticleUser?, ) { val attributes = mutableMapOf() attributes[attr.key.toString()] = newValue @@ -260,14 +255,12 @@ class LeanplumKit : override fun onConsentStateUpdated( consentState: ConsentState, consentState1: ConsentState, - filteredMParticleUser: FilteredMParticleUser, ) { } override fun onSetAllUserAttributes( attributes: Map, attributeLists: Map>, - user: FilteredMParticleUser, ) { val map = mutableMapOf() map.putAll(attributes) @@ -278,7 +271,6 @@ class LeanplumKit : override fun onRemoveUserAttribute( key: String, - user: FilteredMParticleUser, ) { val attributes = mutableMapOf() attributes[key] = null diff --git a/kits/localytics/localytics-6/src/main/kotlin/com/mparticle/kits/LocalyticsKit.kt b/kits/localytics/localytics-6/src/main/kotlin/com/mparticle/kits/LocalyticsKit.kt index 6dc70f97b..cd489bdd1 100644 --- a/kits/localytics/localytics-6/src/main/kotlin/com/mparticle/kits/LocalyticsKit.kt +++ b/kits/localytics/localytics-6/src/main/kotlin/com/mparticle/kits/LocalyticsKit.kt @@ -154,7 +154,6 @@ class LocalyticsKit : override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { if (attributeKey == null || attributeValueList == null) { return @@ -167,7 +166,6 @@ class LocalyticsKit : override fun onSetAllUserAttributes( userAttributes: Map, userAttributeLists: Map>, - user: FilteredMParticleUser, ) { for ((key, value) in userAttributes) { applyScalarUserAttribute(key, value) @@ -179,7 +177,6 @@ class LocalyticsKit : override fun onRemoveUserAttribute( key: String, - user: FilteredMParticleUser, ) { Localytics.deleteProfileAttribute(key) } @@ -187,7 +184,6 @@ class LocalyticsKit : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { if (key == null || value == null || value !is String) { return @@ -199,20 +195,17 @@ class LocalyticsKit : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { } override fun onSetUserTag( key: String?, - user: FilteredMParticleUser?, ) { } override fun onConsentStateUpdated( oldState: ConsentState?, newState: ConsentState?, - user: FilteredMParticleUser?, ) { } diff --git a/kits/singular/singular-12/src/main/kotlin/com/mparticle/kits/SingularKit.kt b/kits/singular/singular-12/src/main/kotlin/com/mparticle/kits/SingularKit.kt index 08ccb472b..797a379e9 100644 --- a/kits/singular/singular-12/src/main/kotlin/com/mparticle/kits/SingularKit.kt +++ b/kits/singular/singular-12/src/main/kotlin/com/mparticle/kits/SingularKit.kt @@ -342,19 +342,16 @@ open class SingularKit : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { } override fun onRemoveUserAttribute( s: String, - filteredMParticleUser: FilteredMParticleUser, ) {} override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { if (key == null || value == null || value !is String) { return @@ -382,13 +379,11 @@ open class SingularKit : override fun onSetUserTag( s: String, - filteredMParticleUser: FilteredMParticleUser, ) {} override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { // not supported } @@ -396,7 +391,6 @@ open class SingularKit : override fun onSetAllUserAttributes( userAttributes: Map, userAttributeLists: Map>, - user: FilteredMParticleUser, ) { } @@ -405,7 +399,6 @@ open class SingularKit : override fun onConsentStateUpdated( consentState: ConsentState, consentState1: ConsentState, - filteredMParticleUser: FilteredMParticleUser, ) { executeIfSingularInitialized({ consentState.ccpaConsentState?.let { Singular.limitDataSharing(it.isConsented) } diff --git a/kits/urbanairship/urbanairship-20/src/main/kotlin/com/mparticle/kits/UrbanAirshipKit.kt b/kits/urbanairship/urbanairship-20/src/main/kotlin/com/mparticle/kits/UrbanAirshipKit.kt index c8e0ac67d..e6d7a1df9 100644 --- a/kits/urbanairship/urbanairship-20/src/main/kotlin/com/mparticle/kits/UrbanAirshipKit.kt +++ b/kits/urbanairship/urbanairship-20/src/main/kotlin/com/mparticle/kits/UrbanAirshipKit.kt @@ -243,7 +243,6 @@ class UrbanAirshipKit : override fun onSetUserAttributeList( attributeKey: String?, attributeValueList: List?, - user: FilteredMParticleUser?, ) { // not supported } @@ -253,7 +252,6 @@ class UrbanAirshipKit : override fun onSetAllUserAttributes( userAttributes: Map, userAttributeLists: Map>, - user: FilteredMParticleUser, ) { if (configuration?.enableTags == true) { val editor = @@ -272,7 +270,6 @@ class UrbanAirshipKit : override fun onRemoveUserAttribute( key: String, - user: FilteredMParticleUser, ) { Airship.channel .editTags() @@ -283,7 +280,6 @@ class UrbanAirshipKit : override fun onSetUserAttribute( key: String?, value: Any?, - user: FilteredMParticleUser?, ) { if (key == null || value == null || value !is String) { return @@ -307,20 +303,17 @@ class UrbanAirshipKit : key: String?, incrementedBy: Number?, value: String?, - user: FilteredMParticleUser?, ) { } override fun onSetUserTag( key: String?, - user: FilteredMParticleUser?, ) { } override fun onConsentStateUpdated( oldState: ConsentState?, newState: ConsentState?, - user: FilteredMParticleUser?, ) { }