2.2.2-RC1 (#31)

* UI Thread android

* Bump version

* Tests

Author: uc-pedro

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
@@ -699,31 +696,4 @@ 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(ShowFirstLayerMock.arguments, promise)
-
-        assertEquals(
-            FirstLayerStyleSettings(
-                title = TitleSettings(alignment = SectionAlignment.END),
-                message = MessageSettings(alignment = SectionAlignment.CENTER),
-                cornerRadius = 50
-            ),
-            usercentricsProxy.showFirstLayerStyle
-        )
-        assertEquals(
-            BannerSettings(font = null, logo = null),
-            usercentricsProxy.showFirstLayerBannerSettings
-        )
-        assertEquals(
-            UsercentricsLayout.Popup(PopupPosition.CENTER),
-            usercentricsProxy.showFirstLayerLayout
-        )
-    }
 }

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

@@ -74,42 +74,50 @@ internal class RNUsercentricsModule(
 
     @ReactMethod
     fun showFirstLayer(options: ReadableMap, promise: Promise) {
-        try {
-            val assetManager = currentActivity!!.assets
-
-            val layout = options.getString("layout")!!.usercentricsLayoutFromEnumString()
-            val bannerSettings = options.getMap("bannerSettings")?.bannerSettingsFromMap(assetManager)
-            val styleSettings = options.getMap("styleSettings")?.firstLayerStyleSettingsFromMap(assetManager)
-
-            usercentricsProxy.showFirstLayer(
-                currentActivity!!,
-                layout,
-                bannerSettings,
-                styleSettings,
-                promise
-            )
-
-        } catch (e: Exception) {
-            promise.reject(e)
+        UiThreadUtil.runOnUiThread {
+            try {
+                val assetManager = currentActivity!!.assets
+
+                val layout = options.getString("layout")!!.usercentricsLayoutFromEnumString()
+                val bannerSettings =
+                    options.getMap("bannerSettings")?.bannerSettingsFromMap(assetManager)
+                val styleSettings =
+                    options.getMap("styleSettings")?.firstLayerStyleSettingsFromMap(assetManager)
+
+                usercentricsProxy.showFirstLayer(
+                    currentActivity!!,
+                    layout,
+                    bannerSettings,
+                    styleSettings,
+                    promise
+                )
+
+            } catch (e: Exception) {
+                promise.reject(e)
+            }
         }
     }
 
     @ReactMethod
     fun showSecondLayer(options: ReadableMap, promise: Promise) {
-        try {
-            val assetManager = currentActivity!!.assets
+        UiThreadUtil.runOnUiThread {
+            try {
+                val assetManager = currentActivity!!.assets
+
+                val bannerSettings =
+                    options.getMap("bannerSettings")?.bannerSettingsFromMap(assetManager)
+                val showCloseButton = options.getBoolean("showCloseButton")
+
 
-            val bannerSettings =
-                options.getMap("bannerSettings")?.bannerSettingsFromMap(assetManager)
-            val showCloseButton = options.getBoolean("showCloseButton")
+                UsercentricsBanner(currentActivity!!, bannerSettings).showSecondLayer(
+                    showCloseButton
+                ) {
+                    promise.resolve(it?.toWritableMap())
+                }
 
-            UsercentricsBanner(currentActivity!!, bannerSettings).showSecondLayer(
-                showCloseButton
-            ) {
-                promise.resolve(it?.toWritableMap())
+            } catch (e: Exception) {
+                promise.reject(e)
             }
-        } catch (e: Exception) {
-            promise.reject(e)
         }
     }
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@usercentrics/react-native-sdk",
-  "version": "2.2.1",
+  "version": "2.2.2-RC1",
   "description": "Usercentrics SDK",
   "homepage": "https://usercentrics.com",
   "main": "lib/index.js",