react-native-netmera 1.7.10 → 1.8.0-beta01

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,23 @@
+---
+name: Bug report
+about: Describe a bug that needs to be fixed
+
+---
+
+**Describe the bug**
+<!--- A clear and concise description of what the bug is. -->
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+**Expected behavior**
+<!--- A clear and concise description of what you expected to happen. -->
+
+**Testing**
+<!--- A clear and concise description of how to test the fix. -->
+
+**Screenshots**
+<!--- If applicable, add screenshots to help explain your problem. -->
+
+**Additional context**
+<!--- Add any other context about the problem here. -->

package/.github/ISSUE_TEMPLATE/feature.md

@@ -0,0 +1,17 @@
+---
+name: Feature
+about: Describe a feature for this project
+---
+
+**Is your feature related to a problem? Please describe.**
+<!--- A clear and concise description of what the problem is. -->
+<!--- Ex. I'm always frustrated when [...] -->
+
+**Testing**
+<!--- A clear and concise description of how to test the fix. -->
+
+**Additional context**
+<!--- Add any other context or screenshots about the feature here. -->
+
+**Acceptance criteria**
+<!--- A list of the conditions that a software product must meet to be accepted by a user, a customer, or other system. -->

package/.github/ISSUE_TEMPLATE/release.md

@@ -0,0 +1,19 @@
+---
+name: Release
+about: Describe a mobile app release.
+---
+**Type of release.**
+<!--- Is this a Pre Release or a Prod release? -->
+
+**New features**
+<!-- Replace ADD_TIME_PERIOD_HERE with the scope of the release -->
+<!-- Add new release features below. -->
+We have completed the mobile dev worked the platform team had scoped out for the month of ADD_TIME_PERIOD_HERE and now it is time to deploy a new release.
+Details for this build are as follows:
+
+**Additional context**
+<!--- Add any other context or screenshots about the feature here. -->
+
+**Acceptance criteria**
+<!--- A list of the conditions that a software product must meet to be accepted by a user, a customer, or other system. -->
+Testers report no issues.

package/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,28 @@
+## Related Issue
+<!--- PRs should be related to open issues. -->
+<!--- If suggesting a new feature or change, please discuss it in an issue first. -->
+<!--- If fixing a bug, there should be an issue describing it with steps to reproduce it. -->
+
+<!--- Link to the issue here: -->
+ISSUE LINK: https://app.asana.com/0/1203144541549209/ISSUE_NUMBER
+
+## Description
+<!--- Describe your changes in detail -->
+
+
+## Types of changes
+<!--- What types of changes does your code introduce? Delete options that are not relevant: -->
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+
+## How Has This Been Tested?
+<!--- Describe in detail how you tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+## Screenshots or Sample Output
+~~~
+PASTE_OUTPUT_HERE
+~~~

package/README.md

@@ -409,10 +409,15 @@ Therefore, before calling the method, make sure your project targets an API of 3
  Netmera.requestPushNotificationAuthorization();
 ```
 
-You can call the `areNotificationsEnabled()` method if you need to know the status of permissions.
+You can call the `checkNotificationPermission()` method if you need to know the status of permissions.
 
 ```
