react-native-moengage 7.1.0 → 7.4.0

package/CHANGELOG.md

@@ -1,8 +1,32 @@
-## 7.1.0
+# react-native-moengage
+---
+## Change Log:
+### 7.4.0
+Release Date: 12th May 2022
+- Bugfix iOS: Fixed the PushClick callback issue in terminated state, that was appearing when the react-native version is above 0.65.
+      
+### 7.3.0
+Release Date: 16th September 2021
+- HTML InApp Support Added.
+- Bugfix: 
+  - Handled `trackEvent()` with null properties.
+- iOS
+    - Native SDK version updated to `~>7.1.0`.
+    - Base plugin version dependency updated to `~>2.1.0`.
+- Android
+    - Native SDK updated to support version `11.4.00` and above.
+    - Bugfix:
+      - `enableSDKLogs()` not working on Android.
+      
+### 7.2.0
+Release Date: 11th May 2021
+- Android Multi-Instance Phase 1 update.
+
+### 7.1.0
 Release Date: 17th March 2021
 - Added support to pass Array(String/Number) as event attributes in addAttribute method of MoEProperties.
 
-## 7.0.0
+### 7.0.0
 Release Date: 25th February 2021
 - iOS 
     - Plugin now supports iOS 10.0 and above
@@ -15,44 +39,44 @@ Release Date: 25th February 2021
 - Added APIs to enable and disable MoEngage SDK.
 - Added API to register a callback for push token generated event.
 
-## 6.1.7
+### 6.1.7
 Release Date: 15th February 2021
 - Android artifacts use manven central instead of Jcenter.
   - Android Native SDK version `10.6.01`
   - Android Plugin Base `1.2.01`
 
-## 6.1.6
+### 6.1.6
 Release Date: 21st January 2021
 - BugFix iOS: Token registered event skipped as its currently not supported in React Native.
 
-## 6.1.5
+### 6.1.5
 Release Date: 18th January 2021
 - iOS Base Plugin dependency updated to support version `1.2` and above.
 
-## 6.1.4
+### 6.1.4
 Release Date: 7th December 2020
 - Support for extending Native Android Callbacks if required.
 - Native Android SDK version required is `10.5.00` or above.
 - iOS Base Plugin Updated to version `1.1.1` to ensure SDK sets the UNUserNotification Center delegate only in cases where its `nil`.
 
-## 6.1.3
+### 6.1.3
 Release Date: 25th November 2020
 - Android Base plugin dependency type updated to ensure compatability across gradle versions.
 
-## 6.1.2
+### 6.1.2
 Release Date: 23rd November 2020
 - Android Base Plugin Updated to enable Custom Callbacks.
 
-## 6.1.1
+### 6.1.1
 Release Date: 22nd October 2020
 - Bugfix
   - Events not being marked as non-interactive on Android
   
-## 6.1.0
+### 6.1.0
 Release Date: 23rd September, 2020
 - Support for Push Templates added 
 
