react-native-netmera 1.3.4 → 1.3.5

package/android/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -7,7 +7,7 @@
 7    <uses-sdk
 8        android:minSdkVersion="16"
 8-->/Users/ensarbayhan/Projects/react-native/netmera-sdk-react-native/android/src/main/AndroidManifest.xml
-9        android:targetSdkVersion="28" />
+9        android:targetSdkVersion="29" />
 9-->/Users/ensarbayhan/Projects/react-native/netmera-sdk-react-native/android/src/main/AndroidManifest.xml
 10
 11    <application>

package/android/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt

@@ -740,6 +740,7 @@ color emui_color_gray_10
 color emui_color_gray_7
 color error_color_material_dark
 color error_color_material_light
+color fcm_test_color
 color foreground_material_dark
 color foreground_material_light
 color highlighted_text_material_dark
@@ -1016,6 +1017,9 @@ drawable abc_textfield_search_activated_mtrl_alpha
 drawable abc_textfield_search_default_mtrl_alpha
 drawable abc_textfield_search_material
 drawable abc_vector_test
+drawable adaptive_icon
+drawable adaptive_icon_background
+drawable adaptive_icon_foreground
 drawable btn_checkbox_checked_mtrl
 drawable btn_checkbox_checked_to_unchecked_mtrl_animation
 drawable btn_checkbox_unchecked_mtrl
@@ -1043,11 +1047,14 @@ drawable common_google_signin_btn_text_light
 drawable common_google_signin_btn_text_light_focused
 drawable common_google_signin_btn_text_light_normal
 drawable common_google_signin_btn_text_light_normal_background
+drawable gcm_icon
+drawable gcm_icon2
 drawable googleg_disabled_color_18
 drawable googleg_standard_color_18
 drawable ic_carousel_next_icon
 drawable ic_carousel_prev_icon
 drawable ic_umbrella_background
+drawable icon_with_gradient
 drawable netmera_bg_in_app_message
 drawable netmera_ic_action_cancel
 drawable netmera_ic_action_transparent
@@ -1162,6 +1169,7 @@ id blocking
 id bottom
 id bounce
 id buttonPanel
+id callMeasure
 id cancel_action
 id cancel_bg
 id cancel_imageview
@@ -1515,6 +1523,8 @@ layout select_dialog_singlechoice_material
 layout support_simple_spinner_dropdown_item
 layout upsdk_app_dl_progress_dialog
 layout upsdk_ota_update_view
+raw gcm_bip
+raw keep
 string abc_action_bar_home_description
 string abc_action_bar_up_description
 string abc_action_menu_overflow_description
@@ -1606,7 +1616,9 @@ string common_google_play_services_wear_update_text
 string common_open_on_phone
 string common_signin_button_text
 string common_signin_button_text_long
+string fcm_2_args
 string fcm_fallback_notification_channel_label
+string fcm_no_args
 string header_description
 string hms_abort
 string hms_abort_message
@@ -1863,6 +1875,7 @@ style NetmeraThemeAlertDialog
 style Netmera_Theme_Transparent
 style Netmera_Theme_Transparent_Dim
 style Netmera_Theme_Transparent_Dim_Dialog
+style Netmera_Theme_Transparent_Webview
 style Platform_AppCompat
 style Platform_AppCompat_Light
 style Platform_ThemeOverlay_AppCompat

package/android/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }
@@ -16,8 +16,6 @@ android {
 }
 
 dependencies {
-    implementation platform('com.google.firebase:firebase-bom:26.0.0')
-    implementation 'com.google.firebase:firebase-messaging'
-    implementation 'com.netmera:netmera:3.8.14'
+    implementation 'com.netmera:netmera:3.8.21'
     implementation 'com.facebook.react:react-native:+'
 }

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

@@ -4,23 +4,19 @@ import android.content.ContentValues;
 import android.content.Context;
 
 import com.netmera.Netmera;
