Merge branch 'main' into DIA-5675-programmatic-reject-all-feature

# Conflicts:
#	src/index.tsx

Author: Nevazhnovu

README.md

@@ -36,7 +36,7 @@ In the sections below, we will review each of the steps in more detail:
 In your app, you can setup the SPConsent manager in a external file or on your app. In the example below we use `useRef`
 to keep a reference of the `SPConsentManager`.
 
-> It is important to notice that we wrap the initialisation of `SPConsentManager` in a `useEffect` and call `consentManager.current?.dispose()` to avoid memory leaks.
+> It is important to notice that we wrap the initialisation of `SPConsentManager` in a `useEffect` and set its reference to `null` to avoid memory leaks.
 
 ```ts
 const consentManager = useRef<SPConsentManager | null>();
@@ -52,7 +52,7 @@ useEffect(() => {
   );
 
   return () => {
-    consentManager.current?.dispose();
+    consentManager.current = null;
   };
 }
 ```
@@ -88,6 +88,7 @@ Refer to the table below regarding the different campaigns that can be implement
 | `onAction(callback: (action: string) => {})`     | Called when the user takes an action (e.g. Accept All) within the consent message. `action: string` is going to be replaced with an enum.                                                                                              |
 | `onSPUIFinished(callback: () => {})`             | Called when the native SDKs is done removing the consent UI from the foreground.                                                                                                                                                       |
 | `onFinished(callback: () => {})`                 | Called when all UI and network processes are finished. User consent is stored on the local storage of each platform (`UserDefaults` for iOS and `SharedPrefs` for Android). And it is safe to retrieve consent data with `getUserData` |
+| `onMessageInactivityTimeout(callback: () => {})` | Called when the user becomes inactive while viewing a consent message. This allows your app to respond to user inactivity events.                                                                                                      |
 | `onError(callback: (description: string) => {})` | Called if something goes wrong.                                                                                                                                                                                                        |
 
 ### Call `loadMessages`
@@ -239,6 +240,8 @@ export default function App() {
         // is disabled in the Sourcepoint dashboard
         language: SPMessageLanguage.ENGLISH,
         messageTimeoutInSeconds: 20,
+        // Allows Android users to dismiss the consent message on back press. True by default. Set it to false if you wish to prevent this users from dismissing the message on back press.
+        androidDismissMessageOnBackPress: true,
       }
     );
 
