react-native-netmera 1.4.6-nohms → 1.4.7-nohms

package/android/build/.transforms/e8aa15d298099f6ff9b72440aa31047c/results.bin

@@ -0,0 +1 @@
+o/classes

package/android/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1 +1 @@
-#Thu Nov 17 17:47:56 TRT 2022
+#Fri Dec 30 11:39:30 TRT 2022

package/android/build.gradle

@@ -16,7 +16,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.netmera:nmcore:3.9.7'
+    implementation 'com.netmera:nmcore:3.9.9'
     implementation 'com.netmera:nmfcm:3.9.3'
     implementation 'com.facebook.react:react-native:+'
 }

package/android/src/main/java/com/netmera/reactnativesdk/RNNetmera.java

@@ -16,7 +16,7 @@ public class RNNetmera {
     static void setNetmeraHeaders() {
         ContentValues headerValues = new ContentValues();
         headerValues.put("X-netmera-framework", "react");
-        headerValues.put("X-netmera-frameworkV", "1.4.6");
+        headerValues.put("X-netmera-frameworkV", "1.4.7");
         Netmera.setNetmeraHeaders(headerValues);
     }
 }

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

@@ -24,6 +24,7 @@ import com.facebook.react.bridge.WritableNativeMap;
 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.NMInboxStatus;
 import com.netmera.data.NMInboxStatusCount;
@@ -200,6 +201,9 @@ class RNNetmeraUtil {
 
     public static WritableMap mapPushObject(NetmeraPushObject pushObject) {
         WritableMap pushObjectMap = Arguments.createMap();
+        if (pushObject == null) {
+            return pushObjectMap;
+        }
         pushObjectMap.putInt("pushType", pushObject.getPushType());
         pushObjectMap.putString("pushId", pushObject.getPushId());
         pushObjectMap.putString("pushInstanceId", pushObject.getPushInstanceId());
@@ -232,21 +236,28 @@ class RNNetmeraUtil {
             pushObjectMap.putString("expireTime", String.valueOf(DateFormat.format("yyyy-MM-dd HH:mm:ss", pushObject.getPopupExpirationTime())));
         }
 
-        if (pushObject.getWebPageUrl() != null) {
-            pushObjectMap.putString("webPage", pushObject.getWebPageUrl());
-        }
-
         if (pushObject.getInteractiveActions() != null && !pushObject.getInteractiveActions().isEmpty()) {
             pushObjectMap.putString("interactiveActions", new Gson().toJson(pushObject.getInteractiveActions()));
         }
 
         /* Push Style */
         if (pushObject.getPushStyle() != null) {
-            pushObjectMap.putString("title", pushObject.getPushStyle().getContentTitle());
-            pushObjectMap.putString("subtitle", pushObject.getPushStyle().getSubText());
-            pushObjectMap.putString("body", pushObject.getPushStyle().getContentText());
-            pushObjectMap.putString("mediaAttachmentURL", pushObject.getPushStyle().getBigPicturePath());
-            pushObjectMap.putString("carousel", new Gson().toJson(pushObject.getPushStyle().retrieveCarouselObjects()));
+            NetmeraPushStyle pushStyle = pushObject.getPushStyle();
+            if (pushStyle.getContentTitle() != null) {
+                pushObjectMap.putString("title", pushStyle.getContentTitle());
+            }
+            if (pushStyle.getSubText() != null) {
+                pushObjectMap.putString("subtitle", pushStyle.getSubText());
+            }
+            if (pushStyle.getContentText() != null) {
+                pushObjectMap.putString("body", pushStyle.getContentText());
+            }
+            if (pushStyle.getBigPicturePath() != null) {
+                pushObjectMap.putString("mediaAttachmentURL", pushStyle.getBigPicturePath());
+            }
+            if (pushStyle.retrieveCarouselObjects() != null) {
+                pushObjectMap.putString("carousel", new Gson().toJson(pushStyle.retrieveCarouselObjects()));
+            }
         }
 
         if (pushObject.getSendDate() != null) {
@@ -255,6 +266,10 @@ class RNNetmeraUtil {
 
         if (pushObject.getPushAction() != null) {
             pushObjectMap.putString("pushAction", new Gson().toJson(pushObject.getPushAction()));
+
+            if (pushObject.getWebPageUrl() != null) {
+                pushObjectMap.putString("webPage", pushObject.getWebPageUrl());
+            }
         }
 
         return pushObjectMap;

package/ios/RNNetmera.m

@@ -46,7 +46,7 @@ NSString *const ERROR_MESSAGE_SET_CATEGORY_PREFERENCE = @"Error occurred while s
 
 + (void)setNetmeraHeaders {
     [Netmera setFramework:@"react"];
-    [Netmera setFrameworkVersion:@"1.4.6"];
+    [Netmera setFrameworkVersion:@"1.4.7"];
 }
 
 + (void)setPushDelegate:(NSObject<NetmeraPushDelegate> *)delegate {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-netmera",
-  "version": "1.4.6-nohms",
+  "version": "1.4.7-nohms",
   "description": "Netmera React Native SDK",
   "main": "index.js",
   "author": "netmera",