react-native-netmera 2.0.0-alpha04 → 2.0.0-beta01

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.17.0"
-   pod "NetmeraNotificationContentExtension", "4.17.0"
+   pod 'NetmeraNotificationServiceExtension', "4.18.0"
+   pod "NetmeraNotificationContentExtension", "4.18.0"
    ```
 
 7. In order to use the widget URL callback, add these lines into `AppDelegate.swift` file.

package/RNNetmera.podspec

@@ -7,11 +7,11 @@ Pod::Spec.new do |s|
    s.version      = package["version"]
    s.summary      = package["description"]
    s.description  = <<-DESC
-                   RNNetmera
-                    DESC
-   s.homepage     = "https://github.com/author/RNNetmera.git"
+NETMERA is a Mobile Application Engagement Platform. We offer a series of development tools and app communication features to help your mobile business ignite and soar. 
+                       DESC
+   s.homepage     = "https://www.netmera.com/"
    s.license      = "MIT"
-   s.author       = { "author" => "author@domain.cn" }
+   s.author       = { 'Netmera' => 'mobilesdk@netmera.com' }
 
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/author/RNNetmera.git", :tag => "master" }
@@ -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.17.0'
+  netmera_version = '4.18.0'
 
   s.dependency "NetmeraAnalytic", netmera_version
   s.dependency "NetmeraAnalyticAutotracking", netmera_version

package/android/build.gradle

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

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

@@ -3,22 +3,18 @@ package com.netmera.reactnativesdk
 import com.google.gson.annotations.SerializedName
 import com.netmera.NetmeraEvent
 
+/**
+ * Copyright (c) 2026 Netmera Research.
+ */
 class RNNetmeraEvent : NetmeraEvent() {
+
   @SerializedName("prms")
-  private var eventParameters: MutableMap<String?, Any?>? = null
+  var eventParameters: Map<String, Any>? = null
 
   @SerializedName("code")
-  private var code: String? = null
-
-  fun setEventParameters(eventParameters: MutableMap<String?, Any?>?) {
-    this.eventParameters = eventParameters
-  }
-
-  fun setCode(code: String) {
-    this.code = code
-  }
+  var code: String = ""
 
   override fun eventCode(): String {
-    return code!!
+    return code
   }
 }

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

@@ -407,7 +407,7 @@ class RNNetmeraModule(reactContext: ReactApplicationContext) :
     if (code.isEmpty()) return
 
     val event = RNNetmeraEvent()
-    event.setCode(code)
+    event.code = code
     eventMap.remove(CODE)
 
     if (eventMap.containsKey(REVENUE)) {
@@ -415,8 +415,7 @@ class RNNetmeraModule(reactContext: ReactApplicationContext) :
       eventMap.remove(REVENUE)
     }
 
-    @Suppress("UNCHECKED_CAST")
-    event.setEventParameters(eventMap as MutableMap<String?, Any?>)
+    event.eventParameters = eventMap.filterValues { it != null } as Map<String, Any>
     Netmera.sendEvent(event)
   }
 

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

@@ -17,28 +17,37 @@ import com.netmera.reactnativesdk.RNNetmeraPushHeadlessService.Companion.TASK_ME
 
 class RNNetmeraPushActionCallbacks : NMPushActionCallbacks {
 
+  companion object {
+    const val ON_PUSH_REGISTER: String = "onPushRegister"
+    const val ON_PUSH_RECEIVE: String = "onPushReceive"
+    const val ON_PUSH_OPEN: String = "onPushOpen"
+    const val ON_PUSH_DISMISS: String = "onPushDismiss"
+    const val ON_PUSH_BUTTON_CLICKED: String = "onPushButtonClicked"
+    const val ON_CAROUSEL_OBJECT_SELECTED: String = "onCarouselObjectSelected"
+  }
+
   override fun onPushRegister(context: Context, gcmSenderId: String, pushToken: String) {
     val bundle = Bundle().apply {
       putString("gcmSenderId", gcmSenderId)
       putString("pushToken", pushToken)
     }
-    sendEvent(context, "onPushRegister", Arguments.fromBundle(bundle))
+    sendEvent(context, ON_PUSH_REGISTER, Arguments.fromBundle(bundle))
   }
 
   override fun onPushReceive(context: Context, bundle: Bundle?, netmeraPushObject: NetmeraPushObject) {
-    sendEvent(context, "onPushReceive", mergeMap(bundle, netmeraPushObject))
+    sendEvent(context, ON_PUSH_RECEIVE, mergeMap(bundle, netmeraPushObject))
   }
 
   override fun onPushOpen(context: Context, bundle: Bundle?, netmeraPushObject: NetmeraPushObject) {
-    sendEvent(context, "onPushOpen", mergeMap(bundle, netmeraPushObject))
+    sendEvent(context, ON_PUSH_OPEN, mergeMap(bundle, netmeraPushObject))
   }
 
   override fun onPushDismiss(context: Context, bundle: Bundle?, netmeraPushObject: NetmeraPushObject) {
-    sendEvent(context, "onPushDismiss", mergeMap(bundle, netmeraPushObject))
+    sendEvent(context, ON_PUSH_DISMISS, mergeMap(bundle, netmeraPushObject))
   }
 
   override fun onPushButtonClicked(context: Context, bundle: Bundle?, netmeraPushObject: NetmeraPushObject) {
-    sendEvent(context, "onPushButtonClicked", mergeMap(bundle, netmeraPushObject))
+    sendEvent(context, ON_PUSH_BUTTON_CLICKED, mergeMap(bundle, netmeraPushObject))
   }
 
   override fun onCarouselObjectSelected(
@@ -52,7 +61,7 @@ class RNNetmeraPushActionCallbacks : NMPushActionCallbacks {
     newBundle.putInt("selectedIndex", selectedIndex)
     val map = RNNetmeraUtil.mapCarouselObject(netmeraCarouselObject)
     map.merge(mergeMap(newBundle, netmeraPushObject))
-    sendEvent(context, "onCarouselObjectSelected", map)
+    sendEvent(context, ON_CAROUSEL_OBJECT_SELECTED, map)
   }
 
   private fun sendEvent(context: Context, eventName: String, map: WritableMap) {
@@ -61,13 +70,12 @@ class RNNetmeraPushActionCallbacks : NMPushActionCallbacks {
         putExtra(TASK_KEY, eventName)
         putExtra(TASK_MESSAGE, Arguments.toBundle(map))
       }
-      val ag = Arguments.toBundle(map)
       val name: ComponentName? = context.startService(backgroundIntent)
       if (name != null) {
         HeadlessJsTaskService.acquireWakeLockNow(context)
       }
     } catch (ex: IllegalStateException) {
-      Log.d("RNNetmera Background", "RNNetmera Background Event Exception")
+      Log.d("RNNetmera Background", "RNNetmera Background Event Exception: ${ex.message}")
     }
   }
 

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

@@ -16,11 +16,9 @@ class RNNetmeraPushHeadlessService : HeadlessJsTaskService() {
   }
 
   override fun getTaskConfig(intent: Intent?): HeadlessJsTaskConfig? {
-    if (intent == null) return null
-    val extras = intent.extras
-    val remoteMessage: Bundle? = intent.getParcelableExtra(TASK_MESSAGE)
-    val taskKey = extras?.getString(TASK_KEY)
-    if (extras == null || taskKey == null) return null
+    val extras = intent?.extras ?: return null
+    val taskKey = extras.getString(TASK_KEY) ?: return null
+    val remoteMessage = intent.getParcelableExtra<Bundle>(TASK_MESSAGE)
 
     return HeadlessJsTaskConfig(
       taskKey,

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

@@ -5,7 +5,6 @@ import com.facebook.react.bridge.*
 import com.google.gson.Gson
 import com.netmera.NetmeraCarouselObject
 import com.netmera.NetmeraPushObject
-import com.netmera.NetmeraPushStyle
 import com.netmera.data.NMCategoryPreference
 import com.netmera.data.NMCouponDetail
 import com.netmera.data.NMInboxStatus
@@ -16,18 +15,16 @@ import org.json.JSONObject
 object RNNetmeraUtil {
 
   private fun jsonToWritableMap(jsonObject: JSONObject?): WritableMap? {
-    if (jsonObject == null) return null
+    jsonObject ?: return null
 
-    val writableMap: WritableMap = WritableNativeMap()
+    val writableMap = WritableNativeMap()
     val keys = jsonObject.keys()
-    if (!keys.hasNext()) return null
 
     while (keys.hasNext()) {
       val key = keys.next()
       try {
-        val value = jsonObject.get(key)
-        when (value) {
-          null -> writableMap.putNull(key)
+        when (val value = jsonObject.get(key)) {
+          JSONObject.NULL -> writableMap.putNull(key)
           is Boolean -> writableMap.putBoolean(key, value)
           is Int -> writableMap.putInt(key, value)
           is Double -> writableMap.putDouble(key, value)
@@ -35,20 +32,19 @@ object RNNetmeraUtil {
           is JSONObject -> writableMap.putMap(key, jsonToWritableMap(value))
           is JSONArray -> writableMap.putArray(key, jsonArrayToWritableArray(value))
         }
-      } catch (ignored: Exception) {
+      } catch (_: Exception) {
       }
     }
     return writableMap
   }
 
   fun jsonArrayToWritableArray(jsonArray: JSONArray?): WritableArray? {
-    if (jsonArray == null || jsonArray.length() <= 0) return null
+    jsonArray ?: return null
     val writableArray: WritableArray = WritableNativeArray()
     for (i in 0 until jsonArray.length()) {
       try {
-        val value = jsonArray.get(i)
-        when (value) {
-          null -> writableArray.pushNull()
+        when (val value = jsonArray.get(i)) {
+          JSONObject.NULL -> writableArray.pushNull()
           is Boolean -> writableArray.pushBoolean(value)
           is Int -> writableArray.pushInt(value)
           is Double -> writableArray.pushDouble(value)
@@ -56,16 +52,16 @@ object RNNetmeraUtil {
           is JSONObject -> writableArray.pushMap(jsonToWritableMap(value))
           is JSONArray -> writableArray.pushArray(jsonArrayToWritableArray(value))
         }
-      } catch (ignored: Exception) {
+      } catch (_: Exception) {
       }
     }
     return writableArray
   }
 
   fun toMap(readableMap: ReadableMap?): Map<String, Any?> {
-    val map = mutableMapOf<String, Any?>()
-    if (readableMap == null) return map
+    readableMap ?: return emptyMap()
 
+    val map = mutableMapOf<String, Any?>()
     val iterator = readableMap.keySetIterator()
     while (iterator.hasNextKey()) {
       val key = iterator.nextKey()
@@ -145,7 +141,7 @@ object RNNetmeraUtil {
       try {
         val json = JSONObject(pushObject.customJson.toString())
         map.putMap("customJson", jsonToWritableMap(json))
-      } catch (ignored: Throwable) {
+      } catch (_: Throwable) {
       }
     }
 

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

@@ -15,11 +15,7 @@ class RNNetmeraWebWidgetCallbacks : NMWebWidgetCallbacks {
     RNNetmeraModule.emitEvent(ON_WIDGET_URL_TRIGGERED, s)
   }
 
-  override fun onWebWidgetShown(s: String) {
-    // There is no equivalent for this feature in iOS
-  }
+  override fun onWebWidgetShown(s: String) {}
 
-  override fun onWebWidgetDismiss(s: String) {
-    // There is no equivalent for this feature in iOS
-  }
+  override fun onWebWidgetDismiss(s: String) {}
 }

package/ios/RNNetmeraPushLifecycleDelegate.swift

@@ -4,22 +4,11 @@
 
 import Foundation
 import NetmeraNotification
-import NetmeraNotificationCore
 
-final class RNNetmeraPushLifecycleDelegate: NSObject, NetmeraPushLifecycleDelegate {
+final class RNNetmeraPushLifecycleDelegate: NetmeraPushLifecycleDelegate {
 
   static let shared = RNNetmeraPushLifecycleDelegate()
 
-  private func triggerDeeplinkIfPresent(in action: NetmeraPushAction?) {
-    guard
-      let action,
-      action.actionType == .openDeeplink,
-      let deeplink = action as? NetmeraDeeplinkAction,
-      let url = deeplink.deeplinkURL
-    else { return }
-    RNNetmeraRCTEventEmitter.onDeeplinkTriggered(url)
-  }
-
   func didRegisterDeviceToken(_ deviceToken: String) {
     RNNetmeraRCTEventEmitter.onPushRegister(["pushToken": deviceToken])
   }
@@ -30,32 +19,35 @@ final class RNNetmeraPushLifecycleDelegate: NSObject, NetmeraPushLifecycleDelega
   }
 
   func didOpen(_ push: NetmeraBasePush) {
-    triggerDeeplinkIfPresent(in: push.action)
+    if let deeplink = push.deeplinkURL {
+      RNNetmeraRCTEventEmitter.onDeeplinkTriggered(deeplink)
+    }
     guard let payload = RNNetmeraPushObject.getBasePushObjectMap(push) else { return }
     RNNetmeraRCTEventEmitter.onPushOpen(["payload": payload])
   }
-
-  func didClickActionButton(_ identifier: String, for push: NetmeraBasePush) {
-    if let interactive = push as? NetmeraInteractivePush,
-       let item = interactive.interactiveAction?.first(where: { $0.id == identifier }) {
-      triggerDeeplinkIfPresent(in: item.action)
+  
+  func didTakeAction(_ action: NetmeraBaseAction?, from source: NetmeraActionSource, for push: NetmeraBasePush) {
+    if let deeplink = action?.deeplinkURL {
+        RNNetmeraRCTEventEmitter.onDeeplinkTriggered(deeplink)
     }
-    guard let payload = RNNetmeraPushObject.getBasePushObjectMap(push) else { return }
-    RNNetmeraRCTEventEmitter.onPushButtonClicked([
-      "payload": payload,
-      "identifier": identifier,
-    ])
-  }
-
-  func didClickCarouselItem(_ identifier: String?, for push: NetmeraBasePush) {
-    if let content = push as? NetmeraContentPush,
-       let item = content.carousel?.first(where: { $0.id == identifier }) {
-      triggerDeeplinkIfPresent(in: item.action)
+    
+    guard let payload = RNNetmeraPushObject.getBasePushObjectMap(push),
+          let actionMap = RNNetmeraPushObject.getActionMap(action) else {
+        return
+    }
+    
+    let eventData: [String: Any] = [
+        "payload": payload,
+        "action": actionMap
+    ]
+    
+    switch source {
+    case .interactiveButton:
+        RNNetmeraRCTEventEmitter.onPushButtonClicked(eventData)
+    case .carouselItem:
+        RNNetmeraRCTEventEmitter.onCarouselItemClicked(eventData)
+    @unknown default:
+        break
     }
-    guard let payload = RNNetmeraPushObject.getBasePushObjectMap(push) else { return }
-    RNNetmeraRCTEventEmitter.onCarouselItemClicked([
-      "payload": payload,
-      "identifier": identifier as Any
-    ])
   }
 }

package/ios/RNNetmeraPushObject.swift

@@ -110,6 +110,18 @@ class RNNetmeraPushObject {
 
     return dict
   }
+  
+  static func getActionMap(_ action: NetmeraBaseAction?) -> [String: Any]? {
+    guard
+      let action,
+      let data = try? JSONEncoder().encode(action),
+      let dict = try? JSONSerialization.jsonObject(with: data) as? [String: Any]
+    else {
+      return nil
+    }
+
+    return dict
+  }
 
   private static func mapAction(_ action: NetmeraPushAction) -> [String: Any] {
     var dict: [String: Any] = [:]

package/ios/RNNetmeraRCTEventEmitter.swift

@@ -5,10 +5,20 @@ import NetmeraNotificationCore
 
 @objc(RNNetmeraRCTEventEmitter)
 public class RNNetmeraRCTEventEmitter: RCTEventEmitter {
-  
+
+  private enum EventName {
+    static let onPushRegister = "onPushRegister"
+    static let onPushReceive = "onPushReceive"
+    static let onPushOpen = "onPushOpen"
+    static let onPushDismiss = "onPushDismiss"
+    static let onPushButtonClicked = "onPushButtonClicked"
+    static let onCarouselItemClicked = "onCarouselItemClicked"
+    static let onWidgetUrlTriggered = "onWidgetUrlTriggered"
+  }
+
   private static weak var emitterInstance: RNNetmeraRCTEventEmitter?
   private static var isReactBridgeInitialized = false
-  private static var waitingDeeplink: String?
+  private static var waitingDeeplink: URL?
   private static var waitingOnPushRegister: [String: Any]?
   private static var waitingOnPushReceive: [String: Any]?
   private static var waitingOnPushOpen: [String: Any]?
@@ -29,48 +39,52 @@ public class RNNetmeraRCTEventEmitter: RCTEventEmitter {
   }
   
   private static func deliver(_ eventName: String, body: [String: Any], waiting: inout [String: Any]?) {
-    if isReactBridgeInitialized, let emitter = emitterInstance {
-      emitter.sendEvent(withName: eventName, body: body)
-    } else {
-      waiting = body
+    guard
+        isReactBridgeInitialized,
+        let emitter = emitterInstance
+    else {
+        waiting = body
+        return
     }
+
+    emitter.sendEvent(withName: eventName, body: body)
   }
   
   public override func startObserving() {
     RNNetmeraRCTEventEmitter.isReactBridgeInitialized = true
     
     if let body = RNNetmeraRCTEventEmitter.waitingOnPushRegister {
-      sendEvent(withName: "onPushRegister", body: body)
+      sendEvent(withName: EventName.onPushRegister, body: body)
       RNNetmeraRCTEventEmitter.waitingOnPushRegister = nil
     }
     
     if let body = RNNetmeraRCTEventEmitter.waitingOnPushReceive {
-      sendEvent(withName: "onPushReceive", body: body)
+      sendEvent(withName: EventName.onPushReceive, body: body)
       RNNetmeraRCTEventEmitter.waitingOnPushReceive = nil
     }
     
     if let body = RNNetmeraRCTEventEmitter.waitingOnPushOpen {
-      sendEvent(withName: "onPushOpen", body: body)
+      sendEvent(withName: EventName.onPushOpen, body: body)
       RNNetmeraRCTEventEmitter.waitingOnPushOpen = nil
     }
     
     if let body = RNNetmeraRCTEventEmitter.waitingOnPushDismiss {
-      sendEvent(withName: "onPushDismiss", body: body)
+      sendEvent(withName: EventName.onPushDismiss, body: body)
       RNNetmeraRCTEventEmitter.waitingOnPushDismiss = nil
     }
     
     if let body = RNNetmeraRCTEventEmitter.waitingOnPushButtonClicked {
-      sendEvent(withName: "onPushButtonClicked", body: body)
+      sendEvent(withName: EventName.onPushButtonClicked, body: body)
       RNNetmeraRCTEventEmitter.waitingOnPushButtonClicked = nil
     }
     
     if let body = RNNetmeraRCTEventEmitter.waitingOnCarouselItemClicked {
-      sendEvent(withName: "onCarouselItemClicked", body: body)
+      sendEvent(withName: EventName.onCarouselItemClicked, body: body)
       RNNetmeraRCTEventEmitter.waitingOnCarouselItemClicked = nil
     }
 
     if let body = RNNetmeraRCTEventEmitter.waitingOnWidgetUrlTriggered {
-      sendEvent(withName: "onWidgetUrlTriggered", body: body)
+      sendEvent(withName: EventName.onWidgetUrlTriggered, body: body)
       RNNetmeraRCTEventEmitter.waitingOnWidgetUrlTriggered = nil
     }
   }
@@ -81,12 +95,12 @@ public class RNNetmeraRCTEventEmitter: RCTEventEmitter {
   
   public override func supportedEvents() -> [String]! {
     return [
-      "onWidgetUrlTriggered",
-      "onPushReceive",
-      "onPushOpen",
-      "onPushRegister",
-      "onPushButtonClicked",
-      "onCarouselItemClicked",
+      EventName.onWidgetUrlTriggered,
+      EventName.onPushReceive,
+      EventName.onPushOpen,
+      EventName.onPushRegister,
+      EventName.onPushButtonClicked,
+      EventName.onCarouselItemClicked,
     ]
   }
   
@@ -97,7 +111,7 @@ public class RNNetmeraRCTEventEmitter: RCTEventEmitter {
   // MARK: - Public Static API
   
   static func getInitialUrl() -> String? {
-    return waitingDeeplink
+    return waitingDeeplink?.absoluteString
   }
   
   public static func openURL(_ url: URL, forPushObject object: NetmeraBasePush) {
@@ -106,32 +120,33 @@ public class RNNetmeraRCTEventEmitter: RCTEventEmitter {
       return
     }
     let body = ["url": url.absoluteString]
-    deliver("onWidgetUrlTriggered", body: body, waiting: &waitingOnWidgetUrlTriggered)
+    deliver(EventName.onWidgetUrlTriggered, body: body, waiting: &waitingOnWidgetUrlTriggered)
   }
   
-  static func onDeeplinkTriggered(_ url: String) {
-    if !isReactBridgeInitialized {
+  static func onDeeplinkTriggered(_ url: URL) {
+    guard isReactBridgeInitialized else {
       waitingDeeplink = url
+      return
     }
   }
   
   @objc public static func onPushRegister(_ body: [String: Any]) {
-    deliver("onPushRegister", body: body, waiting: &waitingOnPushRegister)
+    deliver(EventName.onPushRegister, body: body, waiting: &waitingOnPushRegister)
   }
   
   @objc public static func onPushReceive(_ body: [String: Any]) {
-    deliver("onPushReceive", body: body, waiting: &waitingOnPushReceive)
+    deliver(EventName.onPushReceive, body: body, waiting: &waitingOnPushReceive)
   }
   
   @objc public static func onPushOpen(_ body: [String: Any]) {
-    deliver("onPushOpen", body: body, waiting: &waitingOnPushOpen)
+    deliver(EventName.onPushOpen, body: body, waiting: &waitingOnPushOpen)
   }
 
   @objc public static func onPushButtonClicked(_ body: [String: Any]) {
-    deliver("onPushButtonClicked", body: body, waiting: &waitingOnPushButtonClicked)
+    deliver(EventName.onPushButtonClicked, body: body, waiting: &waitingOnPushButtonClicked)
   }
 
   @objc public static func onCarouselItemClicked(_ body: [String: Any]) {
-    deliver("onCarouselItemClicked", body: body, waiting: &waitingOnCarouselItemClicked)
+    deliver(EventName.onCarouselItemClicked, body: body, waiting: &waitingOnCarouselItemClicked)
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-netmera",
-  "version": "2.0.0-alpha04",
+  "version": "2.0.0-beta01",
   "description": "Netmera React Native SDK",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",