react-native-netmera 2.0.0-alpha02 → 2.0.0-alpha04

package/README.md

@@ -173,8 +173,8 @@ RNNetmera.initNetmera()
 
    ```
    // For receiving Media Push, you must add Netmera pods to top of your Podfile.
-   pod 'NetmeraNotificationServiceExtension', "4.15.0"
-   pod "NetmeraNotificationContentExtension", "4.15.0"
+   pod 'NetmeraNotificationServiceExtension', "4.17.0"
+   pod "NetmeraNotificationContentExtension", "4.17.0"
    ```
 
 7. In order to use the widget URL callback, add these lines into `AppDelegate.swift` file.
@@ -191,12 +191,12 @@ import NetmeraNotification
 ...
 
 extension AppDelegate: NetmeraPushDelegate {
-  func shouldHandleOpenURL(_ url: URL, for pushObject: NetmeraNotificationCore.NetmeraBasePush) -> Bool {
-    return false
+  func urlOpeningDecision(for url: URL, push: NetmeraNotificationCore.NetmeraBasePush) -> PushDelegateDecision {
+    return .sdkHandles
   }
 
-  func handleOpenURL(_ url: URL, for pushObject: NetmeraNotificationCore.NetmeraBasePush) {
-    RNNetmeraRCTEventEmitter.handleOpenURL(url, forPushObject: pushObject)
+  func openURL(_ url: URL, for push: NetmeraNotificationCore.NetmeraBasePush) {
+    RNNetmeraRCTEventEmitter.openURL(url, forPushObject: push)
   }
 }
 ```

package/RNNetmera.podspec

@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
   s.public_header_files = "ios/RNNetmera.h"
 
-  netmera_version = '4.15.0'
+  netmera_version = '4.17.0'
 
   s.dependency "NetmeraAnalytic", netmera_version
   s.dependency "NetmeraAnalyticAutotracking", netmera_version

package/android/build.gradle

@@ -75,7 +75,7 @@ repositories {
   google()
 }
 
-def netmeraAndroidVersion = '4.13.3'
+def netmeraAndroidVersion = '4.14.3'
 
 def kotlin_version = getExtOrDefault("kotlinVersion")
 

package/android/src/main/java/com/netmera/reactnativesdk/RNNetmeraConfiguration.kt

@@ -20,11 +20,12 @@ class RNNetmeraConfiguration private constructor(
   val apiKey: String?,
   val firebaseSenderId: String?,
   val logging: Boolean,
+  private val disableSerializeRule: Boolean,
   val sslPinKeys: List<String>?
 ) {
 
   fun getNetmeraConfiguration(): NetmeraConfiguration {
-    val pushCallbacks = nmPushActionCallbacks ?: RNNetmeraPushBroadcastReceiver()
+    val pushCallbacks = nmPushActionCallbacks ?: RNNetmeraPushActionCallbacks()
     val webWidgetCallbacks = nmWebWidgetCallbacks ?: RNNetmeraWebWidgetCallbacks()
 
     val builder = NetmeraConfiguration.Builder()
@@ -38,7 +39,7 @@ class RNNetmeraConfiguration private constructor(
 
     return builder
       .logging(logging)
-      .disableSerializeRule(true)
+      .disableSerializeRule(disableSerializeRule)
       .addProvider(NMFCMProvider())
       .addProvider(NMHMSProvider())
       .nmPushActionCallbacks(pushCallbacks)
@@ -56,6 +57,7 @@ class RNNetmeraConfiguration private constructor(
     private var apiKey: String? = null
     private var firebaseSenderId: String? = null
     private var logging: Boolean = false
+    private var disableSerializeRule: Boolean = true
     private var sslPinKeys: List<String>? = null
 
     fun nmInAppMessageActionCallbacks(callbacks: NMInAppMessageActionCallbacks) = apply {
@@ -79,6 +81,7 @@ class RNNetmeraConfiguration private constructor(
     fun firebaseSenderId(firebaseSenderId: String) = apply { this.firebaseSenderId = firebaseSenderId }
 
     fun logging(logging: Boolean) = apply { this.logging = logging }
+    fun disableSerializeRule(enabled: Boolean) = apply { this.disableSerializeRule = enabled }
 
     fun sslPinKeys(sslPinKey: String) = apply {
       this.sslPinKeys = Collections.singletonList(sslPinKey)
@@ -100,6 +103,7 @@ class RNNetmeraConfiguration private constructor(
         apiKey,
         firebaseSenderId,
         logging,
+        disableSerializeRule,
         sslPinKeys
       )
     }

package/android/src/main/java/com/netmera/reactnativesdk/RNNetmeraModule.kt

@@ -3,6 +3,7 @@ package com.netmera.reactnativesdk
 import android.app.Activity
 import android.os.Bundle
 import android.util.Log
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
@@ -10,6 +11,8 @@ import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.google.firebase.messaging.RemoteMessage
+import com.google.gson.Gson
+import com.google.gson.JsonObject
 import com.netmera.InternalNetmera
 import com.netmera.NMUser
 import com.netmera.Netmera
@@ -27,7 +30,10 @@ import com.netmera.callbacks.NMUpdateUserProfileListener
 import com.netmera.data.NMCategoryPreference
 import com.netmera.data.NMInboxStatusCount
 import com.netmera.data.NMInboxStatusCountFilter
+import com.netmera.NetmeraCategoryFilter
+import com.netmera.data.NMCouponDetail
 import com.netmera.reactnativesdk.RNNetmeraUtil.getInboxStatus
+import com.netmera.reactnativesdk.RNNetmeraUtil.mapPushObject
 import com.netmera.reactnativesdk.RNNetmeraUtil.mapPushObjects
 import com.netmera.reactnativesdk.RNNetmeraUtil.parseInboxCountForStatusToMap
 import com.netmera.reactnativesdk.RNNetmeraUtil.toMap
@@ -136,7 +142,7 @@ class RNNetmeraModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   fun fetchCoupons(page: Int, max: Int, promise: Promise) {
     Netmera.fetchCoupons(page, max, object : NMFetchCouponsResultListener {
-      override fun onSuccess(coupons: List<com.netmera.data.NMCouponDetail>?) {
+      override fun onSuccess(coupons: List<NMCouponDetail>?) {
         promise.resolve(RNNetmeraUtil.mapCouponObjects(coupons ?: emptyList()))
       }
 
@@ -226,9 +232,23 @@ class RNNetmeraModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun fetchCategory(readableMap: ReadableMap, promise: Promise) {
-    Netmera.fetchCategory(
-      RNNetmeraCategoryObject.getInboxObject(readableMap)
-    ) { netmeraInboxCategory, netmeraError ->
+    val builder = NetmeraCategoryFilter.Builder()
+    if (readableMap.hasKey("status")) {
+      val status = readableMap.getInt("status")
+      builder.status(status)
+    }
+
+    if (readableMap.hasKey("pageSize")) {
+      val pageSize = readableMap.getInt("pageSize")
+      builder.pageSize(pageSize)
+    }
+
+    if (readableMap.hasKey("includeExpiredObjects")) {
+      val includeExpiredObjects = readableMap.getBoolean("includeExpiredObjects")
+      builder.includeExpiredObjects(includeExpiredObjects)
+    }
+
+    Netmera.fetchCategory(builder.build()) { netmeraInboxCategory, netmeraError ->
       setCategory(
         netmeraInboxCategory,
         netmeraError,
@@ -257,26 +277,6 @@ class RNNetmeraModule(reactContext: ReactApplicationContext) :
     }
   }
 
-  @ReactMethod
-  fun handleLastMessage(categoryName: String?, promise: Promise) {
-    if (netmeraInboxCategory == null) {
-      promise.reject(ERROR_CODE_NULL_CATEGORY, ERROR_MESSAGE_NULL_CATEGORY)
-      return
-    }
-
-    if (categoryName == null || categoryName.isEmpty()) {
-      promise.reject(ERROR_CODE_INVALID_PUSH_OBJECT, ERROR_MESSAGE_INVALID_PUSH_OBJECT)
-      return
-    }
-
-    for (category in netmeraInboxCategory!!.categories()) {
-      if (categoryName == category.categoryName) {
-        Netmera.handlePushObject(reactApplicationContext.currentActivity!!, category.lastMessage)
-        break
-      }
-    }
-  }
-
   @ReactMethod
   fun updateStatusByCategories(fromIndex: Int, toIndex: Int, status: Int, promise: Promise) {
     if (netmeraInboxCategory == null) {
@@ -403,12 +403,12 @@ class RNNetmeraModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   fun sendEvent(readableMap: ReadableMap?) {
     val eventMap = toMap(readableMap).toMutableMap()
-    val event = RNNetmeraEvent()
+    val code = eventMap[CODE] as? String ?: return
+    if (code.isEmpty()) return
 
-    if (eventMap.containsKey(CODE)) {
-      event.setCode(readableMap?.getString(CODE)!!)
-      eventMap.remove(CODE)
-    }
+    val event = RNNetmeraEvent()
+    event.setCode(code)
+    eventMap.remove(CODE)
 
     if (eventMap.containsKey(REVENUE)) {
       event.setRevenue(readableMap?.getDouble(REVENUE) ?: 0.0)
@@ -615,7 +615,19 @@ class RNNetmeraModule(reactContext: ReactApplicationContext) :
       return
     }
     netmeraInboxCategory = nmInboxCategory
-    promise.resolve(RNNetmeraCategoryObject.mapCategoryObjects(netmeraInboxCategory!!.categories()))
+
+    val writableArray = Arguments.createArray()
+    netmeraInboxCategory!!.categories().forEach { category ->
+      val map = Arguments.createMap()
+      map.putString("categoryName", category.categoryName)
+      map.putString("categoryStatus", Gson().toJson(category.status, JsonObject::class.java))
+      map.putInt("readCount", category.readCount)
+      map.putInt("unreadCount", category.unReadCount)
+      map.putInt("deletedCount", category.deletedCount)
+      map.putMap("lastMessage", mapPushObject(category.lastMessage))
+      writableArray.pushMap(map)
+    }
+    promise.resolve(writableArray)
   }
 
   companion object {

package/android/src/main/java/com/netmera/reactnativesdk/{RNNetmeraPushBroadcastReceiver.kt → RNNetmeraPushActionCallbacks.kt}

@@ -15,7 +15,7 @@ import com.netmera.callbacks.NMPushActionCallbacks
 import com.netmera.reactnativesdk.RNNetmeraPushHeadlessService.Companion.TASK_KEY
 import com.netmera.reactnativesdk.RNNetmeraPushHeadlessService.Companion.TASK_MESSAGE
 
-class RNNetmeraPushBroadcastReceiver : NMPushActionCallbacks {
+class RNNetmeraPushActionCallbacks : NMPushActionCallbacks {
 
   override fun onPushRegister(context: Context, gcmSenderId: String, pushToken: String) {
     val bundle = Bundle().apply {

package/ios/RNNetmera.h

@@ -4,6 +4,9 @@
  */
 
 #import <Foundation/Foundation.h>
+#import <React/RCTEventEmitter.h>
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
 
 //! Project version number for RNNetmera.
 FOUNDATION_EXPORT double RNNetmeraVersionNumber;

package/ios/RNNetmera.mm

@@ -81,7 +81,7 @@ RCT_EXTERN_METHOD(inboxUpdateStatus:(NSInteger)fromIndex
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(fetchCategory:(NSDictionary *)inboxDictionary
+RCT_EXTERN_METHOD(fetchCategory:(NSDictionary *)filterDict
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
@@ -97,10 +97,6 @@ RCT_EXTERN_METHOD(handleInteractiveAction:(NSString *)actionId
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(handleLastMessage:(NSString *)pushId
-                  withResolver:(RCTPromiseResolveBlock)resolve
-                  withRejecter:(RCTPromiseRejectBlock)reject)
-
 RCT_EXTERN_METHOD(updateStatusByCategories:(NSArray<NSString *> *)categoryList
                   status:(NSInteger)status
                   withResolver:(RCTPromiseResolveBlock)resolve