react-native-moengage 8.2.0 → 8.4.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# 16-02-2023
+
+## 8.4.0
+- iOS
+    - MoEngage-iOS-SDK version updated to `~>9.4.0`.
+  
+# 09-02-2023
+
+## 8.3.0
+- Android
+  - Android 13 push notification Opt-in with rationale via In-Apps
+  - Device Id enable / disable support
+  - BugFix
+    - Adding PushClick Callback Redirection Support if Application is in Foreground/Background State
+
 # 16-01-2023
 
 ## 8.2.0

package/ReactNativeMoEngage.podspec

@@ -15,8 +15,8 @@ Pod::Spec.new do |s|
   s.platform            = :ios, "10.0"
   s.source_files        = 'iOS/MoEReactBridge/**/*.{h,m}'
   s.dependency          'React'
-  s.dependency          'MoEngagePluginBase','>= 4.0.0','< 4.1.0'
-  s.dependency  	'MoEngageRichNotification','>= 7.2.0','< 7.3.0'
+  s.dependency          'MoEngagePluginBase','>= 4.1.0','< 4.2.0'
+  s.dependency  	'MoEngageRichNotification','>= 7.4.0','< 7.5.0'
 
   s.prepare_command = <<-CMD
     echo // Generated file, do not edit > iOS/MoEReactBridge/MoEngageReactPluginInfo.h

package/android/build.gradle

