#327565 Fix callback bug and add the Notification object as third argument to the onMessageReceived callback.

Author: Georgi Prodanov

README.md

@@ -385,7 +385,7 @@ In order to use the plugin with Telerik Backend Services take a look at the offi
 	- the app is in background, the onMessageReceived callback is not invoked
 	- the app is in background, and the notification in the tray is tapped, the "data" part of the mixed message is available in the extras of the intent of the launched activity - these can be accessed with through nativescript, like they would in Java
 - we have removed the default large icon because it forced you to have a large icon and this wasnt the behaviour of FCM notifications
-- default color and icon for FCM messages can be set in the AndroidManifest.xml of the project using this XML, inside the <application> tag:
+- default color and icon for FCM messages can be set in the AndroidManifest.xml of the project using this XML, inside the "application" tag:
 
 ```xml
 	<meta-data

native-src/android/app/app.iml

@@ -65,14 +65,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -81,6 +73,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />

native-src/android/app/src/main/java/com/telerik/pushplugin/PushHandlerActivity.java

@@ -63,7 +63,7 @@ public static void processPushBundle(boolean isPushPluginActive, Bundle extras)
             }
 
             if (map != null) {
-                PushPlugin.executeOnMessageReceivedCallback(map);
+                PushPlugin.executeOnMessageReceivedCallback(map, null);
             }
         }
     }

native-src/android/app/src/main/java/com/telerik/pushplugin/PushPlugin.java

@@ -62,9 +62,10 @@ public static void unregister(Context appContext, String projectId, PushPluginLi
      */
     public static void setOnMessageReceivedCallback(PushPluginListener callbacks) {
         onMessageReceivedCallback = callbacks;
+        RemoteMessage.Notification whatever = null;
 
         if (cachedData != null) {
-            executeOnMessageReceivedCallback(cachedData);
+            executeOnMessageReceivedCallback(cachedData, whatever);
             cachedData = null;
         }
     }
@@ -75,9 +76,9 @@ public static void setOnMessageReceivedCallback(PushPluginListener callbacks) {
      *
      * @param data
      */
-    public static void executeOnMessageReceivedCallback(Map<String, String> data) {
-        JsonObjectExtended json = convertMapToJson(data);
-        executeOnMessageReceivedCallback(json);
+    public static void executeOnMessageReceivedCallback(Map<String, String> data, RemoteMessage.Notification notif) {
+        JsonObjectExtended jsonData = convertMapToJson(data);
+        executeOnMessageReceivedCallback(jsonData, notif);
     }
 
     private static JsonObjectExtended convertMapToJson(Map<String, String> data) {
@@ -96,20 +97,17 @@ private static JsonObjectExtended convertMapToJson(Map<String, String> data) {
         return json;
     }
 
-    private static void executeOnMessageReceivedCallback(JsonObjectExtended dataAsJson) {
+    private static void executeOnMessageReceivedCallback(JsonObjectExtended dataAsJson, RemoteMessage.Notification notif) {
         if (onMessageReceivedCallback != null) {
-            String msg;
+            String msg = null;
             try {
                 msg = dataAsJson.getString("message");
             } catch (JSONException ex) {
                 ex.printStackTrace();
-                return;
             }
 
-            if (msg != null) {
-                Log.d(TAG, "Sending message to client: " + msg);
-                onMessageReceivedCallback.success(msg, dataAsJson.toString());
-            }
+            Log.d(TAG, "Sending message to client: " + msg);
+            onMessageReceivedCallback.success(msg, dataAsJson.toString(), notif);
         } else {
             Log.d(TAG, "No callback function - caching the data for later retrieval.");
             cachedData = dataAsJson;
@@ -122,13 +120,14 @@ private static void executeOnMessageReceivedCallback(JsonObjectExtended dataAsJs
     @Override
     public void onMessageReceived(RemoteMessage message) {
         Map<String, String> data = message.getData();
+        RemoteMessage.Notification notif = message.getNotification();
         Log.d(TAG, "New Push Message: " + data);
-        Log.d(TAG, "Msg notification: " + message.getNotification());
+        Log.d(TAG, "Msg notification: " + notif);
 
         // If the application has the callback registered and Plugin is active
         // execute the callback. Otherwise, create new notification in the notification bar of the user.
         if (onMessageReceivedCallback != null && isActive) {
-            executeOnMessageReceivedCallback(data);
+            executeOnMessageReceivedCallback(data, notif);
         } else {
             Log.d(TAG, "Creating our own notification in tray...");
             Context context = getApplicationContext();

native-src/android/app/src/main/java/com/telerik/pushplugin/PushPluginListener.java

@@ -1,5 +1,7 @@
 package com.telerik.pushplugin;
 
+import com.google.firebase.messaging.RemoteMessage;
+
 /**
  * Defines methods for Success and Error callbacks
  */
@@ -11,6 +13,7 @@ public interface PushPluginListener {
      * @param message
      * @param data
      */
+    void success(Object message, Object data, RemoteMessage.Notification notificationObj);
     void success(Object message, Object data);
     void success(Object message); // method overload to mimic optional argument