2.7.6 (#38)

Author: Noé Fernández

CHANGELOG.md

@@ -1,5 +1,16 @@
 [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"
 
 group 'com.usercentrics.sdk.flutter'
 version usercentrics_version

android/src/main/kotlin/com/usercentrics/sdk/flutter/api/UsercentricsBannerProxy.kt

@@ -3,12 +3,10 @@ package com.usercentrics.sdk.flutter.api
 import com.usercentrics.sdk.BannerSettings
 import com.usercentrics.sdk.UsercentricsBanner
 import com.usercentrics.sdk.UsercentricsConsentUserResponse
-import com.usercentrics.sdk.UsercentricsLayout
 
 internal interface UsercentricsBannerProxy {
     fun showFirstLayer(
         bannerSettings: BannerSettings?,
-        layout: UsercentricsLayout,
         callback: (UsercentricsConsentUserResponse?) -> Unit,
     )
 
@@ -24,11 +22,10 @@ internal class UsercentricsBannerProxyImpl(
 
     override fun showFirstLayer(
         bannerSettings: BannerSettings?,
-        layout: UsercentricsLayout,
         callback: (UsercentricsConsentUserResponse?) -> Unit,
     ) {
         val context = activityProvider.provide() ?: return
-        UsercentricsBanner(context, bannerSettings).showFirstLayer(layout, callback)
+        UsercentricsBanner(context, bannerSettings).showFirstLayer(callback)
     }
 
     override fun showSecondLayer(

android/src/main/kotlin/com/usercentrics/sdk/flutter/bridge/ShowFirstLayerBridge.kt

@@ -2,7 +2,6 @@ package com.usercentrics.sdk.flutter.bridge
 
 import com.usercentrics.sdk.flutter.api.*
 import com.usercentrics.sdk.flutter.serializer.deserializeBannerSettings
-import com.usercentrics.sdk.flutter.serializer.deserializeLayout
 import com.usercentrics.sdk.flutter.serializer.serialize
 
 internal class ShowFirstLayerBridge(
@@ -24,7 +23,6 @@ internal class ShowFirstLayerBridge(
                 assetsProvider,
                 activityProvider,
             ),
-            layout = argsMap["layout"].deserializeLayout(),
         ) { response ->
             result.success(response?.serialize())
         }

android/src/main/kotlin/com/usercentrics/sdk/flutter/serializer/FirstLayerStyleSettingsSerializer.kt

@@ -9,6 +9,7 @@ internal fun Any?.deserializeFirstLayerStyleSettings(
     activityProvider: FlutterActivityProvider,
 ): FirstLayerStyleSettings? {
     if (this !is Map<*, *>) return null
+    val layout = this["layout"].deserializeLayout()
 
     val headerImage =
         this["headerImage"]?.deserializeHeaderImageSettings(assetsProvider, activityProvider)
@@ -31,6 +32,7 @@ internal fun Any?.deserializeFirstLayerStyleSettings(
     val cornerRadius = this["cornerRadius"] as? Int
 
     return FirstLayerStyleSettings(
+        layout = layout,
         headerImage = headerImage,
         title = title,
         message = message,

android/src/main/kotlin/com/usercentrics/sdk/flutter/serializer/LayoutSerializer.kt

@@ -3,10 +3,10 @@ package com.usercentrics.sdk.flutter.serializer
 import com.usercentrics.sdk.PopupPosition
 import com.usercentrics.sdk.UsercentricsLayout
 
-internal fun Any?.deserializeLayout(): UsercentricsLayout {
-    this as String
+internal fun Any?.deserializeLayout(): UsercentricsLayout? {
+    this ?: return null
 
-    return when (this) {
+    return when (this as String) {
         "FULL" -> UsercentricsLayout.Full
         "SHEET" -> UsercentricsLayout.Sheet
         "POPUP_BOTTOM" -> UsercentricsLayout.Popup(PopupPosition.BOTTOM)

android/src/test/java/com/usercentrics/sdk/flutter/api/FakeUsercentricsBannerProxy.kt

@@ -2,24 +2,20 @@ package com.usercentrics.sdk.flutter.api
 
 import com.usercentrics.sdk.BannerSettings
 import com.usercentrics.sdk.UsercentricsConsentUserResponse
-import com.usercentrics.sdk.UsercentricsLayout
 
 internal class FakeUsercentricsBannerProxy(
     private val showFirstLayerAnswer: UsercentricsConsentUserResponse? = null,
     private val showSecondLayerAnswer: UsercentricsConsentUserResponse? = null,
 ) : UsercentricsBannerProxy {
 
     var showFirstLayerCount = 0
-    var showFirstLayerLayoutArgument: UsercentricsLayout? = null
     var showFirstLayerBannerSettingsArgument: BannerSettings? = null
 
     override fun showFirstLayer(
         bannerSettings: BannerSettings?,
-        layout: UsercentricsLayout,
         callback: (UsercentricsConsentUserResponse?) -> Unit
     ) {
         showFirstLayerCount++
-        showFirstLayerLayoutArgument = layout
         showFirstLayerBannerSettingsArgument = bannerSettings
         callback(showFirstLayerAnswer)
     }

android/src/test/java/com/usercentrics/sdk/flutter/bridge/ShowFirstLayerBridgeUnitTest.kt

@@ -53,10 +53,6 @@ class ShowFirstLayerBridgeUnitTest {
             ShowFirstLayerMock.expectedBannerSettings,
             bannerProxy.showFirstLayerBannerSettingsArgument
         )
-        assertEquals(
-            UsercentricsLayout.Popup(PopupPosition.CENTER),
-            bannerProxy.showFirstLayerLayoutArgument
-        )
         assertEquals(1, result.successCount)
         assertEquals(ShowFirstLayerMock.expectedWithData, result.successResultArgument)
     }

android/src/test/java/com/usercentrics/sdk/flutter/mock/ShowFirstLayerMock.kt

@@ -9,9 +9,9 @@ internal object ShowFirstLayerMock {
     // From the debugger
     val call = FakeFlutterMethodCall(
         method = "showFirstLayer", arguments = mapOf(
-            "layout" to "POPUP_CENTER",
             "bannerSettings" to mapOf(
                 "firstLayerStyleSettings" to mapOf(
+                    "layout" to "POPUP_CENTER",
                     "headerImage" to null,
                     "title" to mapOf(
                         "alignment" to "END",
@@ -48,6 +48,7 @@ internal object ShowFirstLayerMock {
     )
     val expectedBannerSettings = BannerSettings(
         firstLayerStyleSettings = FirstLayerStyleSettings(
+            layout = UsercentricsLayout.Popup(PopupPosition.CENTER),
             title = TitleSettings(
                 alignment = SectionAlignment.END,
                 textSizeInSp = 20f,

example/ios/Podfile.lock

@@ -1,11 +1,11 @@
 PODS:
   - Flutter (1.0.0)
-  - Usercentrics (2.7.5)
-  - usercentrics_sdk (2.7.5):
+  - Usercentrics (2.7.6)
+  - usercentrics_sdk (2.7.6):
     - Flutter
-    - UsercentricsUI (= 2.7.5)
-  - UsercentricsUI (2.7.5):
-    - Usercentrics (= 2.7.5)
+    - UsercentricsUI (= 2.7.6)
+  - UsercentricsUI (2.7.6):
+    - Usercentrics (= 2.7.6)
   - webview_flutter_wkwebview (0.0.1):
     - Flutter
 
@@ -29,9 +29,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  Usercentrics: 2a1bc201ec33c260b95f959a2bf21e0b0d286f28
-  usercentrics_sdk: 69ef07eb8368d0dbc14877fb6845071e7463cc91
-  UsercentricsUI: 6415f8a4d19b2fc5eb6741e6b855e17d0948c0f0
+  Usercentrics: 57808081ec60b6272b20dd2d627a9bc85c0af7bb
+  usercentrics_sdk: 1edaa2de3a2df1b764070b15e187e86e2e1a80a9
+  UsercentricsUI: 4310603065c2d5275dc244c2a32487c831d05d19
   webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f
 
 PODFILE CHECKSUM: 723de1cf6e2f18b51eb3426c945e31134a750097