Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ android {
minSdkVersion 21
consumerProguardFiles 'consumer-proguard.pro'
}

lint {
disable "NullSafeMutableLiveData"
}
testOptions {
unitTests.returnDefaultValues = true
unitTests.all {
Expand All @@ -60,8 +62,8 @@ repositories {
dependencies {
implementation 'androidx.annotation:annotation:1.5.0'
api 'com.rokt:roktsdk:4.8.1'
testImplementation 'org.json:json:20210307'

testImplementation files('libs/java-json.jar')
testImplementation 'com.squareup.assertj:assertj-android:1.2.0'
testImplementation ("io.mockk:mockk:1.13.4")
}
3 changes: 1 addition & 2 deletions consumer-proguard.pro
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# These are the proguard rules specified by the Button SDK's documentation

-keep class com.google.android.gms.ads.identifier.** { *; }
-keep class com.mparticle.kits.ButtonKit { *; }
-keep class com.mparticle.kits.button.** { *; }
-keep class com.rokt.** { *; }
Binary file added libs/java-json.jar
Binary file not shown.
Binary file added libs/testutils.aar
Binary file not shown.
6 changes: 4 additions & 2 deletions src/main/kotlin/com/mparticle/kits/RoktKit.kt
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,10 @@ class RoktKit : KitIntegration(), CommerceListener, IdentityListener, RoktListen
onShouldHideLoadingIndicatorCallback = onShouldHideLoadingIndicator
onShouldShowLoadingIndicatorCallback = onShouldShowLoadingIndicator
val finalAttributes: HashMap<String, String> = HashMap<String, String>()
filterUser?.userAttributes?.forEach { (key, value) ->
finalAttributes[key] = value.toString()
filterUser?.userAttributes?.let { attributes ->
for ((key, value) in attributes) {
finalAttributes[key] = value.toString()
}
}
filterAttributes(finalAttributes, configuration).let {
finalAttributes.putAll(it)
Expand Down
Loading