Merge pull request #55 from vborisov/master

Allow adding of the extra data parameter to the notification response

Author: Humni

android/src/main/java/com/b8ne/RNPusherPushNotifications/NotificationsMessagingService.java

@@ -0,0 +1,74 @@
+package com.b8ne.RNPusherPushNotifications;
+
+import android.app.Activity;
+
+import android.os.Handler;
+import android.os.Bundle;
+import android.os.Looper;
+import android.content.Intent;
+
+import java.util.Map;
+
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+
+public class NotificationsMessagingService {
+
+    private static String notificationEvent = "notification";
+    private static ReactContext context;
+    private static ReactInstanceManager reactInstanceManager;
+
+    public static void read(final ReactInstanceManager reactInstanceManager, Activity reactActivity) {
+        Intent intent = reactActivity.getIntent();
+        final WritableMap map = new WritableNativeMap();
+
+        boolean launchedFromHistory = intent != null ? (intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) != 0 : false;
+
+        Bundle extras = intent.getExtras();
+        if (!launchedFromHistory & extras != null) {
+            WritableMap payload = Arguments.createMap();
+
+            for (String key : extras.keySet()) {
+                Object value = extras.get(key);
+                payload.putString(key, value.toString());
+            }
+            map.putMap("data", payload);
+
+            if (payload != null) {
+                // We need to run this on the main thread, as the React code assumes that is true.
+                // Namely, DevServerHelper constructs a Handler() without a Looper, which triggers:
+                // "Can't create handler inside thread that has not called Looper.prepare()"
+                Handler handler = new Handler(Looper.getMainLooper());
+                handler.post(new Runnable() {
+                    public void run() {
+                        // Construct and load our normal React JS code data
+                        // ReactInstanceManager reactInstanceManager = ((ReactApplication) getApplication()).getReactNativeHost().getReactInstanceManager();
+                        ReactContext context = reactInstanceManager.getCurrentReactContext();
+                        // If it's constructed, send a notification
+                        if (context != null) {
+                            context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                                    .emit(notificationEvent, map);
+                        } else {
+                            // Otherwise wait for construction, then send the notification
+                            reactInstanceManager.addReactInstanceEventListener(new ReactInstanceManager.ReactInstanceEventListener() {
+                                public void onReactContextInitialized(ReactContext context) {
+                                    context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                                            .emit(notificationEvent, map);
+                                }
+                            });
+                            if (!reactInstanceManager.hasStartedCreatingInitialContext()) {
+                                // Construct it in the background
+                                reactInstanceManager.createReactContextInBackground();
+                            }
+                        }
+                    }
+                });
+            }
+        }
+    }
+}

android/src/main/java/com/b8ne/RNPusherPushNotifications/PusherWrapper.java

@@ -5,6 +5,7 @@
 import android.app.Activity;
 
 import java.util.Set;
+import java.util.Map;
 
 import com.facebook.react.bridge.*;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
@@ -63,6 +64,7 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
                         // WritableMap map = Arguments.createMap();
                         final WritableMap map = new WritableNativeMap();
                         RemoteMessage.Notification notification = remoteMessage.getNotification();
+                        Map<String, String> data = remoteMessage.getData();
 
                         if (notification != null) {
                             map.putString("body", notification.getBody());
@@ -73,6 +75,16 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
                             map.putString("color", notification.getColor());
                             // map.putString("link", notification.getLink());
 
+                            if (data != null) {
+                                WritableMap payload = Arguments.createMap();
+
+                                for(Map.Entry<String,String> entry : data.entrySet()) {
+                                    payload.putString(entry.getKey(), entry.getValue());
+                                }
+
+                                map.putMap("data", payload);
+                            }
+
                             context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
                                     .emit(notificationEvent, map);
                             // System.out.print(remoteMessage.toString());