react-native-moengage 8.4.0 → 8.5.1

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+# 18-07-2023
+
+## 8.5.1
+- Adding Strict TypeCheck For TypeScript files
+- Support for configuring the React-Native Plugin console logs
+
+# 25-05-2023
+
+## 8.5.0
+- Android
+  - Support for handling Foreground Push Notification Click
+  - Target & Compile SDK version updated to 33
+  - BugFix
+    - Self handled InApps Callback fix in Event Triggered Campaign
+- iOS
+    - MoEngage-iOS-SDK version updated to `~>9.8.0`.
+
 # 16-02-2023
 
 ## 8.4.0

package/ReactNativeMoEngage.podspec

@@ -12,11 +12,11 @@ Pod::Spec.new do |s|
   s.license             = package['license']
   s.authors             = "MoEngage Inc."
   s.source              = {:file => './' }
-  s.platform            = :ios, "10.0"
+  s.platform            = :ios, "11.0"
   s.source_files        = 'iOS/MoEReactBridge/**/*.{h,m}'
   s.dependency          'React'
-  s.dependency          'MoEngagePluginBase','>= 4.1.0','< 4.2.0'
-  s.dependency  	'MoEngageRichNotification','>= 7.4.0','< 7.5.0'
+  s.dependency          'MoEngagePluginBase','>= 4.2.0','< 4.3.0'
+  s.dependency  	'MoEngageRichNotification','>= 7.8.0','< 7.9.0'
 
   s.prepare_command = <<-CMD
     echo // Generated file, do not edit > iOS/MoEReactBridge/MoEngageReactPluginInfo.h

package/android/build.gradle

