@didomi/react-native 1.6.0 → 1.7.0

package/android/build.gradle

@@ -132,5 +132,5 @@ dependencies {
     api "com.facebook.react:react-native:+"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    implementation "io.didomi.sdk:android:1.58.0"
+    implementation "io.didomi.sdk:android:1.59.1"
 }

package/android/src/main/java/com/reactnativedidomi/DidomiModule.kt

@@ -270,7 +270,8 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
                 noticeId
             )
 
-            Didomi.getInstance().initialize(currentActivity?.application, parameters)
+            val application = currentActivity?.application ?: throw IllegalStateException("No activity present")
+            Didomi.getInstance().initialize(application, parameters)
 
             Didomi.getInstance().onReady { prepareEvent(EventTypes.READY_CALLBACK.event, null) }
             Didomi.getInstance().onError { prepareEvent(EventTypes.ERROR_CALLBACK.event, null) }
@@ -278,7 +279,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
             promise.resolve(0)
 
         } catch (e: Exception) {
-            Log.e("initialize", "Error while initializing the Didomi SDK", e);
+            Log.e("initialize", "Error while initializing the Didomi SDK", e)
             promise.reject(e)
         }
     }
@@ -287,7 +288,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     fun setupUI(promise: Promise) {
         try {
             runOnUiThread {
-                Didomi.getInstance().setupUI(currentActivity as FragmentActivity)
+                Didomi.getInstance().setupUI(currentActivity as? FragmentActivity)
             }
             promise.resolve(0)
         } catch (e: Exception) {
@@ -531,7 +532,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun getUserStatus(promise: Promise) {
         try {
-            promise.resolve(objectToWritableMap(Didomi.getInstance().getUserStatus()))
+            promise.resolve(objectToWritableMap(Didomi.getInstance().userStatus))
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
         }
@@ -596,7 +597,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun isNoticeVisible(promise: Promise) {
         try {
-            promise.resolve(Didomi.getInstance().isNoticeVisible)
+            promise.resolve(Didomi.getInstance().isNoticeVisible())
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
         }
@@ -605,7 +606,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     @ReactMethod
     fun isPreferencesVisible(promise: Promise) {
         try {
-            promise.resolve(Didomi.getInstance().isPreferencesVisible)
+            promise.resolve(Didomi.getInstance().isPreferencesVisible())
         } catch (e: DidomiNotReadyException) {
             promise.reject(e)
         }
@@ -718,7 +719,7 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
     fun showNotice(promise: Promise) {
         try {
             runOnUiThread {
-                Didomi.getInstance().showNotice(currentActivity as FragmentActivity)
+                Didomi.getInstance().showNotice(currentActivity as? FragmentActivity)
             }
             promise.resolve(0)
         } catch (e: Exception) {
@@ -732,8 +733,8 @@ class DidomiModule(reactContext: ReactApplicationContext) : ReactContextBaseJava
         try {
             runOnUiThread {
                 view?.also {
-                    Didomi.getInstance().showPreferences(currentActivity as FragmentActivity, view)
-                } ?: Didomi.getInstance().showPreferences(currentActivity as FragmentActivity)
+                    Didomi.getInstance().showPreferences(currentActivity as? FragmentActivity, view)
+                } ?: Didomi.getInstance().showPreferences(currentActivity as? FragmentActivity)
             }
             promise.resolve(0)
         } catch (e: Exception) {

package/ios/RNDidomi.swift

@@ -6,8 +6,14 @@ import AppTrackingTransparency
 class RNDidomi: RCTEventEmitter {
     
     public static var initialized = false
-    let didomiEventListener = EventListener()
-    
+    var didomiEventListener: EventListener
+
+    override init() {
+        didomiEventListener = EventListener()
+        super.init()
+        initEventListener()
+    }
+
     override static func requiresMainQueueSetup() -> Bool {
         return true
     }
@@ -36,13 +42,13 @@ class RNDidomi: RCTEventEmitter {
     
     private func onReady() {
         Didomi.shared.onReady {
-            self.sendEvent(withName: "on_ready_callback", body: nil)
+            self.dispatchEvent(withName: "on_ready_callback", body: nil)
         }
     }
     
     private func onError() {
         Didomi.shared.onError { error in
-            self.sendEvent(withName: "on_error_callback", body: error.descriptionText)
+            self.dispatchEvent(withName: "on_error_callback", body: error.descriptionText)
         }
     }
     
@@ -530,135 +536,145 @@ extension RNDidomi {
                 "on_sync_error"
         ]
     }
+
+    private func initEventListener() {
     
-    private func initEventListener(){
-        
         didomiEventListener.onConsentChanged = { event in
-            self.sendEvent(withName: "on_consent_changed", body:"")
+            self.dispatchEvent(withName: "on_consent_changed", body:"")
         }
         
         didomiEventListener.onReady = { event in
-            self.sendEvent(withName: "on_ready", body: "")
+            self.dispatchEvent(withName: "on_ready", body: "")
         }
         
         didomiEventListener.onError = { event in
-            self.sendEvent(withName: "on_error", body: "")
+            self.dispatchEvent(withName: "on_error", body: "")
         }
         
         didomiEventListener.onShowNotice = { event in
-            self.sendEvent(withName: "on_show_notice", body: "")
+            self.dispatchEvent(withName: "on_show_notice", body: "")
         }
         
         didomiEventListener.onHideNotice = { event in
-            self.sendEvent(withName: "on_hide_notice", body: "")
+            self.dispatchEvent(withName: "on_hide_notice", body: "")
         }
         
         didomiEventListener.onNoticeClickAgree = { event in
-            self.sendEvent(withName: "on_notice_click_agree", body: "")
+            self.dispatchEvent(withName: "on_notice_click_agree", body: "")
         }
         
         didomiEventListener.onNoticeClickDisagree = { event in
-            self.sendEvent(withName: "on_notice_click_disagree", body: "")
+            self.dispatchEvent(withName: "on_notice_click_disagree", body: "")
         }
         
         didomiEventListener.onNoticeClickMoreInfo = { event in
-            self.sendEvent(withName: "on_notice_click_more_info", body: "")
+            self.dispatchEvent(withName: "on_notice_click_more_info", body: "")
         }
-        
+
         didomiEventListener.onNoticeClickViewVendors = { event in
-            self.sendEvent(withName: "on_notice_click_view_vendors", body: "")
+            self.dispatchEvent(withName: "on_notice_click_view_vendors", body: "")
         }
-        
+
         didomiEventListener.onNoticeClickPrivacyPolicy = { event in
-            self.sendEvent(withName: "on_notice_click_privacy_policy", body: "")
+            self.dispatchEvent(withName: "on_notice_click_privacy_policy", body: "")
         }
         
         didomiEventListener.onShowPreferences = { event in
-            self.sendEvent(withName: "on_show_preferences", body: "")
+            self.dispatchEvent(withName: "on_show_preferences", body: "")
         }
         
         didomiEventListener.onHidePreferences = { event in
-            self.sendEvent(withName: "on_hide_preferences", body: "")
+            self.dispatchEvent(withName: "on_hide_preferences", body: "")
         }
         
         didomiEventListener.onPreferencesClickAgreeToAll = { event in
-            self.sendEvent(withName: "on_preferences_click_agree_to_all", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_agree_to_all", body: "")
         }
         
         didomiEventListener.onPreferencesClickDisagreeToAll = { event in
-            self.sendEvent(withName: "on_preferences_click_disagree_to_all", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_disagree_to_all", body: "")
         }
         
         didomiEventListener.onPreferencesClickAgreeToAllPurposes = { event in
-            self.sendEvent(withName: "on_preferences_click_agree_to_all_purposes", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_agree_to_all_purposes", body: "")
         }
         
         didomiEventListener.onPreferencesClickDisagreeToAllPurposes = { event in
-            self.sendEvent(withName: "on_preferences_click_disagree_to_all_purposes", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_disagree_to_all_purposes", body: "")
         }
         
         didomiEventListener.onPreferencesClickResetAllPurposes = { event in
-            self.sendEvent(withName: "on_preferences_click_reset_all_purposes", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_reset_all_purposes", body: "")
         }
         
         didomiEventListener.onPreferencesClickAgreeToAllVendors = { event in
-            self.sendEvent(withName: "on_preferences_click_agree_to_all_vendors", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_agree_to_all_vendors", body: "")
         }
         
         didomiEventListener.onPreferencesClickDisagreeToAllVendors = { event in
-            self.sendEvent(withName: "on_preferences_click_disagree_to_all_vendors", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_disagree_to_all_vendors", body: "")
         }
         
         didomiEventListener.onPreferencesClickPurposeAgree = { event, purposeId in
-            self.sendEvent(withName: "on_preferences_click_purpose_agree", body: purposeId)
+            self.dispatchEvent(withName: "on_preferences_click_purpose_agree", body: purposeId)
         }
         
         didomiEventListener.onPreferencesClickPurposeDisagree = { event, purposeId in
-            self.sendEvent(withName: "on_preferences_click_purpose_disagree", body: purposeId)
+            self.dispatchEvent(withName: "on_preferences_click_purpose_disagree", body: purposeId)
         }
         
         didomiEventListener.onPreferencesClickCategoryAgree = { event, categoryId in
-            self.sendEvent(withName: "on_preferences_click_category_agree", body: categoryId)
+            self.dispatchEvent(withName: "on_preferences_click_category_agree", body: categoryId)
         }
         
         didomiEventListener.onPreferencesClickCategoryDisagree = { event, categoryId in
-            self.sendEvent(withName: "on_preferences_click_category_disagree", body: categoryId)
+            self.dispatchEvent(withName: "on_preferences_click_category_disagree", body: categoryId)
         }
         
         didomiEventListener.onPreferencesClickViewVendors = { event in
-            self.sendEvent(withName: "on_preferences_click_view_vendors", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_view_vendors", body: "")
         }
         
         didomiEventListener.onPreferencesClickViewPurposes = { event in
-            self.sendEvent(withName: "on_preferences_click_view_purposes", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_view_purposes", body: "")
         }
         
         didomiEventListener.onPreferencesClickSaveChoices = { event in
-            self.sendEvent(withName: "on_preferences_click_save_choices", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_save_choices", body: "")
         }
         
         didomiEventListener.onPreferencesClickVendorAgree = { event, vendorId in
-            self.sendEvent(withName: "on_preferences_click_vendor_agree", body: vendorId)
+            self.dispatchEvent(withName: "on_preferences_click_vendor_agree", body: vendorId)
         }
         
         didomiEventListener.onPreferencesClickVendorDisagree = { event, vendorId in
-            self.sendEvent(withName: "on_preferences_click_vendor_disagree", body: vendorId)
+            self.dispatchEvent(withName: "on_preferences_click_vendor_disagree", body: vendorId)
         }
         
         didomiEventListener.onPreferencesClickVendorSaveChoices = { event in
-            self.sendEvent(withName: "on_preferences_click_vendor_save_choices", body: "")
+            self.dispatchEvent(withName: "on_preferences_click_vendor_save_choices", body: "")
         }
         
         didomiEventListener.onSyncDone = { event, organizationUserId in
-            self.sendEvent(withName: "on_sync_done", body: organizationUserId)
+            self.dispatchEvent(withName: "on_sync_done", body: organizationUserId)
         }
 
         didomiEventListener.onSyncError = { event, error in
-            self.sendEvent(withName: "on_sync_error", body: error)
+            self.dispatchEvent(withName: "on_sync_error", body: error)
         }
 
         Didomi.shared.addEventListener(listener: didomiEventListener)
     }
+
+    /// Sends the specified event only if the react-native bridge is still valid
+    private func dispatchEvent(withName: String, body: String?) {
+        if self.bridge != nil {
+            self.sendEvent(withName: withName, body: body)
+        } else {
+            // Event emitter is not valid anymore, remove event listener
+            Didomi.shared.removeEventListener(listener: didomiEventListener)
+        }
+    }
 }
 
 extension Int {

package/lib/commonjs/Constants.js

@@ -8,6 +8,6 @@ exports.DIDOMI_VERSION = exports.DIDOMI_USER_AGENT_NAME = void 0;
 const DIDOMI_USER_AGENT_NAME = "Didomi React-Native SDK"; // User agent version
 
 exports.DIDOMI_USER_AGENT_NAME = DIDOMI_USER_AGENT_NAME;
-const DIDOMI_VERSION = "1.6.0";
+const DIDOMI_VERSION = "1.7.0";
 exports.DIDOMI_VERSION = DIDOMI_VERSION;
 //# sourceMappingURL=Constants.js.map

package/lib/commonjs/Constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Constants.ts"],"names":["DIDOMI_USER_AGENT_NAME","DIDOMI_VERSION"],"mappings":";;;;;;AAAA;AACO,MAAMA,sBAAsB,GAAG,yBAA/B,C,CACP;;;AACO,MAAMC,cAAc,GAAG,OAAvB","sourcesContent":["// User agent name\nexport const DIDOMI_USER_AGENT_NAME = \"Didomi React-Native SDK\"\n// User agent version\nexport const DIDOMI_VERSION = \"1.6.0\"\n"]}
+{"version":3,"sources":["Constants.ts"],"names":["DIDOMI_USER_AGENT_NAME","DIDOMI_VERSION"],"mappings":";;;;;;AAAA;AACO,MAAMA,sBAAsB,GAAG,yBAA/B,C,CACP;;;AACO,MAAMC,cAAc,GAAG,OAAvB","sourcesContent":["// User agent name\nexport const DIDOMI_USER_AGENT_NAME = \"Didomi React-Native SDK\"\n// User agent version\nexport const DIDOMI_VERSION = \"1.7.0\"\n"]}

package/lib/module/Constants.js

@@ -1,5 +1,5 @@
 // User agent name
 export const DIDOMI_USER_AGENT_NAME = "Didomi React-Native SDK"; // User agent version
 
-export const DIDOMI_VERSION = "1.6.0";
+export const DIDOMI_VERSION = "1.7.0";
 //# sourceMappingURL=Constants.js.map

package/lib/module/Constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Constants.ts"],"names":["DIDOMI_USER_AGENT_NAME","DIDOMI_VERSION"],"mappings":"AAAA;AACA,OAAO,MAAMA,sBAAsB,GAAG,yBAA/B,C,CACP;;AACA,OAAO,MAAMC,cAAc,GAAG,OAAvB","sourcesContent":["// User agent name\nexport const DIDOMI_USER_AGENT_NAME = \"Didomi React-Native SDK\"\n// User agent version\nexport const DIDOMI_VERSION = \"1.6.0\"\n"]}
+{"version":3,"sources":["Constants.ts"],"names":["DIDOMI_USER_AGENT_NAME","DIDOMI_VERSION"],"mappings":"AAAA;AACA,OAAO,MAAMA,sBAAsB,GAAG,yBAA/B,C,CACP;;AACA,OAAO,MAAMC,cAAc,GAAG,OAAvB","sourcesContent":["// User agent name\nexport const DIDOMI_USER_AGENT_NAME = \"Didomi React-Native SDK\"\n// User agent version\nexport const DIDOMI_VERSION = \"1.7.0\"\n"]}

package/lib/typescript/Constants.d.ts

@@ -1,2 +1,2 @@
 export declare const DIDOMI_USER_AGENT_NAME = "Didomi React-Native SDK";
-export declare const DIDOMI_VERSION = "1.6.0";
+export declare const DIDOMI_VERSION = "1.7.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@didomi/react-native",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Didomi React Native SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/react-native-didomi.podspec

@@ -16,5 +16,5 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
-  s.dependency "Didomi-XCFramework", "1.67.1"
+  s.dependency "Didomi-XCFramework", "1.68.0"
 end

package/src/Constants.ts

@@ -1,4 +1,4 @@
 // User agent name
 export const DIDOMI_USER_AGENT_NAME = "Didomi React-Native SDK"
 // User agent version
-export const DIDOMI_VERSION = "1.6.0"
+export const DIDOMI_VERSION = "1.7.0"