react-native-netmera 1.3.2 → 1.3.6

package/android/src/main/java/com/{reactlibrary → netmera/reactnativesdk}/RNNetmeraPushBroadcastReceiver.java

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Netmera. All rights reserved.
 //
 
-package com.reactlibrary;
+package com.netmera.reactnativesdk;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -19,16 +19,16 @@ import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.netmera.NetmeraPushBroadcastReceiver;
 import com.netmera.NetmeraPushObject;
+import com.netmera.callbacks.NMPushActionCallbacks;
 
-import static com.reactlibrary.RNNetmeraPushHeadlessService.TASK_KEY;
-import static com.reactlibrary.RNNetmeraPushHeadlessService.TASK_MESSAGE;
+import static com.netmera.reactnativesdk.RNNetmeraPushHeadlessService.TASK_KEY;
+import static com.netmera.reactnativesdk.RNNetmeraPushHeadlessService.TASK_MESSAGE;
 
-public class RNNetmeraPushBroadcastReceiver extends NetmeraPushBroadcastReceiver {
+public class RNNetmeraPushBroadcastReceiver implements NMPushActionCallbacks {
 
     @Override
-    protected void onPushRegister(Context context, String gcmSenderId, String pushToken) {
+    public void onPushRegister(Context context, String gcmSenderId, String pushToken) {
         Bundle bundle = new Bundle();
         bundle.putString("gcmSenderId", gcmSenderId);
         bundle.putString("pushToken", pushToken);
@@ -36,52 +36,26 @@ public class RNNetmeraPushBroadcastReceiver extends NetmeraPushBroadcastReceiver
     }
 
     @Override
-    protected void onPushReceive(Context context, Bundle bundle, NetmeraPushObject netmeraPushObject) {
+    public void onPushReceive(Context context, Bundle bundle, NetmeraPushObject netmeraPushObject) {
         sendEvent(context, "onPushReceive", mergeMap(bundle, netmeraPushObject));
     }
 
     @Override
-    protected void onPushOpen(Context context, Bundle bundle, NetmeraPushObject netmeraPushObject) {
-        sendForegroundEvent("onPushOpen", mergeMap(bundle, netmeraPushObject));
-        sendBackgroundEvent(context, "onPushOpen", mergeMap(bundle, netmeraPushObject));
+    public void onPushOpen(Context context, Bundle bundle, NetmeraPushObject netmeraPushObject) {
+        sendEvent(context, "onPushOpen", mergeMap(bundle, netmeraPushObject));
     }
 
     @Override
-    protected void onPushDismiss(Context context, Bundle bundle, NetmeraPushObject netmeraPushObject) {
+    public void onPushDismiss(Context context, Bundle bundle, NetmeraPushObject netmeraPushObject) {
         sendEvent(context, "onPushDismiss", mergeMap(bundle, netmeraPushObject));
     }
 
     @Override
-    protected void onPushButtonClicked(Context context, Bundle bundle, NetmeraPushObject netmeraPushObject) {
+    public void onPushButtonClicked(Context context, Bundle bundle, NetmeraPushObject netmeraPushObject) {
         sendEvent(context, "onPushButtonClicked", mergeMap(bundle, netmeraPushObject));
     }
 
     private void sendEvent(Context context, String eventName, WritableMap map) {
-        if (RNNetmeraUtil.isAppInForeground(context)) {
-            sendForegroundEvent(eventName, map);
-            return;
-        }
-        sendBackgroundEvent(context, eventName, map);
-    }
-
-    private WritableMap mergeMap(Bundle bundle, NetmeraPushObject netmeraPushObject) {
-        WritableMap mapPushObject = RNNetmeraUtil.mapPushObject(netmeraPushObject);
-        WritableMap mapBundle = bundle != null ? Arguments.fromBundle(bundle) : null;
-        mapPushObject.merge(mapBundle);
-        return mapPushObject;
-    }
-
-    private void sendForegroundEvent(String eventName, WritableMap map) {
-        try {
-            ReactContext reactContext = RNNetmeraModule.reactContext;
-            reactContext
-                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                    .emit(eventName, map);
-        } catch (Exception e) {
-        }
-    }
-
-    private void sendBackgroundEvent(Context context, String eventName, WritableMap map) {
         try {
             Intent backgroundIntent = new Intent(context, RNNetmeraPushHeadlessService.class);
             backgroundIntent.putExtra(TASK_KEY, eventName);
@@ -91,10 +65,14 @@ public class RNNetmeraPushBroadcastReceiver extends NetmeraPushBroadcastReceiver
                 HeadlessJsTaskService.acquireWakeLockNow(context);
             }
         } catch (IllegalStateException ex) {
-            Log.d(
-                    "RNNetmera Background",
-                    "RNNetmera Background Event Exception"
-            );
+            Log.d("RNNetmera Background", "RNNetmera Background Event Exception");
         }
     }
+
+    private WritableMap mergeMap(Bundle bundle, NetmeraPushObject netmeraPushObject) {
+        WritableMap mapPushObject = RNNetmeraUtil.mapPushObject(netmeraPushObject);
+        WritableMap mapBundle = bundle != null ? Arguments.fromBundle(bundle) : null;
+        mapPushObject.merge(mapBundle);
+        return mapPushObject;
+    }
 }

package/android/src/main/java/com/{reactlibrary → netmera/reactnativesdk}/RNNetmeraPushHeadlessService.java

@@ -1,4 +1,4 @@
-package com.reactlibrary;
+package com.netmera.reactnativesdk;
 
 import android.content.Intent;
 import android.os.Bundle;

package/android/src/main/java/com/{reactlibrary → netmera/reactnativesdk}/RNNetmeraUser.java

@@ -6,7 +6,7 @@
 //  Copyright © 2019 Netmera. All rights reserved.
 //
 
-package com.reactlibrary;
+package com.netmera.reactnativesdk;
 
 import com.google.gson.annotations.SerializedName;
 import com.netmera.NetmeraUser;

package/android/src/main/java/com/{reactlibrary → netmera/reactnativesdk}/RNNetmeraUtil.java

@@ -6,10 +6,11 @@
 //  Copyright © 2019 Netmera. All rights reserved.
 //
 
-package com.reactlibrary;
+package com.netmera.reactnativesdk;
 
 import android.app.ActivityManager;
 import android.content.Context;
+import android.text.format.DateFormat;
 
 import androidx.annotation.Nullable;
 
@@ -24,6 +25,7 @@ import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.common.LifecycleState;
+import com.google.gson.Gson;
 import com.netmera.NetmeraPushObject;
 
 import org.json.JSONArray;
@@ -133,7 +135,7 @@ class RNNetmeraUtil {
                     break;
                 case Number:
                     if (readableMap.getDouble(key) % 1 == 0) {
-                        map.put(key, (long)readableMap.getDouble(key));
+                        map.put(key, (long) readableMap.getDouble(key));
                     } else {
                         map.put(key, readableMap.getDouble(key));
                     }
@@ -168,7 +170,7 @@ class RNNetmeraUtil {
                     break;
                 case Number:
                     if (readableArray.getDouble(i) % 1 == 0) {
-                        array[i] = (long)readableArray.getDouble(i);
+                        array[i] = (long) readableArray.getDouble(i);
                     } else {
                         array[i] = readableArray.getDouble(i);
                     }
@@ -197,70 +199,68 @@ class RNNetmeraUtil {
     }
 
     public static WritableMap mapPushObject(NetmeraPushObject pushObject) {
-           WritableMap pushObjectMap = Arguments.createMap();
-           pushObjectMap.putString("title", pushObject.getPushStyle().getContentTitle());
-           pushObjectMap.putString("subtitle", pushObject.getPushStyle().getContentText());
-           pushObjectMap.putString("body", pushObject.getPushStyle().getContentText());
-           pushObjectMap.putInt("pushType", pushObject.getPushType());
-           pushObjectMap.putString("pushId", pushObject.getPushId());
-           pushObjectMap.putString("pushInstanceId", pushObject.getPushInstanceId());
-           pushObjectMap.putString("sendDate", String.valueOf(pushObject.getSendDate()));
-           pushObjectMap.putInt("inboxStatus", pushObject.getInboxStatus());
-
-           try{
-               if (pushObject.getDeepLink() != null) {
-                   pushObjectMap.putString("deepLink", String.valueOf(pushObject.getDeepLink()));
-               }
-           }catch (UnsupportedOperationException e){
-
-           }
-
-           if (pushObject.getExternalId() != null) {
-               pushObjectMap.putString("externalId", pushObject.getExternalId());
-           }
-           if (pushObject.getCategories() != null && !pushObject.getCategories().isEmpty()) {
-               pushObjectMap.putArray("categories", Arguments.fromList(pushObject.getCategories()));
-           }
-           if (pushObject.getPushStyle().getBigPicturePath() != null) {
-               pushObjectMap.putString("mediaAttachmentURL", pushObject.getPushStyle().getBigPicturePath());
-           }
-           if (!pushObject.getCustomJson().isJsonNull() && pushObject.getCustomJson().size() > 0) {
-               try {
-                   JSONObject jsonObject = new JSONObject(pushObject.getCustomJson().toString());
-                   pushObjectMap.putMap("customJson", jsonToWritableMap(jsonObject));
-               } catch (Throwable e) {
-                   e.printStackTrace();
-               }
-           }
-
-           return pushObjectMap;
-     }
-
-    public static boolean isAppInForeground(Context context) {
-             ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-             if (activityManager == null) return false;
-
-             List<ActivityManager.RunningAppProcessInfo> appProcesses = activityManager.getRunningAppProcesses();
-             if (appProcesses == null) return false;
-
-             final String packageName = context.getPackageName();
-             for (ActivityManager.RunningAppProcessInfo appProcess : appProcesses) {
-                 if (
-                         appProcess.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
-                                 && appProcess.processName.equals(packageName)
-                 ) {
-                     ReactContext reactContext;
-
-                     try {
-                         reactContext = (ReactContext) context;
-                     } catch (ClassCastException exception) {
-                         return true;
-                     }
-
-                     return reactContext.getLifecycleState() == LifecycleState.RESUMED;
-                 }
-             }
-
-             return false;
-     }
+        WritableMap pushObjectMap = Arguments.createMap();
+        pushObjectMap.putInt("pushType", pushObject.getPushType());
+        pushObjectMap.putString("pushId", pushObject.getPushId());
+        pushObjectMap.putString("pushInstanceId", pushObject.getPushInstanceId());
+        pushObjectMap.putString("sendDate", String.valueOf(pushObject.getSendDate()));
+        pushObjectMap.putInt("inboxStatus", pushObject.getInboxStatus());
+        pushObjectMap.putString("category", pushObject.getCategory());
+
+        try {
+            if (pushObject.getDeepLink() != null) {
+                pushObjectMap.putString("deepLink", String.valueOf(pushObject.getDeepLink()));
+            }
+        } catch (UnsupportedOperationException ignored) {
+        }
+
+        if (pushObject.getExternalId() != null) {
+            pushObjectMap.putString("externalId", pushObject.getExternalId());
+        }
+        if (pushObject.getCategories() != null && !pushObject.getCategories().isEmpty()) {
+            pushObjectMap.putArray("categories", Arguments.fromList(pushObject.getCategories()));
+        }
+        if (pushObject.getPushStyle().getBigPicturePath() != null) {
+            pushObjectMap.putString("mediaAttachmentURL", pushObject.getPushStyle().getBigPicturePath());
+        }
+        if (!pushObject.getCustomJson().isJsonNull() && pushObject.getCustomJson().size() > 0) {
+            try {
+                JSONObject jsonObject = new JSONObject(pushObject.getCustomJson().toString());
+                pushObjectMap.putMap("customJson", jsonToWritableMap(jsonObject));
+            } catch (Throwable e) {
+                e.printStackTrace();
+            }
+        }
+
+        if (pushObject.getPopupExpirationTime() != null) {
+            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()));
+        }
+
+        if (pushObject.getSendDate() != null) {
+            pushObjectMap.putString("sendDate", String.valueOf(DateFormat.format("yyyy-MM-dd HH:mm:ss", pushObject.getSendDate())));
+        }
+
+        if (pushObject.getPushAction() != null) {
+            pushObjectMap.putString("pushAction", new Gson().toJson(pushObject.getPushAction()));
+        }
+
+        return pushObjectMap;
+    }
 }

package/index.js

@@ -1,9 +1,10 @@
-import {NativeModules, NativeEventEmitter, DeviceEventEmitter, Platform} from 'react-native'
+import {AppRegistry, NativeEventEmitter, NativeModules, Platform} from 'react-native'
 
 const {RNNetmera, RNNetmeraRCTEventEmitter} = NativeModules;
 
 const netmeraRCTEventEmitter = new NativeEventEmitter(RNNetmeraRCTEventEmitter);
 
+
 class Netmera {
 
     static get PUSH_OBJECT_STATUS_READ() {
@@ -26,49 +27,69 @@ class Netmera {
         return 7
     }
 
-    static addEventListener(type, handler) {
-        if (Platform.OS === 'android') {
-            DeviceEventEmitter.addListener(type, handler)
-        } else if (Platform.OS === 'ios') {
-            netmeraRCTEventEmitter.addListener(type, handler)
+    static initBroadcastReceiver(onPushRegister,
+                                 onPushReceive,
+                                 onPushOpen,
+                                 onPushDismiss,
+                                 onPushButtonClicked) {
+        if (onPushRegister) {
+            if (Platform.OS === 'android') {
+                AppRegistry.registerHeadlessTask("onPushRegister", () => onPushRegister);
+            } else {
+                netmeraRCTEventEmitter.addListener("onPushRegister", onPushRegister)
+            }
         }
-    }
-
-    static removeEventListener(type) {
-        if (Platform.OS === 'android') {
-            DeviceEventEmitter.removeListener(type)
-        } else if (Platform.OS === 'ios') {
-            netmeraRCTEventEmitter.removeListener(type)
+        if (onPushReceive) {
+            if (Platform.OS === 'android') {
+                AppRegistry.registerHeadlessTask("onPushReceive", () => onPushReceive);
+            } else {
+                netmeraRCTEventEmitter.addListener("onPushReceive", onPushReceive)
+            }
+        }
+        if (onPushOpen) {
+            if (Platform.OS === 'android') {
+                AppRegistry.registerHeadlessTask("onPushOpen", () => onPushOpen);
+            } else {
+                netmeraRCTEventEmitter.addListener("onPushOpen", onPushOpen)
+            }
+        }
+        if (onPushDismiss) {
+            if (Platform.OS === 'android') {
+                AppRegistry.registerHeadlessTask("onPushDismiss", () => onPushDismiss);
+            } else {
+                netmeraRCTEventEmitter.addListener("onPushDismiss", onPushDismiss)
+            }
+        }
+        if (onPushButtonClicked) {
+            if (Platform.OS === 'android') {
+                AppRegistry.registerHeadlessTask("onPushButtonClicked", () => onPushButtonClicked);
+            }
         }
     }
 
-    static init(gcmSenderId = "", apiKey) {
-        if (Platform.OS === "android") {
-            RNNetmera.init(gcmSenderId, apiKey)
-        } else if (Platform.OS === "ios") {
-            RNNetmera.init(apiKey)
-        }
+    static async currentExternalId(): Promise<string> {
+        return RNNetmera.currentExternalId()
     }
 
-    static requestPushNotificationAuthorization() {
-        if (Platform.OS === "ios") {
-            RNNetmera.requestPushNotificationAuthorization()
-        }
+    static logging(enabled: boolean) {
+        RNNetmera.logging(enabled)
     }
 
-    static setBaseUrl(baseUrl) {
+    static setBaseUrl(baseUrl: string) {
         RNNetmera.setBaseUrl(baseUrl)
     }
 
-    static logging(enabled) {
-        RNNetmera.logging(enabled)
+    static requestPushNotificationAuthorization() {
+        if (Platform.OS === "ios") {
+            RNNetmera.requestPushNotificationAuthorization()
+        }
     }
 
     static requestPermissionsForLocation() {
         RNNetmera.requestPermissionsForLocation()
     }
 
-    static setNetmeraMaxActiveRegions(maxActiveRegions) {
+    static setNetmeraMaxActiveRegions(maxActiveRegions: number) {
         RNNetmera.setNetmeraMaxActiveRegions(maxActiveRegions)
     }
 
@@ -80,7 +101,7 @@ class Netmera {
         RNNetmera.disablePopupPresentation()
     }
 
-    static isPushEnabled() {
+    static async isPushEnabled(): Promise<boolean> {
         return RNNetmera.isPushEnabled()
     }
 
@@ -92,35 +113,67 @@ class Netmera {
         RNNetmera.disablePush()
     }
 
-    static turnOffSendingEventAndUserUpdate(turnOff) {
+    static turnOffSendingEventAndUserUpdate(turnOff: boolean) {
         if (Platform.OS === 'android') {
             RNNetmera.turnOffSendingEventAndUserUpdate(turnOff)
         }
     }
 
-    static fetchInbox(netmeraInboxFilter) {
+    static fetchInbox(netmeraInboxFilter: NetmeraInboxFilter): Promise<Array<NetmeraPushInbox>> {
         return RNNetmera.fetchInbox(netmeraInboxFilter)
     }
 
-    static fetchNextPage() {
+    static fetchNextPage(): Promise<Array<NetmeraPushInbox>> {
         return RNNetmera.fetchNextPage();
     }
 
-    static inboxUpdateStatus(fromIndex, toIndex, status = this.PUSH_OBJECT_STATUS_UNREAD) {
+    static countForStatus(status = this.PUSH_OBJECT_STATUS_UNREAD) {
+        return RNNetmera.countForStatus(status)
+    }
+
+    static inboxUpdateStatus(fromIndex: number, toIndex: number, status: number = this.PUSH_OBJECT_STATUS_UNREAD) {
         return RNNetmera.inboxUpdateStatus(fromIndex, toIndex, status)
     }
 
-    static countForStatus(status = this.PUSH_OBJECT_STATUS_UNREAD) {
-        return RNNetmera.countForStatus(status)
+    static fetchCategory(categoryFilter: NetmeraCategoryFilter): Promise<Array<NetmeraCategory>> {
+        return RNNetmera.fetchCategory(categoryFilter)
+    }
+
+    static fetchNextCategoryPage(): Promise<Array<NetmeraCategory>> {
+        return RNNetmera.fetchNextCategoryPage();
     }
 
     static sendEvent(event) {
         RNNetmera.sendEvent(event)
     }
 
-    static updateUser(user) {
+    static updateUser(user: NetmeraUser) {
         RNNetmera.updateUser(user)
     }
+
+    static updateAll(inboxStatus: number) {
+        return RNNetmera.updateAll(inboxStatus)
+    }
+
+    static handlePushObject(pushId: string) {
+        RNNetmera.handlePushObject(pushId)
+    }
+
+    static handleInteractiveAction(pushId: string) {
+        RNNetmera.handleInteractiveAction(pushId)
+    }
+
+    static setApiKey(apiKey: string) {
+        RNNetmera.setApiKey(apiKey)
+    }
+
+    static handleLastMessage(categoryName: string) {
+        RNNetmera.handleLastMessage(categoryName)
+    }
+
+    static updateStatusByCategories(fromIndex: number, toIndex: number, status: number = this.PUSH_OBJECT_STATUS_UNREAD) {
+        return RNNetmera.updateStatusByCategories(fromIndex, toIndex, status)
+    }
 }
 
 
@@ -226,4 +279,42 @@ class NetmeraInboxFilter {
     }
 }
 
-module.exports = {Netmera, NetmeraUser, NetmeraInboxFilter};
+class NetmeraCategoryFilter {
+    constructor() {
+        this.pageSize = undefined;
+        this.status = undefined;
+        this.includeExpiredObjects = false;
+    }
+}
+
+class NetmeraPushInbox {
+    title: string
+    subtitle: string
+    body: string
+    pushType: number
+    pushId: string
+    pushInstanceId: string
+    sendDate: string
+    inboxStatus: number
+    deepLink: string
+    webPage: string
+    externalId: string
+    customJson: any
+    pushAction: string
+    carousel: any
+    mediaAttachmentURL: string
+    category: string
+    categories: any
+    interactiveActions: string
+    expireTime: string
+}
+
+class NetmeraCategory {
+    categoryName: string
+    lastMessage: NetmeraPushInbox
+    readCount: number
+    deletedCount: number
+    unreadCount: number
+}
+
+module.exports = {Netmera, NetmeraUser, NetmeraInboxFilter, NetmeraCategoryFilter, NetmeraPushInbox, NetmeraCategory};

package/ios/RNNetmera.h

@@ -20,7 +20,13 @@
 
 @interface RNNetmera : NSObject <RCTBridgeModule>
 
++(void)initNetmera:(nullable NSString *)apiKey;
++(void)logging:(BOOL)enabled;
++(void)setPushDelegate:(nonnull NSObject<NetmeraPushDelegate> *)delegate;
++(void)requestPushNotificationAuthorization;
+
 @property (nonatomic, strong) NetmeraInbox  *netmeraInbox;
+@property (nonatomic, strong) NetmeraInboxCategory  *netmeraInboxCategory;
 
 @end