- ## 6.0.0
+ ### 6.0.0
  Release Date: 7th August 2020
  -  Breaking change in Initialization of iOS platform, refer to the [developer docs](https://docs.moengage.com/docs/sdk-initialization-1#ios) to know more about the changes. 
   - Support for Self-Handled In-App
@@ -79,14 +103,14 @@ Release Date: 23rd September, 2020
 |    ReactMoE.passPushToken(string)    |    ReactMoE.passFcmPushToken(string)    |
 | ReactMoE.passPushPayload(JSONObject) | ReactMoE.passFcmPushPayload(JSONObject) |
  
- ## 5.0.0 
+ ### 5.0.0 
  Release Date: 18th Feb 2020
   - New Event Listeners added for both iOS and Android platforms i.e, `pushClicked`, `inAppCampaignShown` and `inAppCampaignShown`.
   - Earlier iOS Push and InApp Events deprecated to have it common for both Android and iOS (`notificationClicked`,`inAppShown` and `inAppClicked`)
   - APIs to pass push token and payload from React-Native Component/Javascript (Android Only API)
   - Fixing datatype conversion for user attributes long getting converted to double.
 
-## 4.1.0
+### 4.1.0
  Release Date: 23rd Dec 2019
  - Android SDK version updated to 9.8.01
  - integration_type and integration_version added for both Android and iOS

package/ReactNativeMoEngage.podspec

@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.platform            = :ios, "10.0"
   s.source_files        = 'iOS/MoEReactBridge/**/*.{h,m}'
   s.dependency          'React'
-  s.dependency          'MoEPluginBase','>= 2.0.2','< 2.1.0'
+  s.dependency          'MoEPluginBase','>= 2.3.0','< 2.4.0'
 
   s.prepare_command = <<-CMD
     echo // Generated file, do not edit > iOS/MoEReactBridge/MOReactPluginInfo.h

package/android/build.gradle

@@ -15,6 +15,7 @@ buildscript {
 rootProject.allprojects {
   repositories {
     google()
+    mavenLocal()
     mavenCentral()
     jcenter()
   }
@@ -22,8 +23,8 @@ rootProject.allprojects {
 
 ext {
   //dependency version
-  moengageVersion = "11.0.04"
-  basePluginVersion = "2.0.00"
+  moengageVersion = "11.4.00"
+  basePluginVersion = "2.2.0"
   //build versions
   minimumVersion = 16
   targetVersion = 29

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

@@ -196,6 +196,16 @@ class MoEReactBridge(reactContext: ReactApplicationContext) :
         }
     }
 
+    @ReactMethod
+    fun onOrientationChanged() {
+        try{
+            Logger.v("$tag onScreenOrientationChanged(): ")
+            pluginHelper.onConfigurationChanged()
+        }catch(e: Exception){
+            Logger.e("$tag onScreenOrientationChanged() : ", e)
+        }
+    }
+
 
     init {
         pluginHelper.setEventCallback(EventEmitterImpl(reactContext))

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

@@ -0,0 +1,36 @@
+package com.moengage.react
+
+import com.moengage.core.internal.inapp.InAppManager
+import com.moengage.core.internal.logger.Logger
+import com.moengage.inapp.MoEInAppHelper
+
+/**
+ * @author Umang Chamaria
+ * Date: 2021/08/18
+ */
+public class MoEReactHelper {
+
+    private val tag = "${MODULE_TAG}MoEReactHelper"
+
+    public fun onConfigurationChanged() {
+        if (!InAppManager.getInstance().hasModule()){
+            Logger.v("$tag onConfigurationChanged(): InApp Module not present.")
+            return
+        }
+        MoEInAppHelper.getInstance().onConfigurationChanged()
+    }
+
+    public companion object {
+
+        private var instance: MoEReactHelper? = null
+
+        @JvmStatic
+        public fun getInstance(): MoEReactHelper {
+            return instance ?: synchronized(MoEReactHelper::class.java) {
+                val inst = instance ?: MoEReactHelper()
+                instance = inst
+                inst
+            }
+        }
+    }
+}

package/iOS/MoEReactBridge/MOReactInitializer.m

@@ -10,6 +10,7 @@
 #import <MoEngage/MoEngage.h>
 #import <MoEPluginBase/MoEPluginBase.h>
 #import "MoEReactConstants.h"
+#import "MoEReactBridge.h"
 
 @interface MOReactInitializer() <MoEPluginBridgeDelegate>
 
@@ -43,7 +44,6 @@
 }
 
 - (void)intializeSDKWithConfig:(MOSDKConfig*)sdkConfig withSDKState:(BOOL)isSdkEnabled andLaunchOptions:(NSDictionary*)launchOptions{
-    [[MoEPluginBridge sharedInstance] trackPluginVersion:MO_REACT_PLUGIN_VERSION forIntegrationType:ReactNative];
     [MoEPluginBridge sharedInstance].bridgeDelegate = self;
   
     if (sdkConfig.moeAppID == nil || sdkConfig == nil) {
@@ -53,7 +53,7 @@
     sdkConfig.pluginIntegrationType = REACT_NATIVE;
     sdkConfig.pluginIntegrationVersion = MO_REACT_PLUGIN_VERSION;
     
-    [[MoEPluginInitializer sharedInstance] intializeSDKWithConfig:sdkConfig withSDKState:isSdkEnabled andLaunchOptions:launchOptions];
+    [[MoEPluginInitializer sharedInstance] initializeSDKWithConfig:sdkConfig withSDKState:isSdkEnabled andLaunchOptions:launchOptions];
 }
 
 -(MOSDKConfig*)fetchSDKConfig {
@@ -164,9 +164,8 @@
     }
     
     NSDictionary* userInfo = @{kEventName:name,kPayloadDict:updatedDict};
-    [[NSNotificationCenter defaultCenter] postNotificationName:kEventEmitted
-                                                        object:self
-                                                      userInfo:userInfo];
+    MoEReactBridge *reactBridge = [MoEReactBridge allocWithZone: nil];
+    [reactBridge sendEventWithName:userInfo];
 
 }
 

package/iOS/MoEReactBridge/MOReactPluginInfo.h

@@ -1,2 +1,2 @@
 // Generated file, do not edit
-#define MO_REACT_PLUGIN_VERSION @"7.0.0"
+#define MO_REACT_PLUGIN_VERSION @"7.3.0"

package/iOS/MoEReactBridge/MoEReactBridge.h

@@ -11,5 +11,5 @@
 #import <React/RCTEventEmitter.h>
 
 @interface MoEReactBridge : RCTEventEmitter <RCTBridgeModule>
-
+-(void)sendEventWithName:(NSDictionary *)payloadDict;
 @end

package/iOS/MoEReactBridge/MoEReactBridge.m

@@ -16,38 +16,78 @@
 #import "MoEReactConstants.h"
 
 @interface MoEReactBridge()
-
 @end
 
 @implementation MoEReactBridge
 
+{
+  bool hasListeners;
+  NSMutableArray *delayedEvents;
+}
+
+- (instancetype)init
+{
+    if (self = [super init]) {
+        if (delayedEvents == nil)
+            delayedEvents = [NSMutableArray array];
+    }
+    return self;
+}
+
++ (id)allocWithZone:(NSZone *)zone {
+    static MoEReactBridge *sharedInstance = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sharedInstance = [super allocWithZone:zone];
+    });
+    return sharedInstance;
+}
+
++ (BOOL)requiresMainQueueSetup {
+    return true;
+}
+
 #pragma mark- Observers
 // Will be called when this module's first listener is added.
 -(void)startObserving {
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(emitEventInternal:)
-                                                 name:kEventEmitted
-                                               object:nil];
+    hasListeners = YES;
+    [self flushDelayedEvents];
+
 }
 
 // Will be called when this module's last listener is removed, or on dealloc.
 -(void)stopObserving {
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:kEventEmitted object:nil];
+    hasListeners = NO;
 }
 
