react-native-moengage 7.4.1 → 8.1.0

package/CHANGELOG.md

@@ -1,6 +1,77 @@
-## Changelog:
+# 28-10-2022
+
+## 8.1.0
+- Android
+  - AGP version updated to `7.3.1`
+  - Gradle version updated to `7.4`
+  - Target SDK version - 31
+  - Compile SDK Version - 31
+  - Support for Android SDK version `12.4.00`
+  - InApp `6.4.0`
+
+- iOS
+    - Deprecated API
+
+| Then                                                                                                                                     | Now                                                                                                                                                        |
+|:----------------------------------------------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------------------------------------------------------:|
+| - (void)initializeDefaultInstance:(BOOL)isSdkEnabled andLaunchOptions:(NSDictionary*)launchOptions                                       | - (void)initializeDefaultInstanceWithState:(MoEngageSDKState)sdkState andLaunchOptions:(NSDictionary*)launchOptions;                                       |
+| - (void)initializeDefaultSDKConfig:(MOSDKConfig*)sdkConfig withSDKState:(BOOL)isSdkEnabled andLaunchOptions:(NSDictionary*)launchOptions | - (void)initializeDefaultSDKConfigWithState:(MOSDKConfig*)sdkConfig withSDKState:(MoEngageSDKState)sdkState andLaunchOptions:(NSDictionary*)launchOptions; |
+
+## 27-10-2022
+
+### 8.0.0
+- Support for Android SDK version `12.3.02` and above.
+- Support for iOS SDK version `8.3.1` and above.
+- TS Lint warnings resolved.
+- Breaking Changes
+  - InApp Model `MoEInAppCampaign` broken down from a single object to multiple objects
+    - `MoEInAppData`
+    - `MoEClickData`
+    - `MoESelfHandledCampaignData`
+  - Push Models
+    - `MoEPushCampaign` --> `MoEPushPayload`
+  - Breaking APIs in Javascript
+
+| Then         | Now               |
+|:------------:|:-----------------:|
+| initialize() | initialize(appId) |
+
+- Removed APIs
+
+| Removed APIs                |
+|:---------------------------:|
+| selfHandledPrimaryClicked() |
+| enableSDKLogs()             |
+| optOutInAppNotification()   |
+| optOutPushNotification()    |
+
+- Android 
+  - Build Configuration Updates
+    - Minimum SDK version - 21
+    - Target SDK version - 30
+    - Compile SDK Version - 30
+  - Mi SDK update to Version 5.x.x, refer to the [Configuring Xiaomi Push](https://developers.moengage.com/hc/en-us/articles/4403466194708) and update the integration.
+  - Deprecated APIs
+
+| Then                                                           | Now                                                                           |
+|:--------------------------------------------------------------:|:-----------------------------------------------------------------------------:|
+| MoEInitializer.initialize(Context, MoEngage.Builder)           | MoEInitializer.initializeDefaultInstance(Context, MoEngage.Builder)           |
+| MoEInitializer.initialize(Context, MoEngage.Builder, SdkState) | MoEInitializer.initializeDefaultInstance(Context, MoEngage.Builder, SdkState) |
+
+- iOS
+    - `MOReactInitializer` renamed to `MoEngageInitializer`
+    - Deprecated APIs
+
+| Then                                                                                                                                  | Now                                                                                                                                       |
+|:-------------------------------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------------------------:|
+| - (void)intializeSDKWithLaunchOptions:(NSDictionary*)launchOptions;                                                                   | - (void)initializeDefaultInstance:(NSDictionary*)launchOptions;                                                                           |
+| - (void)intializeSDKWithState:(BOOL)isSdkEnabled andLaunchOptions:(NSDictionary*)launchOptions;                                       | - (void)initializeDefaultInstance:(BOOL)isSdkEnabled andLaunchOptions:(NSDictionary*)launchOptions;                                       |
+| - (void)intializeSDKWithConfig:(MOSDKConfig*)sdkConfig andLaunchOptions:(NSDictionary*)launchOptions;                                 | - (void)initializeDefaultSDKConfig:(MOSDKConfig*)sdkConfig andLaunchOptions:(NSDictionary*)launchOptions;                                 |
+| - (void)intializeSDKWithConfig:(MOSDKConfig*)sdkConfig withSDKState:(BOOL)isSdkEnabled andLaunchOptions:(NSDictionary*)launchOptions; | - (void)initializeDefaultSDKConfig:(MOSDKConfig*)sdkConfig withSDKState:(BOOL)isSdkEnabled andLaunchOptions:(NSDictionary*)launchOptions; |
+
 
 ### 7.4.1
+Release Date: 15th July 2022
 - Device identifier tracking update as per Google's User data policy. Advertising Id is only tracked after user consent.
 
 ### 7.4.0

package/ReactNativeMoEngage.podspec

@@ -15,10 +15,10 @@ Pod::Spec.new do |s|
   s.platform            = :ios, "10.0"
   s.source_files        = 'iOS/MoEReactBridge/**/*.{h,m}'
   s.dependency          'React'
-  s.dependency          'MoEPluginBase','>= 2.3.0','< 2.4.0'
+  s.dependency          'MoEngagePluginBase','>= 3.1.0','< 3.2.0'
 
   s.prepare_command = <<-CMD
-    echo // Generated file, do not edit > iOS/MoEReactBridge/MOReactPluginInfo.h
-    echo "#define MO_REACT_PLUGIN_VERSION @\\"#{package["version"]}\\"" >> iOS/MoEReactBridge/MOReactPluginInfo.h
+    echo // Generated file, do not edit > iOS/MoEReactBridge/MoEngageReactPluginInfo.h
+    echo "#define MOE_REACT_PLUGIN_VERSION @\\"#{package["version"]}\\"" >> iOS/MoEReactBridge/MoEngageReactPluginInfo.h
   CMD
 end

package/android/build.gradle

@@ -1,13 +1,12 @@
 buildscript {
-  ext.kotlinVersion = '1.4.20'
+  ext.kotlinVersion = '1.6.0'
   repositories {
     google()
     mavenCentral()
-    jcenter()
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.1.2'
+    classpath 'com.android.tools.build:gradle:7.3.1'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
   }
 }
@@ -15,20 +14,19 @@ buildscript {
 rootProject.allprojects {
   repositories {
     google()
-    mavenLocal()
     mavenCentral()
-    jcenter()
   }
 }
 
 ext {
   //dependency version
-  moengageVersion = "11.6.02"
-  basePluginVersion = "2.2.2"
+  moengageCoreVersion = "12.4.00"
+  moengageInAppVersion = "6.4.0"
+  basePluginVersion = "3.1.0"
   //build versions
-  minimumVersion = 16
-  targetVersion = 29
-  compileVersion = 29
+  minimumVersion = 21
+  targetVersion = 31
+  compileVersion = 31
 }
 
 apply plugin: 'com.android.library'
@@ -66,9 +64,10 @@ dependencies {
   implementation fileTree(include: ['*.jar'], dir: 'libs')
 
   implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
-
-  compileOnly ("com.moengage:moe-android-sdk:$moengageVersion")
+  
+  compileOnly ("com.moengage:moe-android-sdk:$moengageCoreVersion")
   api("com.moengage:plugin-base:$basePluginVersion")
+  compileOnly("com.moengage:inapp:$moengageInAppVersion")
 
   compileOnly 'com.facebook.react:react-native:+'
 

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Jan 31 18:33:58 IST 2021
+#Thu Aug 18 13:23:11 IST 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+zipStoreBase=GRADLE_USER_HOME

package/android/gradle.properties

@@ -1,2 +1 @@
-android.enableJetifier=true
 android.useAndroidX=true

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

@@ -3,9 +3,17 @@ package com.moengage.react
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
+import com.moengage.core.LogLevel
 import com.moengage.core.internal.logger.Logger
-import com.moengage.plugin.base.EventEmitter
-import com.moengage.plugin.base.model.*
+import com.moengage.plugin.base.internal.EventEmitter
+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
+import com.moengage.plugin.base.internal.model.events.inapp.InAppLifecycleEvent
+import com.moengage.plugin.base.internal.model.events.inapp.InAppSelfHandledEvent
+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
 
 
 /**
@@ -17,35 +25,54 @@ class EventEmitterImpl(private val reactContext: ReactContext) : EventEmitter {
 
     override fun emit(event: Event) {
         try {
-            Logger.v("$tag emit() : $event")
-            when(event){
-                is InAppEvent -> emitInAppEvent(event)
-                is PushEvent -> emitPushEvent(event)
-                is TokenEvent -> emitPushToken(event)
+            Logger.print { "$tag emit() : $event" }
+            when (event.eventType) {
+                EventType.PUSH_CLICKED -> emitPushClicked(event as PushClickedEvent)
+                EventType.PUSH_TOKEN_GENERATED -> emitPushToken(event as TokenEvent)
+                EventType.INAPP_CLOSED, EventType.INAPP_SHOWN -> emitInAppLifecycle(event as InAppLifecycleEvent)
+                EventType.INAPP_CUSTOM_ACTION, EventType.INAPP_NAVIGATION -> emitInAppAction(
+                    event as InAppActionEvent
+                )
+                EventType.INAPP_SELF_HANDLED_AVAILABLE -> emitInAppSelfHandled(event as InAppSelfHandledEvent)
+                EventType.PERMISSION -> emitPermissionResult(event as PermissionEvent)
             }
-        } catch (e: Exception) {
-            Logger.e("$tag emit() : ", e)
+        } catch (t: Throwable) {
+            Logger.print(LogLevel.ERROR, t) { "$tag emit() : " }
         }
     }
 
-    private fun emitInAppEvent(inAppEvent: InAppEvent){
-        Logger.v("$tag emitInAppEvent() : Event $inAppEvent")
-        val eventName = eventMapping[inAppEvent.eventType] ?: return
-        val payload = PayloadGenerator().inAppCampaignToWriteableMap(inAppEvent.inAppCampaign)
+    private fun emitInAppAction(event: InAppActionEvent) {
+        Logger.print { "$tag emitInAppNavigation() : $event" }
+        val eventName = eventMapping[event.eventType] ?: return
+        val payload = PayloadGenerator().inAppNavigationToWriteableMap(event.clickData)
         emit(eventName, payload)
     }
 
-    private fun emitPushEvent(pushEvent: PushEvent){
-        Logger.v("$tag emitPushEvent() : Event $pushEvent")
-        val eventName = eventMapping[pushEvent.eventType] ?: return
-        val payload = PayloadGenerator().pushPayloadToWriteableMap(pushEvent.payload)
+    private fun emitInAppLifecycle(event: InAppLifecycleEvent) {
+        Logger.print { "$tag emitInAppLifecycle() : $event" }
+        val eventName = eventMapping[event.eventType] ?: return
+        val payload = PayloadGenerator().inAppDataToWriteableMap(event.inAppData)
+        emit(eventName, payload)
+    }
+
+    private fun emitInAppSelfHandled(event: InAppSelfHandledEvent) {
+        Logger.print { "$tag emitInAppSelfHandled() : $event" }
+        val eventName = eventMapping[event.eventType] ?: return
+        val payload = PayloadGenerator().selfHandledDataToWriteableMap(event.data)
+        emit(eventName, payload)
+    }
+
+    private fun emitPushClicked(event: PushClickedEvent) {
+        Logger.print { "$tag emitPushClicked() : $event" }
+        val eventName = eventMapping[event.eventType] ?: return
+        val payload = PayloadGenerator().pushPayloadToWriteableMap(event.payload)
         emit(eventName, payload)
     }
 
     private fun emitPushToken(tokenEvent: TokenEvent) {
-        Logger.v("$tag emitPushToken() : Event $tokenEvent")
+        Logger.print { "$tag emitPushToken() : $tokenEvent" }
         val eventName = eventMapping[tokenEvent.eventType] ?: return
-        val payload = PayloadGenerator().tokenToWriteableMap(tokenEvent.pushToken)
+        val payload = PayloadGenerator().tokenToWriteableMap(tokenEvent)
         emit(eventName, payload)
     }
 
@@ -53,10 +80,17 @@ class EventEmitterImpl(private val reactContext: ReactContext) : EventEmitter {
         try {
             reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
                 .emit(eventName, params)
-        } catch (e: Exception) {
-            Logger.e("$tag emit() : ", e)
+        } catch (t: Throwable) {
+            Logger.print(LogLevel.ERROR, t) { "$tag emit() : " }
         }
     }
+
+    private fun emitPermissionResult(event: PermissionEvent) {
+        Logger.print { "$tag emitPermissionResult() : Event $event" }
+        val eventName = eventMapping[event.eventType] ?: return
+        val payload = PayloadGenerator().permissionResultToWriteableMap(event.result)
+        emit(eventName, payload)
+    }
 }
 
 val eventMapping = mapOf<EventType, String>(
@@ -66,5 +100,6 @@ val eventMapping = mapOf<EventType, String>(
     EventType.INAPP_CLOSED to "MoEInAppCampaignDismissed",
     EventType.INAPP_CUSTOM_ACTION to "MoEInAppCampaignCustomAction",
     EventType.INAPP_SELF_HANDLED_AVAILABLE to "MoEInAppCampaignSelfHandled",
-    EventType.PUSH_TOKEN_GENERATED to "MoEPushTokenGenerated"
+    EventType.PUSH_TOKEN_GENERATED to "MoEPushTokenGenerated",
+    EventType.PERMISSION to "MoEPermissionResult"
 )

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

@@ -1,10 +1,12 @@
 package com.moengage.react
 
 import android.content.Context
+import com.moengage.core.LogLevel
 import com.moengage.core.MoEngage
 import com.moengage.core.internal.logger.Logger
 import com.moengage.core.internal.model.IntegrationMeta
-import com.moengage.plugin.base.PluginInitializer.initialize
+import com.moengage.core.model.SdkState
+import com.moengage.plugin.base.internal.PluginInitializer
 
 
 /**
@@ -14,26 +16,55 @@ import com.moengage.plugin.base.PluginInitializer.initialize
 object MoEInitializer {
     private const val tag = "${MODULE_TAG}MoEInitializer"
 
+    @Deprecated(
+        "",
+        level = DeprecationLevel.WARNING,
+        replaceWith = ReplaceWith(
+            "initializeDefaultInstance(context, builder)",
+            "com.moengage.react.MoEInitializer.initializeDefaultInstance"
+        )
+    )
     fun initialize(context: Context, builder: MoEngage.Builder) {
+        initializeDefaultInstance(context, builder)
+    }
+
+    @Deprecated(
+        "",
+        level = DeprecationLevel.WARNING,
+        replaceWith = ReplaceWith(
+            "initializeDefaultInstance(context, builder, sdkState)",
+            "com.moengage.react.MoEInitializer.initializeDefaultInstance"
+        )
+    )
+    fun initialize(context: Context, builder: MoEngage.Builder, sdkState: SdkState) {
+        initializeDefaultInstance(context, builder, sdkState)
+    }
+
+    fun initializeDefaultInstance(context: Context, builder: MoEngage.Builder) {
         try {
-            Logger.v("$tag initialize() : Will try to initialize the sdk.")
-            initialize(context, builder, true)
-        } catch (e: Exception) {
-            Logger.e("$tag initialize() : ", e)
+            Logger.print { "$tag initialize() : Will try to initialize the sdk." }
+            PluginInitializer.initialize(
+                builder,
+                IntegrationMeta(INTEGRATION_TYPE, BuildConfig.MOENGAGE_REACT_LIBRARY_VERSION)
+            )
+        } catch (t: Throwable) {
+            Logger.print(LogLevel.ERROR, t) { "$tag initialize() : " }
         }
     }
 
-    fun initialize(context: Context, builder: MoEngage.Builder, isSdkEnabled: Boolean) {
+    fun initializeDefaultInstance(context: Context, builder: MoEngage.Builder, sdkState: SdkState) {
         try {
-            Logger.v("$tag initialize() : Initialising MoEngage SDK.")
-            initialize(
-                context, builder,
+            Logger.print { "$tag initialize() : Initialising MoEngage SDK." }
+            PluginInitializer.initialize(
+                builder,
                 IntegrationMeta(INTEGRATION_TYPE, BuildConfig.MOENGAGE_REACT_LIBRARY_VERSION),
-                isSdkEnabled
+                sdkState
             )
-            Logger.v("$tag initialize() : Initialising MoEngage SDK.")
-        } catch (e: Exception) {
-            Logger.e("$tag initialize() : ", e)
+            Logger.print { "$tag initialize() : " }
+        } catch (t: Throwable) {
+            Logger.print(LogLevel.ERROR, t) { "$tag initialize() : " }
         }
     }
+
+
 }