inbox: add pushPayload property to IInboxNotification

Author: ThomasMengelatte

CHANGELOG.md

@@ -1,3 +1,9 @@
+INCOMING
+----
+
+**Inbox**
+- Added `pushPayload` property to `IInboxNotification`.
+
 12.0.0
 ----
 

android/src/main/java/com/batch/batch_rn/RNBatchInbox.java

@@ -1,8 +1,10 @@
 package com.batch.batch_rn;
 
+import android.os.Bundle;
 import android.util.Log;
 
 import com.batch.android.BatchInboxNotificationContent;
+import com.batch.android.BatchPushPayload;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
@@ -11,6 +13,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -72,6 +75,73 @@ private static WritableMap getWritableMapNotification(BatchInboxNotificationCont
 
         output.putMap("payload", RNUtils.convertMapToWritableMap((Map) notification.getRawPayload()));
         output.putBoolean("hasLandingMessage", notification.hasLandingMessage());
+        output.putMap("pushPayload", buildPushPayload(notification));
+
         return output;
     }
+
+    private static WritableMap buildPushPayload(BatchInboxNotificationContent notification)
+    {
+        WritableMap pushPayloadMap = new WritableNativeMap();
+        try {
+            BatchPushPayload pushPayload = notification.getPushPayload();
+            Map<String, String> rawPayload = (Map<String, String>) notification.getRawPayload();
+            String batchDataStr = rawPayload.get("com.batch");
+
+            boolean isPositiveAction = checkHasScheme(batchDataStr) || pushPayload.getDeeplink() != null;
+            pushPayloadMap.putBoolean("isPositiveAction", isPositiveAction);
+
+            WritableMap batchDataMap = jsonStringToMap(batchDataStr);
+            pushPayloadMap.putMap("pushPayload", batchDataMap);
+
+            String deeplink = pushPayload.getDeeplink();
+            if (deeplink != null) {
+                pushPayloadMap.putString("deeplink", deeplink);
+            } else {
+                pushPayloadMap.putNull("deeplink");
+            }
+        } catch (BatchPushPayload.ParsingException e) {
+            Log.d(TAG, "Failed to parse push payload: " + e.getMessage());
+            pushPayloadMap.putBoolean("isPositiveAction", false);
+            pushPayloadMap.putMap("pushPayload", new WritableNativeMap());
+            pushPayloadMap.putNull("deeplink");
+        }
+        return pushPayloadMap;
+    }
+
+    private static WritableMap jsonStringToMap(String jsonStr)
+    {
+        if (jsonStr == null) {
+            return new WritableNativeMap();
+        }
+
+        try {
+            JSONObject jsonObj = new JSONObject(jsonStr);
+            Map<String, Object> map = new HashMap<>();
+            java.util.Iterator<String> keys = jsonObj.keys();
+            while (keys.hasNext()) {
+                String key = keys.next();
+                map.put(key, jsonObj.get(key));
+            }
+            return RNUtils.convertMapToWritableMap(map);
+        } catch (JSONException e) {
+            Log.d(TAG, "Failed to parse JSON string: " + e.getMessage());
+            return new WritableNativeMap();
+        }
+    }
+
+    private static boolean checkHasScheme(String batchDataStr)
+    {
+        if (batchDataStr == null) {
+            return false;
+        }
+        try {
+            JSONObject batchDataJson = new JSONObject(batchDataStr);
+            String scheme = batchDataJson.optString("l", "");
+            return !scheme.isEmpty();
+        } catch (JSONException e) {
+            Log.d(TAG, "Could not parse batch data: " + e.getMessage());
+            return false;
+        }
+    }
 }

ios/RNBatch.mm

@@ -916,7 +916,8 @@ - (NSDictionary*) dictionaryWithNotification:(BatchInboxNotificationContent*)not
         @"date": [NSNumber numberWithDouble:notification.date.timeIntervalSince1970 * 1000],
         @"source": source,
         @"payload": notification.payload,
-        @"hasLandingMessage": @(notification.hasLandingMessage)
+        @"hasLandingMessage": @(notification.hasLandingMessage),
+        @"pushPayload": [self dictionaryForPushPayload:notification.payload]
     };
 
     NSMutableDictionary *mutableOutput = [output mutableCopy];
@@ -926,8 +927,52 @@ - (NSDictionary*) dictionaryWithNotification:(BatchInboxNotificationContent*)not
     if (body != nil) {
         mutableOutput[@"body"] = body;
     }
-    output = mutableOutput;
-    return output;
+    return [mutableOutput copy];
+}
+
+- (NSDictionary*) dictionaryForPushPayload:(NSDictionary*)payload
+{
+    NSMutableDictionary *pushPayloadDict = [NSMutableDictionary new];
+
+    NSString *deeplink = nil;
+    BOOL isPositiveAction = NO;
+    id batchData = @{};
+
+    if ([payload isKindOfClass:[NSDictionary class]]) {
+        batchData = payload[@"com.batch"] ?: @{};
+
+        deeplink = [self extractDeeplinkFromBatchData:batchData];
+
+        if (!deeplink) {
+            id rootDeeplink = payload[@"deeplink"];
+            if (rootDeeplink && [rootDeeplink isKindOfClass:[NSString class]]) {
+                deeplink = (NSString *)rootDeeplink;
+            }
+        }
+
+        isPositiveAction = (deeplink != nil && [deeplink length] > 0);
+    }
+
+    pushPayloadDict[@"isPositiveAction"] = @(isPositiveAction);
+    pushPayloadDict[@"pushPayload"] = batchData;
+    pushPayloadDict[@"deeplink"] = deeplink ? deeplink : [NSNull null];
+
+    return [pushPayloadDict copy];
+}
+
+- (NSString*) extractDeeplinkFromBatchData:(id)batchData
+{
+    if (![batchData isKindOfClass:[NSDictionary class]]) {
+        return nil;
+    }
+
+    NSDictionary *batchDict = (NSDictionary *)batchData;
+    id deepLinkValue = batchDict[@"l"];
+    if (deepLinkValue && [deepLinkValue isKindOfClass:[NSString class]]) {
+        return (NSString *)deepLinkValue;
+    }
+
+    return nil;
 }
 
 // Messaging module

src/BatchInbox.ts

@@ -1,4 +1,5 @@
 import { BatchInboxFetcher } from './BatchInboxFetcher';
+import { BatchPushEventPayload } from './BatchPush';
 
 const RNBatch = require('./NativeRNBatchModule').default;
 
@@ -34,6 +35,11 @@ export interface IInboxNotification {
    */
   payload: unknown;
 
+  /**
+   * Push payload associated with this notification
+   */
+  pushPayload: BatchPushEventPayload;
+
   /**
    * Date at which the push notification has been sent to the device
    */