@@ -20,13 +20,13 @@ rootProject.allprojects {
 
 ext {
   //dependency version
-  moengageCoreVersion = "12.6.00"
-  moengageInAppVersion = "6.5.0"
-  basePluginVersion = "3.2.0"
+  moengageCoreVersion = "12.8.00"
+  moengageInAppVersion = "6.7.0"
+  basePluginVersion = "3.3.1"
   //build versions
   minimumVersion = 21
-  targetVersion = 31
-  compileVersion = 31
+  targetVersion = 33
+  compileVersion = 33
 }
 
 apply plugin: 'com.android.library'

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

@@ -1,13 +1,16 @@
 package com.moengage.react
 
+import android.os.Bundle
 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.moe.pushlibrary.activities.MoEActivity
 import com.moengage.core.LogLevel
+import com.moengage.core.PUSH_NOTIFICATION_NAVIGATION_ACTIVITY_NAME
+import com.moengage.core.PUSH_NOTIFICATION_NAVIGATION_DEEPLINK_LEGACY
 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
@@ -16,7 +19,10 @@ 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
+import com.moengage.pushbase.NAVIGATION_TYPE_RICH_LANDING
+import com.moengage.pushbase.NAVIGATION_TYPE_SCREEN_NAME
+import com.moengage.pushbase.NAV_ACTION
+import com.moengage.pushbase.model.action.NavigationAction
 
 
 /**
@@ -69,13 +75,6 @@ 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)
     }
 
@@ -101,16 +100,6 @@ 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

@@ -1,25 +1,7 @@
 package com.moengage.react
 
-import com.facebook.react.bridge.WritableMap
-
 object GlobalCache {
 
-    var lifecycleAwarePushCallbackEnabled = false
+    var lifecycleAwareCallbackEnabled = 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

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

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

@@ -6,8 +6,10 @@ 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.MoECoreHelper
 import com.moengage.core.internal.logger.Logger
 import com.moengage.core.internal.utils.getSdkVersion
+import com.moengage.core.listeners.AppBackgroundListener
 import com.moengage.plugin.base.internal.PluginHelper
 import com.moengage.plugin.base.internal.setEventEmitter
 
@@ -23,17 +25,20 @@ class MoEReactBridge(private val reactContext: ReactApplicationContext) :
     private val pluginHelper = PluginHelper()
     private val moeSdkVersion = getSdkVersion()
 
+    private val backgroundStateListener =
+        AppBackgroundListener { _, _ -> pluginHelper.onFrameworkDetached() }
+
     override fun getName(): String {
         return "MoEReactBridge"
     }
 
     @ReactMethod
-    fun addListener(eventName:String) {
+    fun addListener(eventName: String) {
         // Keep: Required for RN built in Event Emitter Calls.
-     }
+    }
 
     @ReactMethod
-    fun removeListeners(count:Int) { 
+    fun removeListeners(count: Int) {
         // Keep: Required for RN built in Event Emitter Calls.
     }
 
@@ -152,9 +157,10 @@ class MoEReactBridge(private val reactContext: ReactApplicationContext) :
         try {
             Logger.print { "$tag initialize() : " }
             pluginHelper.initialise(payload)
-            val eventEmitterImpl = EventEmitterImpl(reactContext)
-            eventEmitterImpl.emitPendingEvents()
-            setEventEmitter(eventEmitterImpl)
+            setEventEmitter(EventEmitterImpl(reactContext))
+            if (GlobalCache.lifecycleAwareCallbackEnabled) {
+                MoECoreHelper.addAppBackgroundListener(backgroundStateListener)
+            }
         } catch (t: Throwable) {
             Logger.print(LogLevel.ERROR, t) { "$tag initialize() : " }
         }

package/iOS/MoEReactBridge/MoEngageInitializer.m

@@ -38,7 +38,7 @@
 - (void)initializeDefaultSDKConfig:(MoEngageSDKConfig*)sdkConfig andLaunchOptions:(NSDictionary*)launchOptions{
     MoEngagePlugin *plugin = [[MoEngagePlugin alloc] init];
     [plugin initializeDefaultInstanceWithSdkConfig:sdkConfig launchOptions:launchOptions];
-    [self commonSetUp:plugin identifier:sdkConfig.identifier];
+    [self commonSetUp:plugin identifier:sdkConfig.appId];
 }
 
 - (void)initializeDefaultInstance:(BOOL)isSdkEnabled andLaunchOptions:(NSDictionary*)launchOptions{
@@ -61,7 +61,7 @@
     
     MoEngagePlugin *plugin = [[MoEngagePlugin alloc] init];
     [plugin initializeDefaultInstanceWithSdkConfig:sdkConfig sdkState:sdkState launchOptions:launchOptions];
-    [self commonSetUp: plugin identifier:sdkConfig.identifier];
+    [self commonSetUp: plugin identifier:sdkConfig.appId];
 }
 
 #pragma mark- Utils
@@ -108,10 +108,6 @@
             sdkConfig.analyticsPeriodicFlushDuration = [MoEngageReactUtils getIntegerForKey:kPeriodicFlushDuration dict:moeDict];
         }
         
-        if ([moeDict objectForKey:kEncryptNetworkRequests] != nil && [moeDict objectForKey:kEncryptNetworkRequests] != [NSNull null]) {
-            sdkConfig.encryptNetworkRequests = [MoEngageReactUtils getBooleanForKey:kEncryptNetworkRequests dict:moeDict];
-        }
-        
         if ([moeDict objectForKey:kEnableLogs] != nil && [moeDict objectForKey:kEnableLogs] != [NSNull null]) {
             sdkConfig.enableLogs = [MoEngageReactUtils getBooleanForKey:kEnableLogs dict:moeDict];
         }
@@ -137,6 +133,9 @@
     } else if ([stringVal isEqual: kDataCenter4])
     {
         dataCenter = MoEngageDataCenterData_center_04;
+    } else if ([stringVal isEqual: kDataCenter5])
+    {
+        dataCenter = MoEngageDataCenterData_center_05;
     }
     else
     {

package/iOS/MoEReactBridge/MoEngageReactConstants.h

@@ -28,6 +28,7 @@ extern NSString* const kDataCenter1;
 extern NSString* const kDataCenter2;
 extern NSString* const kDataCenter3;
 extern NSString* const kDataCenter4;
+extern NSString* const kDataCenter5;
 
 
 //PayLoad Constants

package/iOS/MoEReactBridge/MoEngageReactConstants.m

@@ -25,6 +25,7 @@ NSString* const kDataCenter1                              = @"DATA_CENTER_01";
 NSString* const kDataCenter2                              = @"DATA_CENTER_02";
 NSString* const kDataCenter3                              = @"DATA_CENTER_03";
 NSString* const kDataCenter4                              = @"DATA_CENTER_04";
+NSString* const kDataCenter5                              = @"DATA_CENTER_05";
 
 
 //PayLoad Constants

package/package.json

@@ -1,8 +1,19 @@
 {
   "name": "react-native-moengage",
-  "version": "8.4.0",
+  "version": "8.5.1",
   "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",
+  "files": [
+    "android",
+    "iOS",
+    "src",
+    "CHANGELOG.md",
+    "README.md",
+    "ReactNativeMoEngage.podspec",
+    "package.json",
+    "!**/__tests__",
+    "!**/__mocks__"
+  ],
   "keywords": [
     "moengage",
     "push-notification",
@@ -23,4 +34,4 @@
   "devDependencies": {
     "@types/react-native": "^0.69.3"
   }
-}
+}