[HB-8276] Usercentrics 2.15.5 (#20)

Author: bichenwang

CHANGELOG.md

@@ -3,10 +3,18 @@
 Note the first digit of every adapter version corresponds to the major version of the Chartboost Core SDK compatible with that adapter. 
 Adapters are compatible with any Chartboost Core SDK version within that major version.
 
-### 0.2.8.1.5 *(2023-12-01)*
+### 1.2.15.5.0
+- This version of the adapter has been certified with Usercentrics SDK 2.15.5.
+- Update `resetConsent()` implementation to use Usercentrics' `clearUserSession()` API.
+
+### 1.2.14.2.0
+- This version of the adapter is compatible with Chartboost Core 1.0.0.
+- This version of the adapter has been certified with Usercentrics SDK 2.14.2.
+
+### 0.2.8.1.5
 - Fix notifications for partner consent status when Usercentrics errors on init.
 
-### 0.2.8.1.4 *(2023-11-29)*
+### 0.2.8.1.4
 - This version of the adapter is compatible with Chartboost Core 0.4.0
 - Added the ability to set a Template ID to Mediation Partner ID map to facilitate per-partner consent.
 

README.md

@@ -13,7 +13,7 @@ The Chartboost Core Usercentrics adapter mediates Usercentrics SDK via the Chart
 
 In your `build.gradle`, add the following entry:
 ```
-    implementation "com.chartboost:chartboost-core-adapter-usercentrics:1.2.8.1.0"
+    implementation "com.chartboost:chartboost-core-adapter-usercentrics:1.2.15.5.0"
 ```
 
 ## Contributions

UsercentricsAdapter/build.gradle.kts

@@ -34,7 +34,7 @@ android {
         minSdk = 21
         targetSdk = 33
         // If you touch the following line, don't forget to update scripts/get_rc_version.zsh
-        android.defaultConfig.versionName = System.getenv("VERSION_OVERRIDE") ?: "1.2.14.2.0"
+        android.defaultConfig.versionName = System.getenv("VERSION_OVERRIDE") ?: "1.2.15.5.0"
 
         buildConfigField(
             "String",
@@ -85,7 +85,7 @@ dependencies {
     "candidateImplementation"("com.chartboost:chartboost-mediation-sdk:5.0.0")
 
     // Consent Management Platform SDK
-    implementation("com.usercentrics.sdk:usercentrics-ui:2.14.2")
+    implementation("com.usercentrics.sdk:usercentrics-ui:2.15.5")
 
     // Adapter Dependencies
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1")

UsercentricsAdapter/src/main/java/com/chartboost/core/consent/usercentrics/UsercentricsAdapter.kt

@@ -42,6 +42,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import org.json.JSONObject
 import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
 
 class UsercentricsAdapter() : ConsentAdapter, Module {
 
@@ -236,13 +237,35 @@ class UsercentricsAdapter() : ConsentAdapter, Module {
         val options = options ?: UsercentricsOptions()
         val oldConsents = mutableConsents.toMap()
         mutableConsents.clear()
-        Usercentrics.reset()
+        resetUsercentrics()
         initializeUsercentrics(context, options)
         return fetchConsentInfo(
             context, NotificationType.DIFFERENT_FROM_CACHED_VALUE, oldConsents, partnerConsentStatus,
         )
     }
 
+    private suspend fun resetUsercentrics() {
+        return suspendCoroutine {
+            fun resumeOnce(result: Result<Unit>) {
+                it.resumeWith(result)
+            }
+            Usercentrics.isReady({
+                Usercentrics.instance.clearUserSession({
+                    resumeOnce(
+                        Result.success(Unit)
+                    )
+                },
+                    {
+                        ChartboostCoreLogger.w("Unable to clear user session. Unknown reason why.")
+                        resumeOnce(Result.failure(ChartboostCoreException(ChartboostCoreError.ConsentError.Unknown)))
+                    })
+            }, {
+                ChartboostCoreLogger.w("Failed to get Usercentrics instance when clearing consent.")
+                resumeOnce(Result.failure(ChartboostCoreException(ChartboostCoreError.ConsentError.InitializationError)))
+            })
+        }
+    }
+
     private fun consentStatusSourceToUsercentricsConsentType(statusSource: ConsentSource): UsercentricsConsentType {
         return when(statusSource) {
             ConsentSource.USER -> UsercentricsConsentType.EXPLICIT