--(void)emitEventInternal:(NSNotification *)notification
-{
-    NSDictionary* userInfo = notification.userInfo;
-    if (userInfo) {
-        NSString* name = userInfo[kEventName];
-        NSDictionary* payload = userInfo[kPayloadDict];
+-(void)flushDelayedEvents{
+    if (delayedEvents.count > 0){
+        for (NSDictionary* payloadDict in delayedEvents){
+            [self emitEvent:payloadDict];
+        }
+    }
+    
+    [delayedEvents removeAllObjects];
+}
+
+-(void)sendEventWithName:(NSDictionary *)payloadDict{
+    if (hasListeners) {
+        [self emitEvent:payloadDict];
+    } else {
+        [delayedEvents addObject:payloadDict];
+    }
+}
+
+-(void)emitEvent:(NSDictionary*)payloadDict{
+    if (payloadDict){
+        NSString* name = payloadDict[kEventName];
+        NSDictionary* payload = payloadDict[kPayloadDict];
         if (name != nil && payload != nil) {
             [self sendEventWithName:name body:payload];
         }
     }
 }
 
-
 #pragma mark- Event Emitters
 - (NSArray<NSString *> *)supportedEvents
 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-moengage",
-  "version": "7.1.0",
+  "version": "7.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

@@ -130,11 +130,17 @@ var ReactMoE = {
    */
   trackEvent: function (eventName: String, properties: MoEProperties) {
     commonValidationCheck();
-    console.log("trackEvent with properties", properties);
+    
+    if(properties == null) {
+      properties = new MoEProperties()
+    }
+   
     if (!(properties instanceof MoEProperties)) {
       showError("trackEvent: properties must of MoEProperties type");
       return;
     }
+
+    console.log("trackEvent with properties", properties);
     //...(spread operator)it will append all the contents of the object/array into the target element
     let payload = {
       ...properties.toJSON(),
@@ -702,6 +708,13 @@ var ReactMoE = {
     } else if (Platform.OS == PLATFORM_IOS) {
       MoERNiOS.updateSdkState(false);
     }
+  },
+
+  onOrientationChanged: function() {
+    console.log("Will process screen rotation.")
+    if(Platform.OS == PLATFORM_ANDROID) {
+      MoERNAndroid.onOrientationChanged()
+    }
   }
 };
 

package/src/models/MoEInAppCampaign.ts

@@ -6,6 +6,7 @@ import { isValidObject } from "../utils/MoEHelper";
 export default class MoEInAppCampaign {
   campaignId: String;
   campaignName: String;
+  campaignContext: Map<String, Object>;
   customAction: MoEInAppCustomAction;
   selfHandled: MoEInAppSelfHandledCampaign;
   navigation: MoEInAppNavigation;
@@ -15,6 +16,7 @@ export default class MoEInAppCampaign {
     if (isValidObject(campaign)) {
       this.campaignId = campaign["campaignId"];
       this.campaignName = campaign["campaignName"];
+      this.campaignContext = campaign["campaignContext"];
       this.platform = campaign["platform"];
       this.customAction = new MoEInAppCustomAction(campaign["customAction"]);
       this.selfHandled = new MoEInAppSelfHandledCampaign(
@@ -28,6 +30,7 @@ export default class MoEInAppCampaign {
     var json = {
       campaignId: this.campaignId,
       campaignName: this.campaignName,
+      campaignContext: this.campaignContext,
     };
     if (isValidObject(this.customAction)) {
       json["customAction"] = this.customAction.toJSON();

package/src/platform/MoERNAndroid.ts

@@ -90,7 +90,7 @@ export class MoERNAndroid {
   }
 
   static enableSDKLogs() {
-    MoEReactBridge.enableSDKLogs();
+    MoEReactBridge.enableLogs();
   }
 
   static optOutDataTracking(shouldOptOutDataTracking: boolean){
@@ -141,6 +141,10 @@ export class MoERNAndroid {
     };
     MoEReactBridge.updateSdkState(JSON.stringify(payload));
   }
+
+  static onOrientationChanged() {
+    MoEReactBridge.onOrientationChanged()
+  }
 }
 
 const PUSH_SERVICE_FCM = "FCM"