@usercentrics/react-native-sdk 2.7.9 → 2.7.12

package/CHANGELOG.md

@@ -1,4 +1,26 @@
 [Release Notes](https://docs.usercentrics.com/cmp_in_app_sdk/latest/about/history/)
+### 2.7.12
+
+## Improvements
+
+* Several improvements on Consent Mediation 
+ * Add support for Adjust and Crashlytics.
+ * Add support for Custom DPSs.
+
+## Resolved Issues
+
+* Stability improvements and bug fixes.
+
+### 2.7.10
+
+## Improvements
+
+* [TCF] Performance improvement.
+
+## Features
+
+* Stability improvements and bug fixes.
+
 ### 2.7.9
 
 ## Features

package/android/build.gradle

@@ -1,8 +1,8 @@
-def usercentrics_version = "2.7.9"
+def usercentrics_version = "2.7.10"
 version usercentrics_version
 
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.8.0'
 
     ext.safeExtGet = { prop, fallback ->
         return rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -27,7 +27,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 32
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

package/android/src/androidTest/java/com/usercentrics/reactnativemodule/RNUsercentricsModuleTest.kt

@@ -1,5 +1,7 @@
 package com.usercentrics.reactnativemodule
 
+import android.app.Activity
+import android.content.Context
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.facebook.react.bridge.*
@@ -8,6 +10,7 @@ import com.usercentrics.reactnativemodule.api.FakeUsercentricsProxy
 import com.usercentrics.reactnativemodule.fake.FakePromise
 import com.usercentrics.reactnativemodule.mock.*
 import com.usercentrics.reactnativeusercentrics.RNUsercentricsModule
+import com.usercentrics.reactnativeusercentrics.ReactContextProvider
 import com.usercentrics.reactnativeusercentrics.extensions.serialize
 import com.usercentrics.reactnativeusercentrics.extensions.toWritableMap
 import com.usercentrics.sdk.*
@@ -30,6 +33,7 @@ import org.junit.runner.RunWith
 class RNUsercentricsModuleTest {
 
     companion object {
+
         private val usercentricsOptions = JavaOnlyMap().apply {
             putString("settingsId", "AAAAA")
             putString("ruleSetId", "BBBBB")
@@ -95,7 +99,7 @@ class RNUsercentricsModuleTest {
     fun testModuleName() {
         assertEquals(
             "RNUsercentricsModule",
-            RNUsercentricsModule(mockk(relaxed = true), mockk()).name
+            RNUsercentricsModule(mockk(relaxed = true), mockk(), ReactContextProviderMock()).name
         )
     }
 
@@ -103,17 +107,14 @@ class RNUsercentricsModuleTest {
     fun testConfigure() {
         val usercentricsProxy = FakeUsercentricsProxy()
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         module.configure(usercentricsOptions)
 
         assertEquals(1, usercentricsProxy.initializeCount)
         assertEquals("AAAAA", usercentricsProxy.initializeOptionsArgument?.settingsId)
         assertEquals("BBBBB", usercentricsProxy.initializeOptionsArgument?.ruleSetId)
-        assertEquals(
-            UsercentricsLoggerLevel.NONE,
-            usercentricsProxy.initializeOptionsArgument?.loggerLevel
-        )
+        assertEquals(UsercentricsLoggerLevel.NONE, usercentricsProxy.initializeOptionsArgument?.loggerLevel)
         assertEquals(1000L, usercentricsProxy.initializeOptionsArgument?.timeoutMillis)
         assertEquals("1.2.3", usercentricsProxy.initializeOptionsArgument?.version)
         assertEquals(NetworkMode.EU, usercentricsProxy.initializeOptionsArgument?.networkMode)
@@ -123,7 +124,7 @@ class RNUsercentricsModuleTest {
     fun testConfigureWithWrongValues() {
         val usercentricsProxy = FakeUsercentricsProxy()
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         module.configure(JavaOnlyMap())
         assertEquals(UsercentricsOptions(), usercentricsProxy.initializeOptionsArgument)
@@ -133,7 +134,7 @@ class RNUsercentricsModuleTest {
     fun testIsReady() {
         val usercentricsProxy = FakeUsercentricsProxy(isReadyAnswer = usercentricsReadyStatus)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         val promise = FakePromise()
         module.isReady(promise)
@@ -156,7 +157,7 @@ class RNUsercentricsModuleTest {
 
         val usercentricsProxy = FakeUsercentricsProxy(isReadyAnswer = error)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         val promise = FakePromise()
         module.isReady(promise)
@@ -175,7 +176,7 @@ class RNUsercentricsModuleTest {
 
         val usercentricsProxy = FakeUsercentricsProxy(instanceAnswer = usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         val promise = FakePromise()
         module.restoreUserSession("abc", promise)
@@ -203,7 +204,7 @@ class RNUsercentricsModuleTest {
             }
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         val promise = FakePromise()
         module.restoreUserSession("abc", promise)
@@ -218,7 +219,7 @@ class RNUsercentricsModuleTest {
         every { usercentricsSDK.getControllerId() }.returns("abc")
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
         val promise = FakePromise()
 
         module.getControllerId(promise)
@@ -233,7 +234,7 @@ class RNUsercentricsModuleTest {
         every { usercentricsSDK.getABTestingVariant() }.returns("variantA")
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
         val promise = FakePromise()
 
         module.getABTestingVariant(promise)
@@ -249,7 +250,7 @@ class RNUsercentricsModuleTest {
 
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         val promise = FakePromise()
 
@@ -281,7 +282,7 @@ class RNUsercentricsModuleTest {
 
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         val promise = FakePromise()
 
@@ -309,7 +310,7 @@ class RNUsercentricsModuleTest {
             resultMap.getMap("userLocation")
         )
 
-        assertEquals(GetCMPDataMock.expectedServices.serialize(), resultMap.getArray("services"))
+        assertEquals(GetCMPDataMock.expectedServices.serialize(), resultMap.getArray("services")!!)
     }
 
     @Test
@@ -319,7 +320,7 @@ class RNUsercentricsModuleTest {
 
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         module.setCMPId(123)
 
@@ -333,7 +334,7 @@ class RNUsercentricsModuleTest {
 
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         module.setABTestingVariant("variantA")
 
@@ -349,7 +350,7 @@ class RNUsercentricsModuleTest {
 
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
         val promise = FakePromise()
 
         module.getTCFData(promise)
@@ -366,7 +367,7 @@ class RNUsercentricsModuleTest {
         every { usercentricsSDK.getUserSessionData() }.returns(GetUserSessionDataMock.fake)
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
         val promise = FakePromise()
 
         module.getUserSessionData(promise)
@@ -381,7 +382,7 @@ class RNUsercentricsModuleTest {
 
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
         val promise = FakePromise()
 
         module.getUSPData(promise)
@@ -400,7 +401,7 @@ class RNUsercentricsModuleTest {
             }
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
         val promise = FakePromise()
 
         module.changeLanguage("abc", promise)
@@ -427,7 +428,7 @@ class RNUsercentricsModuleTest {
 
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
         val promise = FakePromise()
 
         module.changeLanguage("abc", promise)
@@ -455,7 +456,7 @@ class RNUsercentricsModuleTest {
 
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         val promise = FakePromise()
         module.acceptAllForTCF(0, 0, promise)
@@ -483,7 +484,7 @@ class RNUsercentricsModuleTest {
 
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         val promise = FakePromise()
         module.denyAllForTCF(0, 0, promise)
@@ -510,7 +511,7 @@ class RNUsercentricsModuleTest {
 
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         val promise = FakePromise()
         module.acceptAll(0, promise)
@@ -531,7 +532,7 @@ class RNUsercentricsModuleTest {
 
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         val promise = FakePromise()
         module.denyAll(0, promise)
@@ -553,7 +554,7 @@ class RNUsercentricsModuleTest {
 
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         val promise = FakePromise()
         module.saveDecisions(SaveDecisionsMock.callDecisions.serialize(), 0, promise)
@@ -577,7 +578,7 @@ class RNUsercentricsModuleTest {
 
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         val promise = FakePromise()
         module.saveDecisionsForTCF(
@@ -604,7 +605,7 @@ class RNUsercentricsModuleTest {
 
         val usercentricsProxy = FakeUsercentricsProxy(usercentricsSDK)
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         val promise = FakePromise()
         module.saveOptOutForCCPA(
@@ -622,7 +623,7 @@ class RNUsercentricsModuleTest {
     fun testResetMethod() {
         val usercentricsProxy = FakeUsercentricsProxy()
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
 
         module.reset()
 
@@ -633,7 +634,7 @@ class RNUsercentricsModuleTest {
     fun testShowFirstLayer() {
         val usercentricsProxy = FakeUsercentricsProxy()
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
         val promise = FakePromise()
         module.showFirstLayer(bannerSettingsMap.toWritableMap(), promise)
         promise.await()
@@ -644,10 +645,58 @@ class RNUsercentricsModuleTest {
     fun testShowSecondLayer() {
         val usercentricsProxy = FakeUsercentricsProxy()
         val contextMock = mockk<ReactApplicationContext>(relaxed = true)
-        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy, ReactContextProviderMock())
         val promise = FakePromise()
         module.showSecondLayer(bannerSettingsMap.toWritableMap(), promise)
         promise.await()
         assertEquals(expectedBannerSettings, usercentricsProxy.showSecondLayerBannerSettings)
     }
+
+    @Test
+    fun testShowFirstLayerWithCustomLocalLogo() {
+        val context = InstrumentationRegistry.getInstrumentation().context
+        val reactContextProviderMock = object: ReactContextProviderMock() {
+
+            override fun context(): Context {
+                return context
+            }
+        }
+
+        val usercentricsProxy = FakeUsercentricsProxy()
+        val reactApplicationContext = mockk<ReactApplicationContext>(relaxed = true)
+        val module = RNUsercentricsModule(reactApplicationContext, usercentricsProxy, reactContextProviderMock)
+
+        val bannerSettingsMap = mapOf(
+            "variant" to null,
+            "firstLayerStyleSettings" to mapOf(
+                "layout" to "POPUP_CENTER",
+            ),
+            "secondLayerStyleSettings" to mapOf(
+                "showCloseButton" to true,
+            ),
+            "generalStyleSettings" to mapOf(
+                "logo" to mapOf(
+                    "logoPath" to "some_local_image"
+                )
+            )
+        )
+
+        val promise = FakePromise()
+        module.showFirstLayer(bannerSettingsMap.toWritableMap(), promise)
+        promise.await()
+
+        val someLocalImageDrawableId = context.resources.getIdentifier("some_local_image", "drawable", context.packageName)
+        val expectedBannerSettings = BannerSettings(
+            firstLayerStyleSettings = FirstLayerStyleSettings(
+                layout = UsercentricsLayout.Popup(
+                    PopupPosition.CENTER
+                )
+            ),
+            secondLayerStyleSettings = SecondLayerStyleSettings(showCloseButton = true),
+            generalStyleSettings = GeneralStyleSettings(
+                logo = UsercentricsImage.ImageDrawableId(someLocalImageDrawableId)
+            )
+        )
+        assertEquals(expectedBannerSettings, usercentricsProxy.showFirstLayerBannerSettings)
+    }
 }