+import com.netmera.NetmeraConfiguration;
 
 public class RNNetmera {
 
-    public static void initNetmera(Context context, final String gcmSenderId, final String apiKey) {
-        Netmera.init(context, gcmSenderId, apiKey);
-        setNetmeraHeaders();
-    }
-
-    public static void initForBothProviders(Context context, String firebaseSenderId, String hmsSenderId, String apiKey) {
-        Netmera.initForBothProviders(context, firebaseSenderId, hmsSenderId, apiKey);
+    public static void initNetmera(RNNetmeraConfiguration netmeraConfiguration) {
+        Netmera.init(netmeraConfiguration.getNetmeraConfiguration());
         setNetmeraHeaders();
     }
 
     static void setNetmeraHeaders() {
         ContentValues headerValues = new ContentValues();
         headerValues.put("X-netmera-framework", "react");
-        headerValues.put("X-netmera-frameworkV", "1.3.4");
+        headerValues.put("X-netmera-frameworkV", "1.3.5");
         Netmera.setNetmeraHeaders(headerValues);
     }
 

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

@@ -0,0 +1,56 @@
+package com.netmera.reactnativesdk;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.netmera.NetmeraCategory;
+import com.netmera.NetmeraCategoryFilter;
+
+import java.util.List;
+
+public class RNNetmeraCategoryObject {
+
+    static WritableArray mapCategoryObjects(List<NetmeraCategory> categoryObjects) {
+        WritableArray writableArray = Arguments.createArray();
+        for (NetmeraCategory category : categoryObjects) {
+            writableArray.pushMap(getCategoryObjectMap(category));
+        }
+        return writableArray;
+    }
+
+    private static WritableMap getCategoryObjectMap(NetmeraCategory category) {
+        WritableMap map = Arguments.createMap();
+        map.putString("categoryName", category.getCategoryName());
+        map.putString("categoryStatus", new Gson().toJson(category.getStatus(), JsonObject.class));
+        map.putInt("readCount", category.getReadCount());
+        map.putInt("unreadCount", category.getUnReadCount());
+        map.putInt("deletedCount", category.getDeletedCount());
+        map.putMap("lastMessage", RNNetmeraUtil.mapPushObject(category.getLastMessage()));
+
+        return map;
+    }
+
+    static NetmeraCategoryFilter getInboxObject(ReadableMap map) {
+        NetmeraCategoryFilter.Builder builder = new NetmeraCategoryFilter.Builder();
+
+        if (map.hasKey("status")) {
+            int status = map.getInt("status");
+            builder.status(status);
+        }
+
+        if (map.hasKey("pageSize")) {
+            int pageSize = map.getInt("pageSize");
+            builder.pageSize(pageSize);
+        }
+
+        if (map.hasKey("includeExpiredObjects")) {
+            boolean includeExpiredObjects = map.getBoolean("includeExpiredObjects");
+            builder.includeExpiredObjects(includeExpiredObjects);
+        }
+
+        return builder.build();
+    }
+}

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

@@ -0,0 +1,128 @@
+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;
+
+public class RNNetmeraConfiguration {
+
+    NMInAppMessageActionCallbacks nmInAppMessageActionCallbacks;
+    NMPushActionCallbacks nmPushActionCallbacks;
+    Context context;
+    String baseUrl;
+    FirebaseApp firebaseApp;
+    String huaweiSenderId;
+    String apiKey;
+    String firebaseSenderId;
+    boolean logging;
+
+    private RNNetmeraConfiguration(Builder builder) {
+        this.nmInAppMessageActionCallbacks = builder.nmInAppMessageActionCallbacks;
+        this.nmPushActionCallbacks = builder.nmPushActionCallbacks;
+        this.context = builder.context;
+        this.baseUrl = builder.baseUrl;
+        this.firebaseApp = builder.firebaseApp;
+        this.huaweiSenderId = builder.huaweiSenderId;
+        this.apiKey = builder.apiKey;
+        this.firebaseSenderId = builder.firebaseSenderId;
+        this.logging = builder.logging;
+    }
+
+    NetmeraConfiguration getNetmeraConfiguration() {
+        NMPushActionCallbacks nmPushActionCallbacks =
+                this.nmPushActionCallbacks != null ?
+                        this.nmPushActionCallbacks :
+                        new RNNetmeraPushBroadcastReceiver();
+
+        NetmeraConfiguration.Builder builder = new NetmeraConfiguration.Builder();
+
+        if (firebaseSenderId != null) {
+            builder.firebaseSenderId(firebaseSenderId);
+        }
+
+        if (huaweiSenderId != null) {
+            builder.huaweiSenderId(huaweiSenderId);
+        }
+
+        if (apiKey != null) {
+            builder.apiKey(apiKey);
+        }
+
+        if (baseUrl != null) {
+            builder.baseUrl(baseUrl);
+        }
+
+        if (firebaseApp != null) {
+            builder.firebaseApp(firebaseApp);
+        }
+
+        if (nmInAppMessageActionCallbacks != null) {
+            builder.nmInAppMessageActionCallbacks(nmInAppMessageActionCallbacks);
+        }
+
+        return builder.logging(logging)
+                .disableSerializeRule(true)
+                .nmPushActionCallbacks(nmPushActionCallbacks)
+                .build(context);
+    }
+
+    public static class Builder {
+        private NMInAppMessageActionCallbacks nmInAppMessageActionCallbacks;
+        private NMPushActionCallbacks nmPushActionCallbacks;
+        private Context context;
+        private String baseUrl;
+        private FirebaseApp firebaseApp;
+        private String huaweiSenderId;
+        private String apiKey;
+        private String firebaseSenderId;
+        private boolean logging;
+
+        public Builder nmInAppMessageActionCallbacks(NMInAppMessageActionCallbacks nmInAppMessageActionCallbacks) {
+            this.nmInAppMessageActionCallbacks = nmInAppMessageActionCallbacks;
+            return this;
+        }
+
+        public Builder nmPushActionCallbacks(NMPushActionCallbacks nmPushActionCallbacks) {
+            this.nmPushActionCallbacks = nmPushActionCallbacks;
+            return this;
+        }
+
+        public Builder baseUrl(String baseUrl) {
+            this.baseUrl = baseUrl;
+            return this;
+        }
+
+        public Builder firebaseApp(FirebaseApp firebaseApp) {
+            this.firebaseApp = firebaseApp;
+            return this;
+        }
+
+        public Builder huaweiSenderId(String huaweiSenderId) {
+            this.huaweiSenderId = huaweiSenderId;
+            return this;
+        }
+
+        public Builder apiKey(String apiKey) {
+            this.apiKey = apiKey;
+            return this;
+        }
+
+        public Builder firebaseSenderId(String firebaseSenderId) {
+            this.firebaseSenderId = firebaseSenderId;
+            return this;
+        }
+
+        public Builder logging(boolean logging) {
+            this.logging = logging;
+            return this;
+        }
+
+        public RNNetmeraConfiguration build(Context context) {
+            this.context = context;
+            return new RNNetmeraConfiguration(this);
+        }
+    }
+}

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

@@ -14,11 +14,15 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.netmera.Netmera;
+import com.netmera.NetmeraCategory;
 import com.netmera.NetmeraError;
 import com.netmera.NetmeraInbox;
+import com.netmera.NetmeraInboxCategory;
 import com.netmera.NetmeraInboxFilter;
+import com.netmera.NetmeraInteractiveAction;
 import com.netmera.NetmeraPushObject;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -38,10 +42,14 @@ public class RNNetmeraModule extends ReactContextBaseJavaModule {
     private static final String ERROR_MESSAGE_NOT_NEXT_PAGE = "Not next page";
     private static final String ERROR_CODE_UPDATE_STATUS = "2019";
     private static final String ERROR_MESSAGE_UPDATE_STATUS = "There was a problem updating status";
-
+    private static final String ERROR_CODE_NULL_CATEGORY = "2020";
+    private static final String ERROR_MESSAGE_NULL_CATEGORY = "Must call fetchCategory method first";
+    private static final String ERROR_CODE_INVALID_PUSH_OBJECT = "2021";
+    private static final String ERROR_MESSAGE_INVALID_PUSH_OBJECT = "Received NetmeraPushObject was not valid.";
 
     public static ReactApplicationContext reactContext;
     private NetmeraInbox netmeraInbox;
+    private NetmeraInboxCategory netmeraInboxCategory;
 
     public RNNetmeraModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -53,11 +61,6 @@ public class RNNetmeraModule extends ReactContextBaseJavaModule {
         return "RNNetmera";
     }
 
-    @ReactMethod
-    public void initNetmera(final String gcmSenderId, final String apiKey) {
-        RNNetmera.initNetmera(reactContext, gcmSenderId, apiKey);
-    }
-
     @ReactMethod
     public void currentExternalId(final Promise promise) {
         promise.resolve(Netmera.getCurrentExternalId());
@@ -201,9 +204,34 @@ public class RNNetmeraModule extends ReactContextBaseJavaModule {
         }
     }
 
-//    TODO
-//    fetchCategory
-//    fetchNextCategoryPage
+    @ReactMethod
+    public void fetchCategory(ReadableMap readableMap, final Promise promise) {
+        Netmera.fetchCategory(RNNetmeraCategoryObject.getInboxObject(readableMap), new NetmeraInboxCategory.NetmeraInboxCategoryCallback() {
+            @Override
+            public void onFetchCategory(NetmeraInboxCategory netmeraInboxCategory, NetmeraError netmeraError) {
+                setCategory(netmeraInboxCategory, netmeraError, promise);
+            }
+        });
+    }
+
+    @ReactMethod
+    public void fetchNextCategoryPage(final Promise promise) {
+        if (netmeraInboxCategory == null) {
+            promise.reject(ERROR_CODE_NULL_CATEGORY, ERROR_MESSAGE_NULL_CATEGORY);
+            return;
+        }
+
+        if (netmeraInboxCategory.hasNextPage()) {
+            netmeraInboxCategory.fetchNextPage(new NetmeraInboxCategory.NetmeraInboxCategoryCallback() {
+                @Override
+                public void onFetchCategory(NetmeraInboxCategory netmeraInboxCategory, NetmeraError netmeraError) {
+                    setCategory(netmeraInboxCategory, netmeraError, promise);
+                }
+            });
+        } else {
+            promise.reject(ERROR_CODE_NOT_NEXT_PAGE, ERROR_MESSAGE_NOT_NEXT_PAGE);
+        }
+    }
 
     @ReactMethod
     public void sendEvent(ReadableMap readableMap) {
@@ -244,14 +272,106 @@ public class RNNetmeraModule extends ReactContextBaseJavaModule {
         Netmera.updateUser(netmeraUser);
     }
 
-//    TODO
-//    initializeService
-//    setApiKey
-//    handlePushObject
-//    handleLastMessage
-//    handleInteractiveAction
-//    updateStatusByCategories
-//    updateAll
+    @ReactMethod
+    public void handlePushObject(String pushId) {
+        if (netmeraInbox == null) {
+            return;
+        }
+
+        for (NetmeraPushObject pushObject : netmeraInbox.pushObjects()) {
+            if (pushObject.getPushId().equals(pushId)) {
+                Netmera.handlePushObject(reactContext.getCurrentActivity(), pushObject);
+                break;
+            }
+        }
+    }
+
+    @ReactMethod
+    public void handleInteractiveAction(String interactiveActionId) {
+        if (netmeraInbox == null) {
+            return;
+        }
+
+        for (NetmeraPushObject pushObject : netmeraInbox.pushObjects()) {
+            if (pushObject.getInteractiveActions() != null) {
+                for (NetmeraInteractiveAction action : pushObject.getInteractiveActions()) {
+                    if (action.getId().equals(interactiveActionId)) {
+                        Netmera.handleInteractiveAction(reactContext, action);
+                        return;
+                    }
+                }
+            }
+        }
+    }
+
+    @ReactMethod
+    public void setApiKey(String apiKey) {
+        Netmera.setApiKey(apiKey);
+    }
+
+
+    @ReactMethod
+    public void handleLastMessage(String categoryName, final Promise promise) {
+        if (netmeraInboxCategory == null) {
+            promise.reject(ERROR_CODE_NULL_CATEGORY, ERROR_MESSAGE_NULL_CATEGORY);
+            return;
+        }
+
+        if (categoryName == null || categoryName.isEmpty()) {
+            promise.reject(ERROR_CODE_INVALID_PUSH_OBJECT, ERROR_MESSAGE_INVALID_PUSH_OBJECT);
+            return;
+        }
+
+        for (NetmeraCategory category : netmeraInboxCategory.categories()) {
+            if (categoryName.equals(category.getCategoryName())) {
+                Netmera.handlePushObject(reactContext.getCurrentActivity(), category.getLastMessage());
+                break;
+            }
+        }
+    }
+
+    @ReactMethod
+    public void updateStatusByCategories(final int fromIndex, final int toIndex, final int status, final Promise promise) {
+        if (netmeraInboxCategory == null) {
+            promise.reject(ERROR_CODE_NULL_CATEGORY, ERROR_MESSAGE_NULL_CATEGORY);
+            return;
+        }
+
+        try {
+            List<String> categoryNames = new ArrayList<>();
+
+            for (NetmeraCategory category : netmeraInboxCategory.categories().subList(fromIndex, toIndex)) {
+                categoryNames.add(category.getCategoryName());
+            }
+
+            Netmera.updateStatusByCategories(status, categoryNames, new NetmeraInbox.NetmeraInboxStatusCallback() {
+                @Override
+                public void onSetStatusInbox(NetmeraError netmeraError) {
+                    if (netmeraError == null) {
+                        promise.resolve(null);
+                    } else {
+                        promise.reject(ERROR_CODE_UPDATE_STATUS, ERROR_MESSAGE_UPDATE_STATUS);
+                    }
+                }
+            });
+        } catch (IndexOutOfBoundsException e) {
+            promise.reject("", e.getMessage());
+        }
+    }
+
+    @ReactMethod
+    public void updateAll(int inboxStatus, final Promise promise) {
+        Netmera.updateAll(inboxStatus, new NetmeraInbox.NetmeraInboxStatusCallback() {
+            @Override
+            public void onSetStatusInbox(NetmeraError netmeraError) {
+                if (netmeraError != null) {
+                    promise.reject(ERROR_CODE_UPDATE_STATUS, ERROR_MESSAGE_UPDATE_STATUS);
+                } else {
+                    promise.resolve(true);
+                }
+            }
+        });
+    }
 
     private void setInbox(NetmeraInbox inbox, NetmeraError netmeraError, Promise promise) {
         netmeraInbox = inbox;
@@ -262,6 +382,15 @@ public class RNNetmeraModule extends ReactContextBaseJavaModule {
         promise.resolve(RNNetmeraUtil.mapPushObjects(inbox.pushObjects()));
     }
 
+    private void setCategory(NetmeraInboxCategory nmInboxCategory, NetmeraError netmeraError, Promise promise) {
+        if (netmeraError != null) {
+            promise.reject(ERROR_CODE_NULL_INBOX, ERROR_MESSAGE_NULL_INBOX);
+            return;
+        }
+        netmeraInboxCategory = nmInboxCategory;
+        promise.resolve(RNNetmeraCategoryObject.mapCategoryObjects(netmeraInboxCategory.categories()));
+    }
+
     private boolean hasKey(Map map, String key) {
         return map.containsKey(key) && map.get(key) != null;
     }

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

@@ -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.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;
+    }
 }