@@ -255,6 +258,9 @@ export default function App() {
     consentManager.current?.onAction(({ actionType }) => {
           console.log(`User took action ${actionType}`)
     });
+    consentManager.current?.onMessageInactivityTimeout(() => {
+      console.log("User became inactive")
+    });
     consentManager.current?.onError(console.error)
 
     consentManager.current?.loadMessage();

ReactNativeCmp.podspec

@@ -12,10 +12,12 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
+  s.static_framework = true
+
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/SourcePointUSA/react-native-sourcepoint-cmp.git", :tag => "#{s.version}" }
 
-  s.dependency "ConsentViewController", "7.11.1"
+  s.dependency "ConsentViewController", "7.12.1"
   s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
   s.private_header_files = "ios/**/*.h"
 

android/build.gradle

@@ -77,7 +77,7 @@ dependencies {
   implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3"
   implementation "org.jetbrains.kotlinx:kotlinx-datetime:0.6.1"
 
-  implementation "com.sourcepoint.cmplibrary:cmplibrary:7.15.2"
+  implementation "com.sourcepoint.cmplibrary:cmplibrary:7.15.4"
 }
 
 react {

android/src/main/java/com/sourcepoint/reactnativecmp/ReactNativeCmpModule.kt

@@ -1,18 +1,13 @@
 package com.sourcepoint.reactnativecmp
 
 import android.view.View
-import com.facebook.react.bridge.Arguments.createMap
 import com.facebook.react.bridge.Callback
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.module.annotations.ReactModule
-import com.sourcepoint.cmplibrary.NativeMessageController
+import com.facebook.react.bridge.ReadableMap
 import com.sourcepoint.cmplibrary.SpClient
 import com.sourcepoint.cmplibrary.SpConsentLib
-import com.sourcepoint.cmplibrary.core.nativemessage.MessageStructure
 import com.sourcepoint.cmplibrary.creation.ConfigOption.SUPPORT_LEGACY_USPSTRING
 import com.sourcepoint.cmplibrary.creation.SpConfigDataBuilder
 import com.sourcepoint.cmplibrary.creation.makeConsentLib
@@ -23,22 +18,21 @@ import com.sourcepoint.cmplibrary.util.clearAllData
 import com.sourcepoint.cmplibrary.util.userConsents
 import com.sourcepoint.reactnativecmp.arguments.BuildOptions
 import com.sourcepoint.reactnativecmp.arguments.toList
-import com.sourcepoint.reactnativecmp.consents.RNSPUserData
 import com.sourcepoint.reactnativecmp.consents.RNSPGDPRConsent
-import org.json.JSONObject
+import com.sourcepoint.reactnativecmp.consents.RNSPUserData
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 
 data class SPLoadMessageParams(val authId: String?) {
   constructor(fromReadableMap: ReadableMap?) : this(authId = fromReadableMap?.getString("authId"))
 }
 
-@ReactModule(name = ReactNativeCmpModule.NAME)
 class ReactNativeCmpModule(reactContext: ReactApplicationContext) : NativeReactNativeCmpSpec(reactContext),
   SpClient {
   private var spConsentLib: SpConsentLib? = null
 
   override fun getName() = NAME
 
-  @ReactMethod
   override fun build(
     accountId: Double,
     propertyId: Double,
@@ -74,7 +68,7 @@ class ReactNativeCmpModule(reactContext: ReactApplicationContext) : NativeReactN
     }.build()
 
     reactApplicationContext.currentActivity?.let {
-      spConsentLib = makeConsentLib(config, it, this)
+      spConsentLib = makeConsentLib(config, it, this, parsedOptions.androidDismissMessageOnBackPress)
     } ?: run {
       onError(Error("No activity found when building the SDK"))
     }
@@ -84,7 +78,6 @@ class ReactNativeCmpModule(reactContext: ReactApplicationContext) : NativeReactN
     reactApplicationContext.runOnUiQueueThread(runnable)
   }
 
-  @ReactMethod
   override fun loadMessage(params: ReadableMap?) {
     val parsedParams = SPLoadMessageParams(fromReadableMap = params)
 
@@ -93,22 +86,18 @@ class ReactNativeCmpModule(reactContext: ReactApplicationContext) : NativeReactN
     }
   }
 
-  @ReactMethod
   override fun clearLocalData() {
     clearAllData(reactApplicationContext)
   }
 
-  @ReactMethod
   override fun getUserData(promise: Promise) {
     promise.resolve(userConsentsToWriteableMap(userConsents(reactApplicationContext)))
   }
 
-  @ReactMethod
   override fun loadGDPRPrivacyManager(pmId: String) {
     runOnMainThread { spConsentLib?.loadPrivacyManager(pmId, GDPR) }
   }
 
-  @ReactMethod
   override fun loadUSNatPrivacyManager(pmId: String) {
     runOnMainThread { spConsentLib?.loadPrivacyManager(pmId, USNAT) }
   }
@@ -125,7 +114,12 @@ class ReactNativeCmpModule(reactContext: ReactApplicationContext) : NativeReactN
     runOnMainThread { spConsentLib?.dismissMessage() }
   }
 