- await Netmera.areNotificationsEnabled() // Use the enabled status of permission as boolean
+ Netmera.checkNotificationPermission().then(status => {
+   //NotificationPermissionStatus.NotDetermined
+   //NotificationPermissionStatus.Blocked
+   //NotificationPermissionStatus.Denied
+   //NotificationPermissionStatus.Granted
+ });
 ```
 
 ##### Netmera Inbox Examples

package/RNNetmera.podspec

@@ -18,6 +18,6 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency 'React'
-  s.dependency 'Netmera','3.23.16-WithoutDependency'
+  s.dependency 'Netmera','3.24.7-WithoutDependency'
 end
 

package/android/build.gradle

@@ -19,8 +19,8 @@ android {
 }
 
 dependencies {
-    implementation 'com.netmera:nmcore:3.14.4'
-    implementation 'com.netmera:nmfcm:3.13.0'
-    implementation 'com.netmera:nmhms:3.12.0'
+    implementation 'com.netmera:nmcore:4.0.3'
+    implementation 'com.netmera:nmfcm:4.0.0'
+    implementation 'com.netmera:nmhms:4.0.0'
     implementation 'com.facebook.react:react-native:+'
 }

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

@@ -1,21 +1,16 @@
 package com.netmera.reactnativesdk;
 
+import android.app.Application;
 import android.content.ContentValues;
-import android.content.Context;
-
-import androidx.startup.AppInitializer;
 
 import com.netmera.Netmera;
-import com.netmera.NetmeraConfiguration;
-import com.netmera.NMInitializer;
-import com.netmera.NMMainModule;
-import com.netmera.nmfcm.NMFCMProviderInitializer;
-import com.netmera.nmhms.NMHMSProviderInitializer;
+import com.netmera.NMActivityLifecycleCallbacks;
 
 public class RNNetmera {
 
     public static void initNetmera(RNNetmeraConfiguration netmeraConfiguration) {
-        checkNetmeraComponent(netmeraConfiguration.context);
+        Application application = (Application) netmeraConfiguration.context.getApplicationContext();
+        application.registerActivityLifecycleCallbacks(new NMActivityLifecycleCallbacks(application));
         Netmera.init(netmeraConfiguration.getNetmeraConfiguration());
         setNetmeraHeaders();
     }
@@ -23,15 +18,7 @@ public class RNNetmera {
     static void setNetmeraHeaders() {
         ContentValues headerValues = new ContentValues();
         headerValues.put("X-netmera-framework", "react");
-        headerValues.put("X-netmera-frameworkV", "1.7.10");
+        headerValues.put("X-netmera-frameworkV", "1.8.0");
         Netmera.setNetmeraHeaders(headerValues);
     }
-
-    private static void checkNetmeraComponent(Context context) {
-        if (NMMainModule.context == null) {
-            NMInitializer.initializeComponents(context);
-            AppInitializer.getInstance(context).initializeComponent(NMFCMProviderInitializer.class);
-            AppInitializer.getInstance(context).initializeComponent(NMHMSProviderInitializer.class);
-        }
-    }
 }

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

@@ -6,6 +6,11 @@ import com.netmera.NetmeraConfiguration;
 import com.netmera.callbacks.NMInAppMessageActionCallbacks;
 import com.netmera.callbacks.NMPushActionCallbacks;
 import com.netmera.callbacks.NMWebWidgetCallbacks;
+import com.netmera.nmfcm.NMFCMProvider;
+import com.netmera.nmhms.NMHMSProvider;
+
+import java.util.Collections;
+import java.util.List;
 
 public class RNNetmeraConfiguration {
 
@@ -18,6 +23,7 @@ public class RNNetmeraConfiguration {
     String apiKey;
     String firebaseSenderId;
     boolean logging;
+    List<String> sslPinKeys;
 
     private RNNetmeraConfiguration(Builder builder) {
         this.nmInAppMessageActionCallbacks = builder.nmInAppMessageActionCallbacks;
@@ -29,6 +35,7 @@ public class RNNetmeraConfiguration {
         this.apiKey = builder.apiKey;
         this.firebaseSenderId = builder.firebaseSenderId;
         this.logging = builder.logging;
+        this.sslPinKeys = builder.sslPinKeys;
     }
 
     NetmeraConfiguration getNetmeraConfiguration() {
@@ -64,8 +71,14 @@ public class RNNetmeraConfiguration {
             builder.nmInAppMessageActionCallbacks(nmInAppMessageActionCallbacks);
         }
 
+        if (sslPinKeys != null) {
+            builder.sslPinKeys(sslPinKeys);
+        }
+
         return builder.logging(logging)
                 .disableSerializeRule(true)
+                .addProvider(new NMFCMProvider())
+                .addProvider(new NMHMSProvider())
                 .nmPushActionCallbacks(nmPushActionCallbacks)
                 .nmWebWidgetCallbacks(nmWebWidgetCallbacks)
                 .build(context);
@@ -81,6 +94,7 @@ public class RNNetmeraConfiguration {
         private String apiKey;
         private String firebaseSenderId;
         private boolean logging;
+        private List<String> sslPinKeys;
 
         public Builder nmInAppMessageActionCallbacks(NMInAppMessageActionCallbacks nmInAppMessageActionCallbacks) {
             this.nmInAppMessageActionCallbacks = nmInAppMessageActionCallbacks;
@@ -122,6 +136,16 @@ public class RNNetmeraConfiguration {
             return this;
         }
 
+        public Builder sslPinKeys(String sslPinKey) {
+            this.sslPinKeys = Collections.singletonList(sslPinKey);
+            return this;
+        }
+
+        public Builder sslPinKeys(List<String> sslPinKeys) {
+            this.sslPinKeys = sslPinKeys;
+            return this;
+        }
+
         public RNNetmeraConfiguration build(Context context) {
             this.context = context;
             return new RNNetmeraConfiguration(this);

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

@@ -114,6 +114,17 @@ public class RNNetmeraModule extends ReactContextBaseJavaModule {
         return Netmera.areNotificationsEnabled();
     }
 
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String checkNotificationPermission() {
+        Activity activity = getCurrentActivity();
+        if (activity != null) {
+            return Netmera.checkNotificationPermission(activity).toString();
+        } else {
+            Log.e("NETMERA", "Cannot call checkNotificationPermission because current ReactActivity is null");
+            return "null";
+        }
+    }
+
     @ReactMethod
     public void requestPushNotificationAuthorization() {
         Activity activity = getCurrentActivity();

package/index.ts

@@ -12,6 +12,7 @@ import NetmeraInboxFilter from "./src/models/NetmeraInboxFilter";
 import NMInboxStatusCountFilter from "./src/models/NMInboxStatusCountFilter";
 import NMCategoryPreference from "./src/models/NMCategoryPreference";
 import { NMInboxStatus } from "./src/models/NMInboxStatus";
+import { NotificationPermissionStatus } from "./src/models/NotificationPermissionStatus";
 
 export {
   Netmera,
@@ -27,4 +28,5 @@ export {
   NetmeraCategory,
   NetmeraCategoryFilter,
   NMCategoryPreference,
+  NotificationPermissionStatus,
 };

package/ios/RNNetmera.m

@@ -55,7 +55,7 @@ NSString *const ERROR_MESSAGE_UPDATE_USER = @"Error occurred while updating user
 
 + (void)setNetmeraHeaders {
     [Netmera setFramework:@"react"];
-    [Netmera setFrameworkVersion:@"1.7.10"];
+    [Netmera setFrameworkVersion:@"1.8.0"];
 }
 
 + (void)setPushDelegate:(NSObject<NetmeraPushDelegate> *)delegate {
@@ -104,6 +104,10 @@ RCT_EXPORT_METHOD(areNotificationsEnabled:(RCTPromiseResolveBlock)resolve reject
     resolve(@([Netmera isEnabledReceivingPushNotifications]));
 }
 
+RCT_EXPORT_METHOD(checkNotificationPermission:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    resolve([@([Netmera checkNotificationPermission]) stringValue]);
+}
+
 RCT_EXPORT_METHOD(requestPermissionsForLocation) {
     [Netmera requestLocationAuthorization];
 }

package/ios/RNNetmeraRCTEventEmitter.m

@@ -104,6 +104,10 @@ NSDictionary* waitingOnPushDismiss = nil;
 }
 
 + (void)onPushReceive:(NSDictionary *)body {
+    if ([[body objectForKey:@"userInfo"] objectForKey:@"_nm"] == nil) {
+        return;
+    }
+
     if (isReactBridgeInitialized) {
         [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushReceive" object:nil userInfo:body];
     } else {
@@ -112,6 +116,10 @@ NSDictionary* waitingOnPushDismiss = nil;
 }
 
 + (void)onPushOpen:(NSDictionary *)body {
+    if ([[body objectForKey:@"userInfo"] objectForKey:@"_nm"] == nil) {
+        return;
+    }
+
     if (isReactBridgeInitialized) {
         [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushOpen" object:nil userInfo:body];
     } else {
@@ -120,6 +128,10 @@ NSDictionary* waitingOnPushDismiss = nil;
 }
 
 + (void)onPushDismiss:(NSDictionary *)body {
+    if ([[body objectForKey:@"userInfo"] objectForKey:@"_nm"] == nil) {
+        return;
+    }
+
     if (isReactBridgeInitialized) {
         [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushDismiss" object:nil userInfo:body];
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-netmera",
-  "version": "1.7.10",
+  "version": "1.8.0-beta01",
   "description": "Netmera React Native SDK",
   "main": "index.ts",
   "author": "netmera",

package/src/Netmera.ts

@@ -21,6 +21,7 @@ import NMCategoryPreference from "./models/NMCategoryPreference";
 import { NMInboxStatus } from "./models/NMInboxStatus";
 import NetmeraCouponObject from "./models/NetmeraCouponObject";
 import { isAndroid, isIos } from "./utils/DeviceUtils";
+import { NotificationPermissionStatus } from "./models/NotificationPermissionStatus";
 
 const { RNNetmera, RNNetmeraRCTEventEmitter }: NativeModulesStatic =
   NativeModules;
@@ -119,6 +120,24 @@ export default class Netmera {
     return RNNetmera.areNotificationsEnabled();
   };
 
+  static checkNotificationPermission =
+    async (): Promise<NotificationPermissionStatus> => {
+      let status: string = await RNNetmera.checkNotificationPermission();
+
+      const statusMap: Record<string, NotificationPermissionStatus> = {
+        "0": NotificationPermissionStatus.NotDetermined,
+        NOT_DETERMINED: NotificationPermissionStatus.NotDetermined,
+        "1": NotificationPermissionStatus.Blocked,
+        BLOCKED: NotificationPermissionStatus.Blocked,
+        "2": NotificationPermissionStatus.Denied,
+        DENIED: NotificationPermissionStatus.Denied,
+        "3": NotificationPermissionStatus.Granted,
+        GRANTED: NotificationPermissionStatus.Granted,
+      };
+
+      return statusMap[status];
+    };
+
   static requestPushNotificationAuthorization = () => {
     RNNetmera.requestPushNotificationAuthorization();
   };

package/src/models/NotificationPermissionStatus.ts

@@ -0,0 +1,6 @@
+export enum NotificationPermissionStatus {
+  NotDetermined = "notDetermined",
+  Blocked = "blocked",
+  Denied = "denied",
+  Granted = "granted",
+}

package/.github/workflows/commit_sync.yml

@@ -1,53 +0,0 @@
-name: Sync Commits to Client Repo
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  sync_to_repo_a:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0 # fetch the entire history
-
-      - name: Configure Git
-        run: |
-          git config --global user.email "engineering@initialcode.com.tr"
-          git config --global user.name "Initial Code"
-
-      - name: Add Repo A as remote
-        run: |
-          eval `ssh-agent -s`
-          ssh-add - <<< '${{ secrets.SSH_PRIVATE_KEY }}'
-          git remote add repo-a "git@github.com:Netmera/netmera-sdk-react-native.git"
-          git fetch repo-a
-
-      - name: Pull latest changes from Repo A
-        run: |
-          eval `ssh-agent -s`
-          ssh-add - <<< '${{ secrets.SSH_PRIVATE_KEY }}'
-          git pull repo-a master --rebase || git rebase --abort
-
-      - name: Remove .github folder
-        run: |
-          rm -rf .github
-          git add -A
-          git commit -m "Remove .github folder before pushing" || true
-
-      - name: Resolve conflicts if any and continue rebase
-        if: failure()
-        run: |
-          eval `ssh-agent -s`
-          ssh-add - <<< '${{ secrets.SSH_PRIVATE_KEY }}'
-          git rebase --continue || git rebase --skip || true
-
-      - name: Push to Repo A
-        run: |
-          eval `ssh-agent -s`
-          ssh-add - <<< '${{ secrets.SSH_PRIVATE_KEY }}'
-          git push repo-a master:master --force