@@ -20,9 +20,9 @@ rootProject.allprojects {
 
 ext {
   //dependency version
-  moengageCoreVersion = "12.4.00"
-  moengageInAppVersion = "6.4.0"
-  basePluginVersion = "3.1.0"
+  moengageCoreVersion = "12.6.00"
+  moengageInAppVersion = "6.5.0"
+  basePluginVersion = "3.2.0"
   //build versions
   minimumVersion = 21
   targetVersion = 31

package/android/src/main/java/com/moengage/react/EventEmitterImpl.kt

@@ -2,10 +2,12 @@ package com.moengage.react
 
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
+import com.facebook.react.common.LifecycleState
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.moengage.core.LogLevel
 import com.moengage.core.internal.logger.Logger
 import com.moengage.plugin.base.internal.EventEmitter
+import com.moengage.plugin.base.internal.instanceMetaFromJson
 import com.moengage.plugin.base.internal.model.events.Event
 import com.moengage.plugin.base.internal.model.events.EventType
 import com.moengage.plugin.base.internal.model.events.inapp.InAppActionEvent
@@ -14,6 +16,7 @@ import com.moengage.plugin.base.internal.model.events.inapp.InAppSelfHandledEven
 import com.moengage.plugin.base.internal.model.events.push.PermissionEvent
 import com.moengage.plugin.base.internal.model.events.push.PushClickedEvent
 import com.moengage.plugin.base.internal.model.events.push.TokenEvent
+import org.json.JSONObject
 
 
 /**
@@ -66,6 +69,13 @@ class EventEmitterImpl(private val reactContext: ReactContext) : EventEmitter {
         Logger.print { "$tag emitPushClicked() : $event" }
         val eventName = eventMapping[event.eventType] ?: return
         val payload = PayloadGenerator().pushPayloadToWriteableMap(event.payload)
+        if (GlobalCache.lifecycleAwarePushCallbackEnabled
+            && reactContext.lifecycleState != LifecycleState.RESUMED
+        ) {
+            Logger.print { "$tag emitPushClicked() : ${reactContext.lifecycleState}" }
+            GlobalCache.addPushClickedEventToCache(payload)
+            return
+        }
         emit(eventName, payload)
     }
 
@@ -91,6 +101,16 @@ class EventEmitterImpl(private val reactContext: ReactContext) : EventEmitter {
         val payload = PayloadGenerator().permissionResultToWriteableMap(event.result)
         emit(eventName, payload)
     }
+
+    internal fun emitPendingEvents() {
+        if (GlobalCache.lifecycleAwarePushCallbackEnabled) {
+            val cachedPushClickedEvent = GlobalCache.getPushClickedCachedEvent() ?: return
+            val eventName = eventMapping[EventType.PUSH_CLICKED] ?: return
+            GlobalCache.removePushClickedEventFromCache()
+
+            emit(eventName, cachedPushClickedEvent)
+        }
+    }
 }
 
 val eventMapping = mapOf<EventType, String>(

package/android/src/main/java/com/moengage/react/GlobalCache.kt

@@ -0,0 +1,25 @@
+package com.moengage.react
+
+import com.facebook.react.bridge.WritableMap
+
+object GlobalCache {
+
+    var lifecycleAwarePushCallbackEnabled = false
+        internal set
+
+    private var pushClickedCachedEvent: WritableMap? = null
+
+    fun getPushClickedCachedEvent(): WritableMap? {
+        return pushClickedCachedEvent
+    }
+
+    internal fun addPushClickedEventToCache(
+        pushClickedEvent: WritableMap
+    ) {
+        this.pushClickedCachedEvent = pushClickedEvent
+    }
+
+    internal fun removePushClickedEventFromCache() {
+        pushClickedCachedEvent = null
+    }
+}

package/android/src/main/java/com/moengage/react/MoEInitializer.kt

@@ -40,9 +40,15 @@ object MoEInitializer {
         initializeDefaultInstance(context, builder, sdkState)
     }
 
-    fun initializeDefaultInstance(context: Context, builder: MoEngage.Builder) {
+    @JvmOverloads
+    fun initializeDefaultInstance(
+        context: Context,
+        builder: MoEngage.Builder,
+        lifecycleAwarePushCallbackEnabled: Boolean = false
+    ) {
         try {
             Logger.print { "$tag initialize() : Will try to initialize the sdk." }
+            GlobalCache.lifecycleAwarePushCallbackEnabled = lifecycleAwarePushCallbackEnabled
             PluginInitializer.initialize(
                 builder,
                 IntegrationMeta(INTEGRATION_TYPE, BuildConfig.MOENGAGE_REACT_LIBRARY_VERSION)
@@ -52,9 +58,16 @@ object MoEInitializer {
         }
     }
 
-    fun initializeDefaultInstance(context: Context, builder: MoEngage.Builder, sdkState: SdkState) {
+    @JvmOverloads
+    fun initializeDefaultInstance(
+        context: Context,
+        builder: MoEngage.Builder,
+        sdkState: SdkState,
+        lifecycleAwarePushCallbackEnabled: Boolean = false
+    ) {
         try {
             Logger.print { "$tag initialize() : Initialising MoEngage SDK." }
+            GlobalCache.lifecycleAwarePushCallbackEnabled = lifecycleAwarePushCallbackEnabled
             PluginInitializer.initialize(
                 builder,
                 IntegrationMeta(INTEGRATION_TYPE, BuildConfig.MOENGAGE_REACT_LIBRARY_VERSION),

package/android/src/main/java/com/moengage/react/MoEReactBridge.kt

@@ -6,8 +6,8 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.moengage.core.LogLevel
-import com.moengage.core.internal.LIB_VERSION
 import com.moengage.core.internal.logger.Logger
+import com.moengage.core.internal.utils.getSdkVersion
 import com.moengage.plugin.base.internal.PluginHelper
 import com.moengage.plugin.base.internal.setEventEmitter
 
@@ -21,6 +21,7 @@ class MoEReactBridge(private val reactContext: ReactApplicationContext) :
 
     private val context: Context = reactContext.applicationContext
     private val pluginHelper = PluginHelper()
+    private val moeSdkVersion = getSdkVersion()
 
     override fun getName(): String {
         return "MoEReactBridge"
@@ -151,7 +152,9 @@ class MoEReactBridge(private val reactContext: ReactApplicationContext) :
         try {
             Logger.print { "$tag initialize() : " }
             pluginHelper.initialise(payload)
-            setEventEmitter(EventEmitterImpl(reactContext))
+            val eventEmitterImpl = EventEmitterImpl(reactContext)
+            eventEmitterImpl.emitPendingEvents()
+            setEventEmitter(eventEmitterImpl)
         } catch (t: Throwable) {
             Logger.print(LogLevel.ERROR, t) { "$tag initialize() : " }
         }
@@ -179,7 +182,7 @@ class MoEReactBridge(private val reactContext: ReactApplicationContext) :
     @ReactMethod
     fun validateSdkVersion(promise: Promise) {
         Logger.print { "$tag validateSdkVersion() : Validating Version" }
-        if (LIB_VERSION > 13000) {
+        if (moeSdkVersion > 13000) {
             Logger.print(LogLevel.ERROR) { "$tag validateSdkVersion() : invalid version" }
             promise.reject("error", "Use SDK version 12.x.xx")
         } else {
@@ -254,4 +257,14 @@ class MoEReactBridge(private val reactContext: ReactApplicationContext) :
             Logger.print(LogLevel.ERROR, t) { "$tag permissionResponse() :" }
         }
     }
+
+    @ReactMethod
+    fun updatePushPermissionRequestCount(payload: String) {
+        try {
+            Logger.print { "$tag updatePushPermissionRequestCount() : Payload: $payload" }
+            pluginHelper.updatePushPermissionRequestCount(context, payload)
+        } catch (t: Throwable) {
+            Logger.print(LogLevel.ERROR, t) { "$tag updatePushPermissionRequestCount() :" }
+        }
+    }
 }

package/iOS/MoEReactBridge/MoEngageInitializer.m

@@ -9,6 +9,7 @@
 #import "MoEngageReactPluginInfo.h"
 #import "MoEngageReactConstants.h"
 #import "MoEReactBridge.h"
+#import "MoEngageReactUtils.h"
 #import <MoEngageSDK/MoEngageSDK.h>
 #import <MoEngageObjCUtils/MoEngageObjCUtils.h>
 @import MoEngagePluginBase;
@@ -100,19 +101,19 @@
         }
         
         if ([moeDict objectForKey:kDisablePeriodicFlush] != nil && [moeDict objectForKey:kDisablePeriodicFlush] != [NSNull null]) {
-            sdkConfig.analyticsDisablePeriodicFlush = [moeDict getBooleanForKey:kDisablePeriodicFlush];
+            sdkConfig.analyticsDisablePeriodicFlush = [MoEngageReactUtils getBooleanForKey:kDisablePeriodicFlush dict:moeDict];
         }
         
         if ([moeDict objectForKey:kPeriodicFlushDuration] != nil && [moeDict objectForKey:kPeriodicFlushDuration] != [NSNull null]) {
-            sdkConfig.analyticsPeriodicFlushDuration = [moeDict getIntegerForKey:kPeriodicFlushDuration];
+            sdkConfig.analyticsPeriodicFlushDuration = [MoEngageReactUtils getIntegerForKey:kPeriodicFlushDuration dict:moeDict];
         }
         
         if ([moeDict objectForKey:kEncryptNetworkRequests] != nil && [moeDict objectForKey:kEncryptNetworkRequests] != [NSNull null]) {
-            sdkConfig.encryptNetworkRequests = [moeDict getBooleanForKey:kDisablePeriodicFlush];
+            sdkConfig.encryptNetworkRequests = [MoEngageReactUtils getBooleanForKey:kEncryptNetworkRequests dict:moeDict];
         }
         
         if ([moeDict objectForKey:kEnableLogs] != nil && [moeDict objectForKey:kEnableLogs] != [NSNull null]) {
-            sdkConfig.enableLogs = [moeDict getBooleanForKey:kEnableLogs];
+            sdkConfig.enableLogs = [MoEngageReactUtils getBooleanForKey:kEnableLogs dict:moeDict];
         }
     }
     

package/iOS/MoEReactBridge/MoEngageReactUtils.h

@@ -0,0 +1,14 @@
+//
+//  MoEngageReactUtils.h
+//  Pods
+//
+//  Created by Rakshitha on 14/02/23.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface MoEngageReactUtils : NSObject
++(NSInteger)getIntegerForKey:(NSString *)key dict:(NSDictionary*)dict;
++(BOOL)getBooleanForKey:(NSString *)key dict:(NSDictionary*)dict;
+@end

package/iOS/MoEReactBridge/MoEngageReactUtils.m

@@ -0,0 +1,40 @@
+//
+//  MoEngageReactUtils.m
+//  CocoaAsyncSocket
+//
+//  Created by Rakshitha on 14/02/23.
+//
+
+#import <Foundation/Foundation.h>
+#import "MoEngageReactUtils.h"
+
+@implementation MoEngageReactUtils
++(NSInteger)getIntegerForKey:(NSString *)key dict:(NSDictionary*)dict {
+    
+    NSString *value = [self stringForkey:key dict:dict];
+    if (value == NULL) {
+        return -1;
+    }
+    return [value integerValue];
+}
+
++(NSString * __nullable)stringForkey:(NSString *)key dict:(NSDictionary*)dict {
+    if (key == NULL || key.length == 0) {
+        return NULL;
+    }
+    id value = [dict objectForKey:key];
+    if (value) {
+        return [NSString stringWithFormat:@"%@", value];
+    }
+    return NULL;
+}
+
++(BOOL)getBooleanForKey:(NSString *)key dict:(NSDictionary*)dict {
+    
+    NSString *value = [self stringForkey:key dict:dict];
+    if (value == NULL) {
+        return NO;
+    }
+    return [value boolValue];
+}
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-moengage",
-  "version": "8.2.0",
+  "version": "8.4.0",
   "description": "MoEngage is a mobile marketing automation company. This react-native SDK helps you track events, trigger smart notifications and in-apps, provides a drop-in Inbox Controller for notifications.",
   "main": "src/index.ts",
   "keywords": [

package/src/index.ts

@@ -24,7 +24,9 @@ import {
     getSdkStateJson,
     getSelfHandledJson,
     getUserAttributeJson,
-    getUserLocAttributeJson
+    getUserLocAttributeJson,
+    getPushPermissionRequestCountJson,
+    getDeviceIdTrackingJson
 } from "./utils/MoEJsonBuilder";
 import {
     USER_ATTRIBUTE_UNIQUE_ID,
@@ -751,6 +753,47 @@ var ReactMoE = {
     if (Platform.OS == PLATFORM_ANDROID) {
       MoERNAndroid.requestPushPermission();
     }
+  },
+
+  /**
+   * API to update push permission request count. The count will be incremented on every call.
+   * Note: This API is only for Android platform and is a no-operation method for other plaforms.
+   *
+   * @param {number} count - number of times push permission requested
+   */
+  updatePushPermissionRequestCountAndroid: function (count: number) {
+    console.log("Will increment push permission request count");
+    let payload = getPushPermissionRequestCountJson(count, moeAppId);
+
+    if (Platform.OS == PLATFORM_ANDROID) {
+      MoERNAndroid.updatePushPermissionRequestCount(payload);
+    }
+  },
+
+  /**
+   * API to enable Device Id tracking for Android.
+   *
+   * Note: By default Device Id tracking is enabled
+   */
+  enableDeviceIdTracking: function () {
+    console.log("Will enable device id tracking");
+    let payload = getDeviceIdTrackingJson(true, moeAppId);
+
+    if (Platform.OS == PLATFORM_ANDROID) {
+      MoERNAndroid.enableDeviceIdTracking(payload);
+    }
+  },
+
+  /**
+   * API to disable Device Id tracking for Android.
+   */
+  disableDeviceIdTracking: function () {
+    console.log("Will disable device id tracking");
+    let payload = getDeviceIdTrackingJson(false, moeAppId);
+
+    if (Platform.OS == PLATFORM_ANDROID) {
+      MoERNAndroid.disableDeviceIdTracking(payload);
+    }
   }
 
 };

package/src/platform/MoERNAndroid.ts

@@ -143,6 +143,18 @@ export class MoERNAndroid {
   static requestPushPermission() {
     MoEReactBridge.requestPushPermission();
   }
+
+  static updatePushPermissionRequestCount(payload: { [k: string]: any }) {
+    MoEReactBridge.updatePushPermissionRequestCount(JSON.stringify(payload));
+  }
+
+  static enableDeviceIdTracking(payload: { [k: string]: any }) {
+    MoEReactBridge.deviceIdentifierTrackingStatusUpdate(JSON.stringify(payload))
+  }
+
+  static disableDeviceIdTracking(payload: { [k: string]: any }) {
+    MoEReactBridge.deviceIdentifierTrackingStatusUpdate(JSON.stringify(payload))
+  }
 }
 
 const PUSH_SERVICE_FCM = "FCM"

package/src/utils/MoEJsonBuilder.ts

@@ -226,4 +226,28 @@ export function getPermissionResponseJson(isGranted: boolean, permissionType: Mo
         type: permissionType.toLowerCase()
     }
     return json;
+}
+
+export function getPushPermissionRequestCountJson(count: number, appId: String) {
+  var json: { [k: string]: any } = {
+    accountMeta: {
+      appId: appId
+    },
+    data: {
+      pushOptinInAttemptCount: count
+    }
+  }
+  return json;
+}
+
+export function getDeviceIdTrackingJson(isDeviceIdTrackingEnabled: Boolean, appId: String) {
+  var json: { [k: string]: any } = {
+    accountMeta: {
+      appId: appId
+    },
+    data: {
+      isDeviceIdTrackingEnabled: isDeviceIdTrackingEnabled
+    }
+  }
+  return json;
 }

package/iOS/MoEReactBridge.xcodeproj/xcuserdata/rakshitha.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
-   uuid = "A9D2CCE5-E1E4-46E2-8FD6-8A880E005343"
-   type = "1"
-   version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "B5C2799E-B498-4B55-9AB4-16D905914902"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "MoEReactBridge/MOReactInitializer.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "34"
-            endingLineNumber = "34"
-            landmarkName = "-intializeSDKWithLaunchOptions:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
-</Bucket>