resolves merge conflicts

Author: [email protected]

CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.3.15
+## Updates
+- Resolves Android build issues caused in 1.3.14
+- Fixes a specific Android issue where custom action handlers were not invoked when tapping on push notification when the app is in background.
+
+## 1.3.14
+> **Warning**
+> This version causes build failure on Android. Please use 1.3.15 which fixes this issue.
+## updates
+- updates `Iterable.setEmail` and `Iterable.setUserId` to take in null parameter type
+- fixes `Iterable.updateUser` on the Android side to merge nested objects in the user profile when `mergeNestedObjects` is set to true
+
 ## 1.3.9
 ### Added
 

Iterable-React-Native-SDK.podspec

@@ -24,6 +24,6 @@ Pod::Spec.new do |s|
 
   s.swift_version = '5.3'
 
-  s.dependency 'Iterable-iOS-SDK', '~> 6.4.12'
+  s.dependency 'Iterable-iOS-SDK', '~> 6.4.14'
   s.dependency 'React-Core'
 end

README.md

@@ -58,6 +58,8 @@ For quick reference, the following table lists the versions of the [Android SDK]
 
 | RN SDK Version                                                              | Android SDK Version                                                          | iOS SDK Version |
 | --------------------------------------------------------------------------- | ---------------------------------------------------------------------------- | --------------- |
+| [1.3.15](https://www.npmjs.com/package/@iterable/react-native-sdk/v/1.3.15) | [3.4.14](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.4.14) | [6.4.14](https://github.com/Iterable/swift-sdk/releases/tag/6.4.14)
+| [1.3.14](https://www.npmjs.com/package/@iterable/react-native-sdk/v/1.3.14) | [3.4.13](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.4.13) | [6.4.14](https://github.com/Iterable/swift-sdk/releases/tag/6.4.14)
 | [1.3.13](https://www.npmjs.com/package/@iterable/react-native-sdk/v/1.3.13) | [3.4.11](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.4.11) | [6.4.12](https://github.com/Iterable/swift-sdk/releases/tag/6.4.12)
 | [1.3.12](https://www.npmjs.com/package/@iterable/react-native-sdk/v/1.3.12) | [3.4.10](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.4.10) | [6.4.12](https://github.com/Iterable/swift-sdk/releases/tag/6.4.12)
 | [1.3.11](https://www.npmjs.com/package/@iterable/react-native-sdk/v/1.3.11) | [3.4.10](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.4.10) | [6.4.11](https://github.com/Iterable/swift-sdk/releases/tag/6.4.11)

android/build.gradle

@@ -26,6 +26,6 @@ def getModuleVersion() {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    //api 'com.iterable:iterableapi:3.4.11'
-     api project(':iterableapi') // links to local android SDK repo rather than by release
+    api 'com.iterable:iterableapi:3.4.14'
+    // api project(':iterableapi') // links to local android SDK repo rather than by release
 }

android/src/main/java/com/iterable/reactnative/RNIterableAPIModule.java

@@ -161,7 +161,7 @@ public void setUserId(@Nullable String userId, @Nullable String authToken) {
     @ReactMethod
     public void updateUser(ReadableMap dataFields, Boolean mergeNestedObjects) {
         IterableLogger.v(TAG, "updateUser");
-        IterableApi.getInstance().updateUser(optSerializedDataFields(dataFields));
+        IterableApi.getInstance().updateUser(optSerializedDataFields(dataFields), mergeNestedObjects);
     }
 
     @ReactMethod

integration-testing/ios/example/ReactE2E.swift

@@ -85,7 +85,7 @@ class ReactE2E: RCTEventEmitter {
             let campaignId = params["campaignId"] as! Int
             _ = IterableAPISupport.sendInApp(apiKey: apiKey, to: email, withCampaignId: campaignId)
             DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
-                _ = IterableAPI.internalImplementation?.inAppManager.scheduleSync()
+                _ = IterableAPI.implementation?.inAppManager.scheduleSync()
             }
             break
         default:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iterable/react-native-sdk",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "description": "Iterable SDK for React Native.",
   "main": "./js/index.js",
   "types": "./js/index.d.ts",

ts/Iterable.ts

@@ -209,11 +209,11 @@ class Iterable {
    * 
    * Note: specify a user by calling Iterable.setEmail or Iterable.setUserId, but NOT both.
    * 
-   * @param {string | undefined} email email address to associate with the current user
-   * @param {string | undefined} authToken valid, pre-fecthed JWT the SDK can use to authenticate API requests, optional - if null/undefined, no JWT related action will be taken
+   * @param {string | null | undefined} email email address to associate with the current user
+   * @param {string | null | undefined} authToken valid, pre-fetched JWT the SDK can use to authenticate API requests, optional - if null/undefined, no JWT related action will be taken
    */ 
 
-  static setEmail(email: string | undefined, authToken?: string | undefined) {
+  static setEmail(email?: string | null, authToken?: string | null) {
     Iterable.logger.log("setEmail: " + email)
 
     RNIterableAPI.setEmail(email, authToken)
@@ -262,11 +262,11 @@ class Iterable {
    * 
    * Note: specify a user by calling Iterable.setEmail or Iterable.setUserId, but NOT both.
    * 
-   * parameters: @param {string | undefined} userId user ID to associate with the current user 
-   * optional parameter: @param {string | undefined} authToken valid, pre-fecthed JWT the SDK can use to authenticate API requests, optional - if null/undefined, no JWT related action will be taken
+   * parameters: @param {string | null | undefined} userId user ID to associate with the current user 
+   * optional parameter: @param {string | null | undefined} authToken valid, pre-fetched JWT the SDK can use to authenticate API requests, optional - if null/undefined, no JWT related action will be taken
    */ 
 
-  static setUserId(userId: string | undefined, authToken?: string | undefined) {
+  static setUserId(userId?: string | null, authToken?: string | null) {
     Iterable.logger.log("setUserId: " + userId)
 
     RNIterableAPI.setUserId(userId, authToken)