react-native-netmera 1.6.2 → 1.6.3

package/README.md

@@ -215,6 +215,19 @@ export const onPushReceive = async (message) => {
    pod "Netmera/NotificationContentExtension", "3.14.10-WithoutDependency"
    ```
 
+5. In order to use the widget URL callback, add these methods to between `@implementation AppDelegate` and `@end`.
+
+   ```
+   // Required code block to handle widget URL's in React Native
+   - (BOOL)shouldHandleOpenURL:(NSURL *)url forPushObject:(NetmeraPushObject *)object {
+     return NO;
+   }
+
+   - (void)handleOpenURL:(NSURL *)url forPushObject:(NetmeraPushObject *)object {
+     [RNNetmeraRCTEventEmitter handleOpenURL:url forPushObject:object];
+   }
+   ```
+
 ### Setup - React Native Part
 
 1. Create a new `NetmeraPushHeadlessTask.ts` inside your React Native project.
@@ -351,6 +364,16 @@ You can send your events as follows. For more examples, please see the [example
   }
 ```
 
+##### Widget URL Callback
+
+In order to use the widget URL callback, use `onWidgetUrlTriggered` method as follows.
+
+```
+ Netmera.onWidgetUrlTriggered(url => {
+   console.log('Netmera triggered widget url: ', url);
+ });
+```
+
 ##### Push Notification Permissions
 
 If you don't request notification permission at runtime, you can request it by calling the `requestPushNotificationAuthorization()` method.

package/RNNetmera.podspec

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

package/android/.idea/gradle.xml

@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="jbr-17" />
       </GradleProjectSettings>
     </option>
   </component>

package/android/.idea/misc.xml

@@ -1,4 +1,3 @@
-<?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" />

package/android/build.gradle

@@ -15,8 +15,8 @@ android {
 }
 
 dependencies {
-    implementation 'com.netmera:nmcore:3.10.4'
-    implementation 'com.netmera:nmfcm:3.10.2'
-    implementation 'com.netmera:nmhms:3.10.1'
+    implementation 'com.netmera:nmcore:3.11.3'
+    implementation 'com.netmera:nmfcm:3.11.0'
+    implementation 'com.netmera:nmhms:3.11.0'
     implementation 'com.facebook.react:react-native:+'
 }

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

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

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

@@ -2,15 +2,16 @@ package com.netmera.reactnativesdk;
 
 import android.content.Context;
 
-import com.google.firebase.FirebaseApp;
 import com.netmera.NetmeraConfiguration;
 import com.netmera.callbacks.NMInAppMessageActionCallbacks;
 import com.netmera.callbacks.NMPushActionCallbacks;
+import com.netmera.callbacks.NMWebWidgetCallbacks;
 
 public class RNNetmeraConfiguration {
 
     NMInAppMessageActionCallbacks nmInAppMessageActionCallbacks;
     NMPushActionCallbacks nmPushActionCallbacks;
+    NMWebWidgetCallbacks nmWebWidgetCallbacks;
     Context context;
     String baseUrl;
     String huaweiSenderId;
@@ -20,6 +21,7 @@ public class RNNetmeraConfiguration {
 
     private RNNetmeraConfiguration(Builder builder) {
         this.nmInAppMessageActionCallbacks = builder.nmInAppMessageActionCallbacks;
+        this.nmWebWidgetCallbacks = builder.nmWebWidgetCallbacks;
         this.nmPushActionCallbacks = builder.nmPushActionCallbacks;
         this.context = builder.context;
         this.baseUrl = builder.baseUrl;
@@ -35,6 +37,11 @@ public class RNNetmeraConfiguration {
                         this.nmPushActionCallbacks :
                         new RNNetmeraPushBroadcastReceiver();
 
+        NMWebWidgetCallbacks nmWebWidgetCallbacks =
+                this.nmWebWidgetCallbacks != null ?
+                        this.nmWebWidgetCallbacks :
+                        new RNNetmeraWebWidgetCallbacks();
+
         NetmeraConfiguration.Builder builder = new NetmeraConfiguration.Builder();
 
         if (firebaseSenderId != null) {
@@ -60,12 +67,14 @@ public class RNNetmeraConfiguration {
         return builder.logging(logging)
                 .disableSerializeRule(true)
                 .nmPushActionCallbacks(nmPushActionCallbacks)
+                .nmWebWidgetCallbacks(nmWebWidgetCallbacks)
                 .build(context);
     }
 
     public static class Builder {
         private NMInAppMessageActionCallbacks nmInAppMessageActionCallbacks;
         private NMPushActionCallbacks nmPushActionCallbacks;
+        private NMWebWidgetCallbacks nmWebWidgetCallbacks;
         private Context context;
         private String baseUrl;
         private String huaweiSenderId;
@@ -83,6 +92,11 @@ public class RNNetmeraConfiguration {
             return this;
         }
 
+        public Builder nmWebWidgetCallbacks(NMWebWidgetCallbacks nmWebWidgetCallbacks) {
+            this.nmWebWidgetCallbacks = nmWebWidgetCallbacks;
+            return this;
+        }
+
         public Builder baseUrl(String baseUrl) {
             this.baseUrl = baseUrl;
             return this;

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

@@ -1,8 +1,7 @@
 //
 //  RNNetmeraModule.java
-//  Netmera SDK
 //
-//  Created by Huseyin Kocoglu on 22.04.2019.
+//  Created by Initial Code
 //  Copyright © 2019 Netmera. All rights reserved.
 //
 
@@ -18,6 +17,7 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.netmera.Netmera;
 import com.netmera.NetmeraCategory;
 import com.netmera.NetmeraError;
@@ -549,4 +549,8 @@ public class RNNetmeraModule extends ReactContextBaseJavaModule {
     private boolean hasKey(ReadableMap map, String key) {
         return map.hasKey(key) && !map.isNull(key);
     }
+
+    public static void emitEvent(String eventName, String eventData) {
+        reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, eventData);
+    }
 }

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

@@ -0,0 +1,27 @@
+package com.netmera.reactnativesdk;
+
+import com.netmera.callbacks.NMWebWidgetCallbacks;
+
+public class RNNetmeraWebWidgetCallbacks implements NMWebWidgetCallbacks {
+    private static final String ON_WIDGET_URL_TRIGGERED = "onWidgetUrlTriggered";
+
+    @Override
+    public void onDeeplinkTriggered(String s) {
+        RNNetmeraModule.emitEvent(ON_WIDGET_URL_TRIGGERED, s);
+    }
+
+    @Override
+    public void onOpenUrlTriggered(String s) {
+        RNNetmeraModule.emitEvent(ON_WIDGET_URL_TRIGGERED, s);
+    }
+
+    @Override
+    public void onWebWidgetShown(String s) {
+        // There is no equivalent for this feature in iOS
+    }
+
+    @Override
+    public void onWebWidgetDismiss(String s) {
+        // There is no equivalent for this feature in iOS
+    }
+}

package/ios/RNNetmera.m

@@ -48,7 +48,7 @@ NSString *const ERROR_MESSAGE_COUPON_FETCH = @"Error occurred while fetching cou
 
 + (void)setNetmeraHeaders {
     [Netmera setFramework:@"react"];
-    [Netmera setFrameworkVersion:@"1.6.2"];
+    [Netmera setFrameworkVersion:@"1.6.3"];
 }
 
 + (void)setPushDelegate:(NSObject<NetmeraPushDelegate> *)delegate {

package/ios/RNNetmeraRCTEventEmitter.h

@@ -1,13 +1,13 @@
 //
 //  RNNetmeraRCTEventEmitter.h
-//  Netmera SDK
 //
-//  Created by Huseyin Kocoglu on 22.04.2019.
+//  Created by Initial Code
 //  Copyright © 2019 Netmera. All rights reserved.
 //
 
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
+#import <Netmera/Netmera.h>
 
 @interface RNNetmeraRCTEventEmitter : RCTEventEmitter <RCTBridgeModule>
 
@@ -15,6 +15,7 @@
 +(void) onPushReceive:(NSDictionary*)dict;
 +(void) onPushDismiss:(NSDictionary*)dict;
 +(void) onPushOpen:(NSDictionary *)dict;
++(void) handleOpenURL:(NSURL *)url forPushObject:(NetmeraPushObject *)object;
 
 @end
 

package/ios/RNNetmeraRCTEventEmitter.m

@@ -1,8 +1,7 @@
 //
 //  RNNetmeraRCTEventEmitter.m
-//  Netmera SDK
 //
-//  Created by Huseyin Kocoglu on 22.04.2019.
+//  Created by Initial Code
 //  Copyright © 2019 Netmera. All rights reserved.
 //
 
@@ -46,7 +45,7 @@ NSDictionary* waitingOnPushDismiss = nil;
 
 - (NSArray<NSString *> *)supportedEvents
 {
-  return @[@"onPushReceive", @"onPushOpen", @"onPushRegister", @"onPushDismiss"];
+  return @[@"onWidgetUrlTriggered", @"onPushReceive", @"onPushOpen", @"onPushRegister", @"onPushDismiss"];
 }
 
 + (BOOL)requiresMainQueueSetup
@@ -69,16 +68,23 @@ NSDictionary* waitingOnPushDismiss = nil;
   }
 }
 
++ (void)handleOpenURL:(NSURL *)url forPushObject:(NetmeraPushObject *)object {
+    if (object.pushType == NetmeraPushTypeWebWidget) {
+        NSDictionary* urlDictionary = @{@"url" : url.absoluteString};
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"onWidgetUrlTriggered" object:nil userInfo:urlDictionary];
+    }
+}
+
 + (void)onPushRegister:(NSDictionary *)body {
     NSData *deviceToken = body[@"pushToken"];
     const unsigned char *bytes = deviceToken.bytes;
-    
+
     NSMutableString *deviceTokenString = [NSMutableString string];
       for (NSUInteger i = 0; i < deviceToken.length; i++) {
        [deviceTokenString appendFormat:@"%02x", bytes[i]];
       }
     NSDictionary* pushToken = @{@"pushToken" : deviceTokenString};
-    
+
     if (isReactBridgeInitialized) {
         [[NSNotificationCenter defaultCenter] postNotificationName:@"onPushRegister" object:nil userInfo:pushToken];
     } else {

package/package.json

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

package/src/Netmera.ts

@@ -4,10 +4,10 @@
 
 import {
   AppRegistry,
+  DeviceEventEmitter,
   NativeEventEmitter,
   NativeModules,
   NativeModulesStatic,
-  Platform,
 } from "react-native";
 import NetmeraUser from "./models/NetmeraUser";
 import NetmeraEvent from "./models/NetmeraEvent";
@@ -19,6 +19,7 @@ import NMInboxStatusCountFilter from "./models/NMInboxStatusCountFilter";
 import NMCategoryPreference from "./models/NMCategoryPreference";
 import { NMInboxStatus } from "./models/NMInboxStatus";
 import NetmeraCouponObject from "./models/NetmeraCouponObject";
+import { isAndroid } from "./utils/DeviceUtils";
 
 const { RNNetmera, RNNetmeraRCTEventEmitter }: NativeModulesStatic =
   NativeModules;
@@ -36,7 +37,7 @@ export default class Netmera {
     onCarouselObjectSelected?: (message: string) => Promise<void>
   ) => {
     if (onPushRegister) {
-      if (Platform.OS === "android") {
+      if (isAndroid()) {
         AppRegistry.registerHeadlessTask(
           "onPushRegister",
           () => onPushRegister
@@ -46,28 +47,28 @@ export default class Netmera {
       }
     }
     if (onPushReceive) {
-      if (Platform.OS === "android") {
+      if (isAndroid()) {
         AppRegistry.registerHeadlessTask("onPushReceive", () => onPushReceive);
       } else {
         netmeraRCTEventEmitter.addListener("onPushReceive", onPushReceive);
       }
     }
     if (onPushOpen) {
-      if (Platform.OS === "android") {
+      if (isAndroid()) {
         AppRegistry.registerHeadlessTask("onPushOpen", () => onPushOpen);
       } else {
         netmeraRCTEventEmitter.addListener("onPushOpen", onPushOpen);
       }
     }
     if (onPushDismiss) {
-      if (Platform.OS === "android") {
+      if (isAndroid()) {
         AppRegistry.registerHeadlessTask("onPushDismiss", () => onPushDismiss);
       } else {
         netmeraRCTEventEmitter.addListener("onPushDismiss", onPushDismiss);
       }
     }
     if (onPushButtonClicked) {
-      if (Platform.OS === "android") {
+      if (isAndroid()) {
         AppRegistry.registerHeadlessTask(
           "onPushButtonClicked",
           () => onPushButtonClicked
@@ -75,7 +76,7 @@ export default class Netmera {
       }
     }
     if (onCarouselObjectSelected) {
-      if (Platform.OS === "android") {
+      if (isAndroid()) {
         AppRegistry.registerHeadlessTask(
           "onCarouselObjectSelected",
           () => onCarouselObjectSelected
@@ -84,6 +85,21 @@ export default class Netmera {
     }
   };
 
+  static onWidgetUrlTriggered = (handler: (url: string) => void) => {
+    if (isAndroid()) {
+      DeviceEventEmitter.addListener("onWidgetUrlTriggered", (eventData) => {
+        handler(eventData);
+      });
+    } else {
+      netmeraRCTEventEmitter.addListener(
+        "onWidgetUrlTriggered",
+        (eventData) => {
+          handler(eventData?.url);
+        }
+      );
+    }
+  };
+
   static currentExternalId = async (): Promise<string> => {
     return RNNetmera.currentExternalId();
   };
@@ -129,7 +145,7 @@ export default class Netmera {
   };
 
   static turnOffSendingEventAndUserUpdate = (turnOff: boolean) => {
-    if (Platform.OS === "android") {
+    if (isAndroid()) {
       RNNetmera.turnOffSendingEventAndUserUpdate(turnOff);
     }
   };
@@ -240,7 +256,7 @@ export default class Netmera {
     from?: string,
     data?: { [key: string]: string }
   ) => {
-    if (Platform.OS === "android" && data) {
+    if (isAndroid() && data) {
       data["google.c.sender.id"] = from ?? "";
       RNNetmera.onNetmeraPushMessageReceived(data);
     }
@@ -250,7 +266,7 @@ export default class Netmera {
     from?: string,
     data?: { [key: string]: string }
   ) => {
-    if (Platform.OS === "android" && data) {
+    if (isAndroid() && data) {
       data["_nm"] = JSON.stringify(data["_nm"]);
       data["from"] = from ?? "";
       RNNetmera.onNetmeraPushMessageReceived(data);
@@ -258,16 +274,12 @@ export default class Netmera {
   };
 
   static onNetmeraNewToken = (pushToken: string) => {
-    if (Platform.OS === "android") {
+    if (isAndroid()) {
       RNNetmera.onNetmeraNewToken(pushToken);
     }
   };
 
   static isNetmeraRemoteMessage(data?: { [key: string]: string }): boolean {
-    return (
-      Platform.OS === "android" &&
-      data != undefined &&
-      data.hasOwnProperty("_nm")
-    );
+    return isAndroid() && data != undefined && data.hasOwnProperty("_nm");
   }
 }

package/src/utils/DeviceUtils.ts

@@ -0,0 +1,9 @@
+import { Platform } from "react-native";
+
+export const isAndroid = () => {
+  return Platform.OS === "android";
+};
+
+export const isIos = () => {
+  return Platform.OS === "ios";
+};