2.7.6

Co-authored-by: Noé Fernández <[email protected]>

Author: uc-diogo

CHANGELOG.md

@@ -1,4 +1,15 @@
 [Release Notes](https://docs.usercentrics.com/cmp_in_app_sdk/latest/about/history/)
+### 2.7.6
+
+## Improvements
+
+* Major improvements to main thread use.
+
+## Resolved Issues
+
+* [Android] Resolve NPE crash happening in edge cases.
+* Stability improvements.
+
 ### 2.7.5
 
 ## Improvements

android/build.gradle

@@ -1,4 +1,4 @@
-def usercentrics_version = "2.7.5"
+def usercentrics_version = "2.7.6"
 version usercentrics_version
 
 buildscript {

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

@@ -2,10 +2,7 @@ package com.usercentrics.reactnativemodule
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import com.facebook.react.bridge.JavaOnlyMap
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.WritableArray
-import com.facebook.react.bridge.WritableMap
+import com.facebook.react.bridge.*
 import com.facebook.soloader.SoLoader
 import com.usercentrics.reactnativemodule.api.FakeUsercentricsProxy
 import com.usercentrics.reactnativemodule.fake.FakePromise
@@ -42,6 +39,26 @@ class RNUsercentricsModuleTest {
             putInt("networkMode", 1)
         }
 
+        private val bannerSettingsMap = mapOf(
+            "variant" to null,
+            "firstLayerStyleSettings" to mapOf(
+                "layout" to "POPUP_CENTER",
+            ),
+            "secondLayerStyleSettings" to mapOf(
+                "showCloseButton" to true,
+            ),
+            "generalStyleSettings" to null
+        )
+
+        private val expectedBannerSettings = BannerSettings(
+            firstLayerStyleSettings = FirstLayerStyleSettings(
+                layout = UsercentricsLayout.Popup(
+                    PopupPosition.CENTER
+                )
+            ),
+            secondLayerStyleSettings = SecondLayerStyleSettings(showCloseButton = true),
+        )
+
         private val usercentricsConsentHistoryEntries = listOf(
             UsercentricsConsentHistoryEntry(
                 status = false,
@@ -611,4 +628,26 @@ class RNUsercentricsModuleTest {
 
         assertEquals(1, usercentricsProxy.resetCount)
     }
+
+    @Test
+    fun testShowFirstLayer() {
+        val usercentricsProxy = FakeUsercentricsProxy()
+        val contextMock = mockk<ReactApplicationContext>(relaxed = true)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val promise = FakePromise()
+        module.showFirstLayer(bannerSettingsMap.toWritableMap(), promise)
+        promise.await()
+        assertEquals(expectedBannerSettings, usercentricsProxy.showFirstLayerBannerSettings)
+    }
+
+    @Test
+    fun testShowSecondLayer() {
+        val usercentricsProxy = FakeUsercentricsProxy()
+        val contextMock = mockk<ReactApplicationContext>(relaxed = true)
+        val module = RNUsercentricsModule(contextMock, usercentricsProxy)
+        val promise = FakePromise()
+        module.showSecondLayer(bannerSettingsMap.toWritableMap(), promise)
+        promise.await()
+        assertEquals(expectedBannerSettings, usercentricsProxy.showSecondLayerBannerSettings)
+    }
 }

android/src/androidTest/java/com/usercentrics/reactnativemodule/api/FakeUsercentricsProxy.kt

@@ -49,16 +49,17 @@ internal class FakeUsercentricsProxy(
         resetCount++
     }
 
-    var showFirstLayerLayout: UsercentricsLayout? = null
     var showFirstLayerBannerSettings: BannerSettings? = null
-    var showFirstLayerStyle: FirstLayerStyleSettings? = null
 
-    override fun showFirstLayer(activity: Activity, layout: UsercentricsLayout, bannerSettings: BannerSettings?, promise: Promise) {
-        this.showFirstLayerLayout = layout
+    override fun showFirstLayer(activity: Activity, bannerSettings: BannerSettings?, promise: Promise) {
         this.showFirstLayerBannerSettings = bannerSettings
-        this.showFirstLayerStyle = bannerSettings?.firstLayerStyleSettings
+        promise.resolve(null)
     }
 
+    var showSecondLayerBannerSettings: BannerSettings? = null
+
     override fun showSecondLayer(activity: Activity, bannerSettings: BannerSettings?, promise: Promise) {
+        this.showSecondLayerBannerSettings = bannerSettings
+        promise.resolve(null)
     }
 }

android/src/androidTest/java/com/usercentrics/reactnativemodule/fake/FakePromise.kt

@@ -2,14 +2,22 @@ package com.usercentrics.reactnativemodule.fake
 
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.WritableMap
+import java.util.concurrent.CountDownLatch
 
-internal class FakePromise: Promise {
+internal class FakePromise : Promise {
 
     var resolveValue: Any? = null
     var rejectThrowable: Throwable? = null
 
+    val lock = CountDownLatch(1)
+
+    fun await() {
+        lock.await()
+    }
+
     override fun resolve(value: Any?) {
         this.resolveValue = value
+        lock.countDown()
     }
 
     override fun reject(code: String?, message: String?) {

android/src/main/java/com/usercentrics/reactnativeusercentrics/RNUsercentricsModule.kt

@@ -16,7 +16,7 @@ internal class RNUsercentricsModule(
 
     @ReactMethod
     fun configure(options: ReadableMap) {
-        val usercentricsOptions = options.usercentricsOptionsFromMap() ?: return
+        val usercentricsOptions = options.usercentricsOptionsFromMap()
         usercentricsProxy.initialize(reactApplicationContext, usercentricsOptions)
     }
 
@@ -35,10 +35,8 @@ internal class RNUsercentricsModule(
             try {
                 val assetManager = currentActivity!!.assets
 
-                val layout = options.getString("layout")!!.usercentricsLayoutFromEnumString()
-                val bannerSettings =
-                    options.getMap("bannerSettings")?.bannerSettingsFromMap(assetManager)
-                usercentricsProxy.showFirstLayer(currentActivity!!, layout, bannerSettings, promise)
+                val bannerSettings = options.bannerSettingsFromMap(assetManager)
+                usercentricsProxy.showFirstLayer(currentActivity!!, bannerSettings, promise)
 
             } catch (e: Exception) {
                 promise.reject(e)
@@ -52,8 +50,7 @@ internal class RNUsercentricsModule(
             try {
                 val assetManager = currentActivity!!.assets
 
-                val bannerSettings =
-                    options.getMap("bannerSettings")?.bannerSettingsFromMap(assetManager)
+                val bannerSettings = options.bannerSettingsFromMap(assetManager)
                 usercentricsProxy.showSecondLayer(currentActivity!!, bannerSettings, promise)
             } catch (e: Exception) {
                 promise.reject(e)

android/src/main/java/com/usercentrics/reactnativeusercentrics/api/UsercentricsProxy.kt

@@ -12,8 +12,12 @@ interface UsercentricsProxy {
     val instance: UsercentricsSDK
 
     fun initialize(context: Context, options: UsercentricsOptions)
-    fun isReady(onSuccess: (UsercentricsReadyStatus) -> Unit, onFailure: (UsercentricsError) -> Unit)
-    fun showFirstLayer(activity: Activity, layout: UsercentricsLayout, bannerSettings: BannerSettings?, promise: Promise)
+    fun isReady(
+        onSuccess: (UsercentricsReadyStatus) -> Unit,
+        onFailure: (UsercentricsError) -> Unit
+    )
+
+    fun showFirstLayer(activity: Activity, bannerSettings: BannerSettings?, promise: Promise)
     fun showSecondLayer(activity: Activity, bannerSettings: BannerSettings?, promise: Promise)
     fun reset()
 }
@@ -31,15 +35,26 @@ internal class UsercentricsProxyImpl : UsercentricsProxy {
         }
     }
 
-    override fun isReady(onSuccess: (UsercentricsReadyStatus) -> Unit, onFailure: (UsercentricsError) -> Unit) = Usercentrics.isReady(onSuccess, onFailure)
+    override fun isReady(
+        onSuccess: (UsercentricsReadyStatus) -> Unit,
+        onFailure: (UsercentricsError) -> Unit
+    ) = Usercentrics.isReady(onSuccess, onFailure)
 
-    override fun showFirstLayer(activity: Activity, layout: UsercentricsLayout, bannerSettings: BannerSettings?, promise: Promise) {
-        UsercentricsBanner(activity, bannerSettings).showFirstLayer(layout) {
+    override fun showFirstLayer(
+        activity: Activity,
+        bannerSettings: BannerSettings?,
+        promise: Promise,
+    ) {
+        UsercentricsBanner(activity, bannerSettings).showFirstLayer {
             promise.resolve(it?.toWritableMap())
         }
     }
 
-    override fun showSecondLayer(activity: Activity, bannerSettings: BannerSettings?, promise: Promise) {
+    override fun showSecondLayer(
+        activity: Activity,
+        bannerSettings: BannerSettings?,
+        promise: Promise,
+    ) {
         UsercentricsBanner(activity, bannerSettings).showSecondLayer {
             promise.resolve(it?.toWritableMap())
         }

…xtensions/FirstLayerOptionsExtensions.kt …s/extensions/BannerSettingsExtensions.ktandroid/src/main/java/com/usercentrics/reactnativeusercentrics/extensions/FirstLayerOptionsExtensions.kt renamed to android/src/main/java/com/usercentrics/reactnativeusercentrics/extensions/BannerSettingsExtensions.kt android/src/main/java/com/usercentrics/reactnativeusercentrics/extensions/FirstLayerOptionsExtensions.kt renamed to android/src/main/java/com/usercentrics/reactnativeusercentrics/extensions/BannerSettingsExtensions.kt

@@ -6,13 +6,13 @@ import androidx.annotation.ColorInt
 import com.facebook.react.bridge.ReadableMap
 import com.usercentrics.sdk.*
 
-internal fun String.usercentricsLayoutFromEnumString(): UsercentricsLayout {
+internal fun String.usercentricsLayoutFromEnumString(): UsercentricsLayout? {
     return when (this) {
         "FULL" -> UsercentricsLayout.Full
         "SHEET" -> UsercentricsLayout.Sheet
         "POPUP_BOTTOM" -> UsercentricsLayout.Popup(PopupPosition.BOTTOM)
         "POPUP_CENTER" -> UsercentricsLayout.Popup(PopupPosition.CENTER)
-        else -> throw IllegalArgumentException("Invalid layout: $this")
+        else -> null
     }
 }
 
@@ -22,8 +22,12 @@ internal fun ReadableMap.bannerSettingsFromMap(assetManager: AssetManager): Bann
     val rawGeneralStyleSettings = getMap("generalStyleSettings")
 
     return BannerSettings(
-        firstLayerStyleSettings = rawFirstLayerStyleSettings?.firstLayerStyleSettingsFromMap(assetManager),
-        secondLayerStyleSettings = rawSecondLayerStyleSettings?.secondLayerStyleSettingsFromMap(assetManager),
+        firstLayerStyleSettings = rawFirstLayerStyleSettings?.firstLayerStyleSettingsFromMap(
+            assetManager
+        ),
+        secondLayerStyleSettings = rawSecondLayerStyleSettings?.secondLayerStyleSettingsFromMap(
+            assetManager
+        ),
         generalStyleSettings = rawGeneralStyleSettings?.generalStyleSettingsFromMap(assetManager),
     )
 }
@@ -35,6 +39,7 @@ internal fun ReadableMap.bannerLogoFromMap(): UsercentricsImage? {
 
 internal fun ReadableMap.firstLayerStyleSettingsFromMap(assetManager: AssetManager): FirstLayerStyleSettings {
     return FirstLayerStyleSettings(
+        layout = getString("layout")?.usercentricsLayoutFromEnumString(),
         headerImage = getMap("headerImage")?.headerImageFromMap(),
         title = getMap("title")?.titleFromMap(assetManager),
         message = getMap("message")?.messageFromMap(assetManager),

android/src/main/java/com/usercentrics/reactnativeusercentrics/extensions/CCPADataExtensions.kt

@@ -5,7 +5,7 @@ import com.usercentrics.ccpa.CCPAData
 
 internal fun CCPAData.serialize(): WritableMap {
     return mapOf(
-        "uspString" to toUSPString(),
+        "uspString" to uspString,
         "version" to version,
         "noticeGiven" to noticeGiven,
         "optedOut" to optedOut,

android/src/main/java/com/usercentrics/reactnativeusercentrics/extensions/ReadableMapExtensions.kt

@@ -4,8 +4,6 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableArray
 import com.facebook.react.bridge.WritableMap
-import com.usercentrics.sdk.UsercentricsOptions
-import com.usercentrics.sdk.models.common.UsercentricsLoggerLevel
 
 internal fun ReadableMap.getIntOrNull(key: String): Int? {
     return if (hasKey(key) && !isNull(key)) {