[Android] Add data/background message support

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.1",
+  "version": "3.3.1-patched",
   "name": "onesignal-cordova-plugin",
   "cordova_name": "OneSignal Push Notifications",
   "description": "OneSignal is a high volume Push Notification service for mobile apps. In addition to basic notification delivery, OneSignal also provides tools to localize, target, schedule, and automate notifications that you send.",

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="onesignal-cordova-plugin"
-    version="3.3.1">
+    version="3.3.1-patched">
 
   <name>OneSignal Push Notifications</name>
   <author>Josh Kasten, Bradley Hesse, Rodrigo Gomez-Palacio</author>
@@ -46,6 +46,7 @@
     <source-file src="src/android/com/onesignal/cordova/OneSignalObserverController.java" target-dir="src/com/onesignal/cordova/" />
     <source-file src="src/android/com/onesignal/cordova/OneSignalOutcomeController.java" target-dir="src/com/onesignal/cordova/" />
     <source-file src="src/android/com/onesignal/cordova/OneSignalInAppMessagingController.java" target-dir="src/com/onesignal/cordova/" />
+    <source-file src="src/android/com/onesignal/OneSignalRemoteNotificationHandlerSetter.java" target-dir="src/com/onesignal/" />
     <source-file src="src/android/com/onesignal/cordova/CallbackHelper.java" target-dir="src/com/onesignal/cordova/" />
   </platform>
 

src/android/com/onesignal/OneSignalRemoteNotificationHandlerSetter.java

@@ -0,0 +1,7 @@
+package com.onesignal;
+
+public class OneSignalRemoteNotificationHandlerSetter {
+    public static void setRemoteNotificationHandler(OneSignal.OSRemoteNotificationReceivedHandler handler) {
+        OneSignal.setRemoteNotificationReceivedHandler(handler);
+    }
+}

src/android/com/onesignal/cordova/OneSignalPush.java

@@ -27,6 +27,7 @@
 
 package com.onesignal.cordova;
 
+import android.content.Context;
 import android.util.Log;
 
 import com.onesignal.OSInAppMessageAction;
@@ -36,6 +37,7 @@
 import com.onesignal.OSNotificationOpenedResult;
 import com.onesignal.OSNotificationReceivedEvent;
 import com.onesignal.OneSignal;
+import com.onesignal.OneSignalRemoteNotificationHandlerSetter;
 
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaPlugin;
@@ -128,6 +130,7 @@ public class OneSignalPush extends CordovaPlugin {
 
   public boolean setNotificationWillShowInForegroundHandler(CallbackContext callbackContext) {
     OneSignal.setNotificationWillShowInForegroundHandler(new CordovaNotificationInForegroundHandler(callbackContext));
+    OneSignalRemoteNotificationHandlerSetter.setRemoteNotificationHandler(new CordovaRemoteNotificationHandler(callbackContext));
     return true;
   }
 
@@ -456,6 +459,30 @@ private boolean completeNotification(JSONArray data) {
    * Handlers
    */
 
+  private static class CordovaRemoteNotificationHandler implements OneSignal.OSRemoteNotificationReceivedHandler {
+    private CallbackContext jsNotificationInForegroundCallBack;
+
+    public CordovaRemoteNotificationHandler(CallbackContext inCallbackContext) {
+      jsNotificationInForegroundCallBack = inCallbackContext;
+    }
+
+    @Override
+    public void remoteNotificationReceived(Context context, OSNotificationReceivedEvent osNotificationReceivedEvent) {
+      try {
+        OSNotification notification = osNotificationReceivedEvent.getNotification();
+        synchronized (notificationReceivedEventCache) {
+          if( notificationReceivedEventCache.containsKey(notification.getNotificationId()) ) {
+            return;
+          }
+          notificationReceivedEventCache.put(notification.getNotificationId(), osNotificationReceivedEvent);
+        }
+        CallbackHelper.callbackSuccess(jsNotificationInForegroundCallBack, notification.toJSONObject());
+      } catch (Throwable t) {
+        t.printStackTrace();
+      }
+    }
+  }
+
   private static class CordovaNotificationInForegroundHandler implements OneSignal.OSNotificationWillShowInForegroundHandler {
 
     private CallbackContext jsNotificationInForegroundCallBack;
@@ -468,7 +495,12 @@ public CordovaNotificationInForegroundHandler(CallbackContext inCallbackContext)
     public void notificationWillShowInForeground(OSNotificationReceivedEvent notificationReceivedEvent) {
       try {
         OSNotification notification = notificationReceivedEvent.getNotification();
-        notificationReceivedEventCache.put(notification.getNotificationId(), notificationReceivedEvent);
+        synchronized (notificationReceivedEventCache) {
+          if( notificationReceivedEventCache.containsKey(notification.getNotificationId()) ) {
+            return;
+          }
+          notificationReceivedEventCache.put(notification.getNotificationId(), notificationReceivedEvent);
+        }
 
         CallbackHelper.callbackSuccess(jsNotificationInForegroundCallBack, notification.toJSONObject());
       } catch (Throwable t) {
@@ -530,9 +562,10 @@ public void inAppMessageClicked(OSInAppMessageAction result) {
     }
   }
 
-  @Override
+    @Override
   public void onDestroy() {
     OneSignal.setNotificationOpenedHandler(null);
     OneSignal.setNotificationWillShowInForegroundHandler(null);
+    OneSignalRemoteNotificationHandlerSetter.setRemoteNotificationHandler(null);
   }
 }