react-native-netmera 1.4.7-nohms → 1.4.8-beta

package/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>

package/.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/NetmeraSDKReactNative.iml" filepath="$PROJECT_DIR$/.idea/NetmeraSDKReactNative.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/netmera-sdk-react.iml" filepath="$PROJECT_DIR$/.idea/netmera-sdk-react.iml" />
     </modules>
   </component>
 </project>

package/.idea/netmera-sdk-react.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="CIDR_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/README.md

@@ -50,11 +50,13 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven {url 'https://developer.huawei.com/repo/'}
     }
 
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.3'
         classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.huawei.agconnect:agcp:1.6.3.300'
     }
 }
 
@@ -63,6 +65,7 @@ allprojects {
         google()
         jcenter()
         maven { url 'https://maven.google.com'}
+        maven { url 'https://developer.huawei.com/repo/'}
         maven { url "https://release.netmera.com/release/android" }
     }
 }
@@ -83,6 +86,7 @@ allprojects {
 
 ```
 apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.huawei.agconnect'
 ```
 
 6) Create an application class as shown below.
@@ -97,6 +101,7 @@ apply plugin: 'com.google.gms.google-services'
             super.onCreate();
             RNNetmeraConfiguration netmeraConfiguration = new RNNetmeraConfiguration.Builder()
                 .firebaseSenderId(<YOUR GCM SENDER ID>)
+                .huaweiSenderId(<YOUR HMS SENDER ID>)
                 .apiKey(<YOUR NETMERA API KEY>) // This is for enabling Netmera logs.
                 .logging(true)
                 .build(this);
@@ -174,6 +179,24 @@ messaging().onMessage(async remoteMessage => {
 });
 ```
 
+10) If you have custom Huawei Messaging integration, please see usage below.
+
+```
+HmsPushInstanceId.getToken("")
+   .then((result) => {
+       Netmera.onNetmeraNewToken(result.result)
+   })
+
+HmsPushEvent.onRemoteMessageReceived(event => {
+   const remoteMessage = new RNRemoteMessage(event.msg);
+   let data = JSON.parse(remoteMessage.getData())
+   console.log("onRemoteMessageReceived", data)
+   if (Netmera.isNetmeraRemoteMessage(data)) {
+       Netmera.onNetmeraHuaweiPushMessageReceived(remoteMessage.getFrom(), data)
+   }
+})
+```
+
 ### Setup - iOS Part
 
 1) Navigate to ios folder in your terminal and run the following command.

package/android/build.gradle

@@ -16,7 +16,8 @@ android {
 }
 
 dependencies {
-    implementation 'com.netmera:nmcore:3.9.9'
+    implementation 'com.netmera:nmcore:3.9.10'
     implementation 'com.netmera:nmfcm:3.9.3'
+    implementation 'com.netmera:nmhms:3.9.5'
     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.7");
+        headerValues.put("X-netmera-frameworkV", "1.4.8");
         Netmera.setNetmeraHeaders(headerValues);
     }
 }

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

@@ -13,6 +13,7 @@ public class RNNetmeraConfiguration {
     NMPushActionCallbacks nmPushActionCallbacks;
     Context context;
     String baseUrl;
+    String huaweiSenderId;
     String apiKey;
     String firebaseSenderId;
     boolean logging;
@@ -22,6 +23,7 @@ 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;
@@ -39,6 +41,10 @@ public class RNNetmeraConfiguration {
             builder.firebaseSenderId(firebaseSenderId);
         }
 
+        if (huaweiSenderId != null) {
+            builder.huaweiSenderId(huaweiSenderId);
+        }
+
         if (apiKey != null) {
             builder.apiKey(apiKey);
         }
@@ -62,6 +68,7 @@ public class RNNetmeraConfiguration {
         private NMPushActionCallbacks nmPushActionCallbacks;
         private Context context;
         private String baseUrl;
+        private String huaweiSenderId;
         private String apiKey;
         private String firebaseSenderId;
         private boolean logging;
@@ -81,6 +88,11 @@ 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,6 +490,10 @@ 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/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.7"];
+    [Netmera setFrameworkVersion:@"1.4.8"];
 }
 
 + (void)setPushDelegate:(NSObject<NetmeraPushDelegate> *)delegate {

package/package.json

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

package/src/Netmera.js

@@ -203,6 +203,14 @@ 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)
@@ -212,4 +220,4 @@ export default class Netmera {
     static isNetmeraRemoteMessage(data: Object): boolean {
         return Platform.OS === "android" && data["_nm"] !== undefined;
     }
-}
+}

package/.idea/NetmeraSDKReactNative.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/misc.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ReactNativePackager" nodePath="project" reactNativePackagePath="/usr/local/lib/node_modules/react-native-cli" workingDirectory="$PROJECT_DIR$/example" />
-</project>

package/android/.idea/gradle.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

package/android/.idea/misc.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

package/android/.idea/modules/android.iml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
-        <option name="LAST_KNOWN_AGP_VERSION" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../.." />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/android/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/android.iml" filepath="$PROJECT_DIR$/.idea/modules/android.iml" />
-    </modules>
-  </component>
-</project>

package/android/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>

package/android/build/.transforms/1bf2ef0cda730dd7179f544e5c5aa226/results.bin

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

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

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

package/android/build/generated/source/buildConfig/debug/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 = Boolean.parseBoolean("true");
-  public static final String LIBRARY_PACKAGE_NAME = "com.netmera.reactnativesdk";
-  public static final String BUILD_TYPE = "debug";
-}

package/android/build/intermediates/aapt_friendly_merged_manifests/debug/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/debug/aapt/output-metadata.json

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

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

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

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

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