-  override fun postCustomConsentGDPR(vendors: ReadableArray, categories: ReadableArray, legIntCategories: ReadableArray, callback: Callback) {
+  override fun postCustomConsentGDPR(
+    vendors: ReadableArray,
+    categories: ReadableArray,
+    legIntCategories: ReadableArray,
+    callback: Callback
+  ) {
     runOnMainThread {
       spConsentLib?.customConsentGDPR(
         vendors.toList(),
@@ -142,7 +136,12 @@ class ReactNativeCmpModule(reactContext: ReactApplicationContext) : NativeReactN
     }
   }
 
-  override fun postDeleteCustomConsentGDPR(vendors: ReadableArray, categories: ReadableArray, legIntCategories: ReadableArray, callback: Callback) {
+  override fun postDeleteCustomConsentGDPR(
+    vendors: ReadableArray,
+    categories: ReadableArray,
+    legIntCategories: ReadableArray,
+    callback: Callback
+  ) {
     runOnMainThread {
       spConsentLib?.deleteCustomConsentTo(
         vendors.toList(),
@@ -170,33 +169,29 @@ class ReactNativeCmpModule(reactContext: ReactApplicationContext) : NativeReactN
   }
 
   override fun onAction(view: View, consentAction: ConsentAction): ConsentAction {
-    emitOnAction(createMap().apply {
-      putString("actionType", RNSourcepointActionType.from(consentAction.actionType).name)
-      putString("customActionId", consentAction.customActionId)
-    })
+    emitInternalOnAction(Json.encodeToString(mapOf(
+      "actionType" to RNSourcepointActionType.from(consentAction.actionType).name,
+      "customActionId" to consentAction.customActionId
+    )))
     return consentAction
   }
 
   override fun onConsentReady(consent: SPConsents) {}
 
   override fun onError(error: Throwable) {
-    emitOnError(createMap().apply { putString("description", error.message) })
+    emitInternalOnError(Json.encodeToString(mapOf("description" to error.message)))
   }
 
-  @Deprecated("onMessageReady callback will be removed in favor of onUIReady. Currently this callback is disabled.")
-  override fun onMessageReady(message: JSONObject) {}
-
-  override fun onNativeMessageReady(
-    message: MessageStructure,
-    messageController: NativeMessageController
-  ) {}
-
   override fun onNoIntentActivitiesFound(url: String) {}
 
   override fun onSpFinished(sPConsents: SPConsents) {
     emitOnFinished()
   }
 
+  override fun onMessageInactivityTimeout() {
+    emitOnMessageInactivityTimeout()
+  }
+
   override fun onUIFinished(view: View) {
     spConsentLib?.removeView(view)
     emitOnSPUIFinished()

android/src/main/java/com/sourcepoint/reactnativecmp/arguments/Arguments.kt

@@ -168,6 +168,13 @@ fun ReadableMap.getDoubleOrNull(name: String) =
     null
   }
 
+fun ReadableMap.getBooleanOrNull(name: String) =
+  if (hasKey(name) && !isNull(name)) {
+    getBoolean(name)
+  } else {
+    null
+  }
+
 inline fun <reified T> ReadableArray.toList(): List<T> = List(size()) {
   when (T::class) {
     String::class -> getString(it)

android/src/main/java/com/sourcepoint/reactnativecmp/arguments/BuildOptions.kt

@@ -7,11 +7,13 @@ import com.sourcepoint.cmplibrary.model.MessageLanguage.ENGLISH
 data class BuildOptions(
   val language: MessageLanguage,
   val messageTimeoutInSeconds: Long,
+  val androidDismissMessageOnBackPress: Boolean
 ) {
   val messageTimeoutInMilliseconds = messageTimeoutInSeconds * 1000L
 
   constructor(options: ReadableMap?) : this(
     language = MessageLanguage.entries.find { it.value == options?.getString("language") } ?: ENGLISH,
-    messageTimeoutInSeconds = options?.getDoubleOrNull("messageTimeoutInSeconds")?.toLong() ?: 30L
+    messageTimeoutInSeconds = options?.getDoubleOrNull("messageTimeoutInSeconds")?.toLong() ?: 30L,
+    androidDismissMessageOnBackPress = options?.getBooleanOrNull("androidDismissMessageOnBackPress") ?: true
   )
 }

example/android/app/build.gradle

@@ -108,9 +108,6 @@ android {
             proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
         }
     }
-  compileOptions {
-    coreLibraryDesugaringEnabled = true
-  }
 }
 
 dependencies {
@@ -119,7 +116,6 @@ dependencies {
     androidTestImplementation "androidx.test:core:1.6.1"
     androidTestImplementation('com.wix:detox:+')
     implementation 'androidx.appcompat:appcompat:1.7.1'
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
 
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")

example/ios/Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
   - boost (1.84.0)
-  - ConsentViewController (7.11.1):
+  - ConsentViewController (7.12.1):
     - Down (~> 0.11.0)
     - SPMobileCore (= 0.1.11)
   - DoubleConversion (1.1.6)
@@ -1659,8 +1659,8 @@ PODS:
     - React-logger (= 0.79.2)
     - React-perflogger (= 0.79.2)
     - React-utils (= 0.79.2)
-  - ReactNativeCmp (1.0.4):
-    - ConsentViewController (= 7.11.1)
+  - ReactNativeCmp (1.0.9-beta.2):
+    - ConsentViewController (= 7.12.1)
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1919,7 +1919,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
-  ConsentViewController: 6cd17ebf78b80e7d32bf3d6b0b46d20a40e8cad9
+  ConsentViewController: 653e30da12ad26fbe47b8adfd0ca545c69c10d0e
   DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
   fast_float: 06eeec4fe712a76acc9376682e4808b05ce978b6
   FBLazyVector: 84b955f7b4da8b895faf5946f73748267347c975
@@ -1989,11 +1989,11 @@ SPEC CHECKSUMS:
   ReactAppDependencyProvider: 04d5eb15eb46be6720e17a4a7fa92940a776e584
   ReactCodegen: c63eda03ba1d94353fb97b031fc84f75a0d125ba
   ReactCommon: 76d2dc87136d0a667678668b86f0fca0c16fdeb0
-  ReactNativeCmp: 8502676551832d19d227fa2b161b4c7354cd686c
+  ReactNativeCmp: d79d97ff49c3e5ca3aa5f8a6608dbe06a30e7c7a
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   SPMobileCore: 220d109e404cb17169f7e26f2a34c6022b80079a
   Yoga: c758bfb934100bb4bf9cbaccb52557cee35e8bdf
 
 PODFILE CHECKSUM: decdc7519d77aa5eae65b167fa59bcfce25e15d2
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2

example/src/App.tsx

@@ -38,6 +38,10 @@ const config = {
     // is disabled in the Sourcepoint dashboard
     language: SPMessageLanguage.ENGLISH,
     messageTimeoutInSeconds: 20,
+    // Allows Android users to dismiss the consent message on back press. 
+    // True by default. 
+    // Set it to false if you wish to prevent this users from dismissing the message on back press.
+    androidDismissMessageOnBackPress: false,
   },
   gdprPMId: '488393',
   usnatPMId: '988851',
@@ -89,6 +93,10 @@ export default function App() {
       console.log(`action: ${actionType}`)
     );
 
+    consentManager.current?.onMessageInactivityTimeout(() => {
+      console.log("User inactive");
+    });
+
     consentManager.current?.onError((description) => {
       setSDKStatus(SDKStatus.Errored);
       console.error(description);

ios/RNSourcepointCmp.swift

@@ -28,16 +28,26 @@ import React
     self.customActionId = customActionId
   }
 
-  @objc public func toDictionary() -> [String: Any] {
+  func toDictionary() -> [String: Any] {
     ["actionType": type.description, "customActionId": customActionId]
   }
+
+  @objc public func stringifiedJson() -> String {
+    if let jsonData = try? JSONSerialization.data(withJSONObject: toDictionary()),
+       let jsonString = String(data: jsonData, encoding: .utf8) {
+        return jsonString
+    } else {
+      return "{\"actionType\":\"unknown\"}"
+    }
+  }
 }
 
 @objc public protocol ReactNativeCmpImplDelegate {
   func onAction(_ action: RNAction)
   func onSPUIReady()
   func onSPUIFinished()
   func onFinished()
+  func onMessageInactivityTimeout()
   func onError(description: String)
 }
 
@@ -147,6 +157,10 @@ import React
     delegate?.onFinished()
   }
 
+  public func onMessageInactivityTimeout() {
+    delegate?.onMessageInactivityTimeout()
+  }
+
   public func onError(error: SPError) {
     print("Something went wrong", error)
     delegate?.onError(description: error.description)
@@ -180,6 +194,10 @@ private class CMPDelegateHandler: NSObject, SPDelegate {
     parent?.onSPFinished(userData: userData)
   }
 
+  func onMessageInactivityTimeout() {
+    parent?.onMessageInactivityTimeout()
+  }
+
   func onError(error: SPError) {
     parent?.onError(error: error)
   }