react-native-netmera 1.4.6 → 1.4.7-nohms

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/RNNetmeraConfiguration.java

@@ -13,7 +13,6 @@ public class RNNetmeraConfiguration {
     NMPushActionCallbacks nmPushActionCallbacks;
     Context context;
     String baseUrl;
-    String huaweiSenderId;
     String apiKey;
     String firebaseSenderId;
     boolean logging;
@@ -23,7 +22,6 @@ public class RNNetmeraConfiguration {
         this.nmPushActionCallbacks = builder.nmPushActionCallbacks;
         this.context = builder.context;
         this.baseUrl = builder.baseUrl;
-        this.huaweiSenderId = builder.huaweiSenderId;
         this.apiKey = builder.apiKey;
         this.firebaseSenderId = builder.firebaseSenderId;
         this.logging = builder.logging;
@@ -41,10 +39,6 @@ public class RNNetmeraConfiguration {
             builder.firebaseSenderId(firebaseSenderId);
         }
 
-        if (huaweiSenderId != null) {
-            builder.huaweiSenderId(huaweiSenderId);
-        }
-
         if (apiKey != null) {
             builder.apiKey(apiKey);
         }
@@ -68,7 +62,6 @@ public class RNNetmeraConfiguration {
         private NMPushActionCallbacks nmPushActionCallbacks;
         private Context context;
         private String baseUrl;
-        private String huaweiSenderId;
         private String apiKey;
         private String firebaseSenderId;
         private boolean logging;
@@ -88,11 +81,6 @@ public class RNNetmeraConfiguration {
             return this;
         }
 
-        public Builder huaweiSenderId(String huaweiSenderId) {
-            this.huaweiSenderId = huaweiSenderId;
-            return this;
-        }
-
         public Builder apiKey(String apiKey) {
             this.apiKey = apiKey;
             return this;

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

@@ -490,10 +490,6 @@ public class RNNetmeraModule extends ReactContextBaseJavaModule {
 
         if (data.containsKey("google.c.sender.id")) {
             Netmera.onNetmeraPushMessageReceived(new com.google.firebase.messaging.RemoteMessage(bundle));
-        } else {
-            com.huawei.hms.push.RemoteMessage.Builder builder = new com.huawei.hms.push.RemoteMessage.Builder("to");
-            builder.setData(data);
-            Netmera.onNetmeraPushMessageReceived(builder.build());
         }
     }
 

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",
+  "version": "1.4.7-nohms",
   "description": "Netmera React Native SDK",
   "main": "index.js",
   "author": "netmera",

package/src/Netmera.js

@@ -203,14 +203,6 @@ export default class Netmera {
         }
     }
 
-    static onNetmeraHuaweiPushMessageReceived(from: string, data: Map) {
-        data["_nm"] = JSON.stringify(data["_nm"])
-        if (Platform.OS === "android") {
-            data["from"] = from
-            RNNetmera.onNetmeraPushMessageReceived(data)
-        }
-    }
-
     static onNetmeraNewToken(pushToken: string) {
         if (Platform.OS === "android") {
             RNNetmera.onNetmeraNewToken(pushToken)
@@ -220,4 +212,4 @@ export default class Netmera {
     static isNetmeraRemoteMessage(data: Object): boolean {
         return Platform.OS === "android" && data["_nm"] !== undefined;
     }
-}
+}

package/android/build/generated/source/buildConfig/release/com/netmera/reactnativesdk/BuildConfig.java

@@ -1,10 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.netmera.reactnativesdk;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = false;
-  public static final String LIBRARY_PACKAGE_NAME = "com.netmera.reactnativesdk";
-  public static final String BUILD_TYPE = "release";
-}

package/android/build/intermediates/aapt_friendly_merged_manifests/release/aapt/AndroidManifest.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.netmera.reactnativesdk"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="32" />
-
-    <application>
-        <service android:name="com.netmera.reactnativesdk.RNNetmeraPushHeadlessService" />
-    </application>
-
-</manifest>

package/android/build/intermediates/aapt_friendly_merged_manifests/release/aapt/output-metadata.json

@@ -1,16 +0,0 @@
-{
-  "version": 2,
-  "artifactType": {
-    "type": "AAPT_FRIENDLY_MERGED_MANIFESTS",
-    "kind": "Directory"
-  },
-  "applicationId": "com.netmera.reactnativesdk",
-  "variantName": "release",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "outputFile": "AndroidManifest.xml"
-    }
-  ]
-}

package/android/build/intermediates/aar_metadata/release/aar-metadata.properties

@@ -1,2 +0,0 @@
-aarFormatVersion=1.0
-aarMetadataVersion=1.0

package/android/build/intermediates/annotation_processor_list/release/annotationProcessors.json

@@ -1 +0,0 @@
-{}