Sending Data Messages without notification key. #146

Author: [email protected]

platforms/android/README.md

@@ -6,8 +6,8 @@ To make it as easy as possible for consumers of this plugin we bundle those bith
 Steps to update the `.aar` file:
 
 * Clone this repo
-* Start Android Studio and pick 'import existing project' > `{this repo}/platforms/android/libraryproject`
-* Update `firebase/src/main/AndroidManifest.xml` as needed
+* Start Android Studio and pick 'import project' > `{this repo}/platforms/android/libraryproject`
+* Update `.java` classes and/or `firebase/src/main/AndroidManifest.xml` as needed
 * Open the Gradle toolwindow
 * Run `firebase > Tasks > build > build`
 * The (release) `.aar` will be generated in `firebase/build/outputs/aar`

platforms/android/firebase-release.aar

@@ -1,53 +1,41 @@
 package org.nativescript.plugins.firebase;
 
-import android.util.Log;
-
 public class FirebasePlugin {
 
-  static final String TAG = "FirebasePlugin";
-
   private static String cachedToken;
   private static String cachedNotification;
 
   private static FirebasePluginListener onPushTokenReceivedCallback;
   private static FirebasePluginListener onNotificationReceivedCallback;
 
   public static void setOnPushTokenReceivedCallback(FirebasePluginListener callbacks) {
-    Log.d(TAG, "******* Setting onPushTokenReceivedCallback");
     onPushTokenReceivedCallback = callbacks;
     if (cachedToken != null) {
-      Log.d(TAG, "******* Setting onPushTokenReceivedCallback - cachedToken is available");
       executeOnPushTokenReceivedCallback(cachedToken);
       cachedToken = null;
     }
   }
 
   public static void setOnNotificationReceivedCallback(FirebasePluginListener callbacks) {
-    Log.d(TAG, "******* Setting onNotificationReceivedCallback");
     onNotificationReceivedCallback = callbacks;
     if (cachedNotification != null) {
-      Log.d(TAG, "******* Setting onNotificationReceivedCallback - cachedNotification is available");
       executeOnNotificationReceivedCallback(cachedNotification);
       cachedNotification = null;
     }
   }
 
   public static void executeOnPushTokenReceivedCallback(String token) {
     if (onPushTokenReceivedCallback != null) {
-      Log.d(TAG, "******* Sending message to client");
       onPushTokenReceivedCallback.success(token);
     } else {
-      Log.d(TAG, "******* No callback function - caching the data for later retrieval.");
       cachedToken = token;
     }
   }
 
   public static void executeOnNotificationReceivedCallback(String notification) {
     if (onNotificationReceivedCallback != null) {
-      Log.d(TAG, "******* Sending message to client");
       onNotificationReceivedCallback.success(notification);
     } else {
-      Log.d(TAG, "******* No callback function - caching the data for later retrieval.");
       cachedNotification = notification;
     }
   }

platforms/android/libraryproject/firebase/src/main/java/org/nativescript/plugins/firebase/FirebasePlugin.java

@@ -15,14 +15,18 @@ public class MyFirebaseMessagingService extends FirebaseMessagingService {
 
   @Override
   public void onMessageReceived(RemoteMessage remoteMessage) {
-    RemoteMessage.Notification not = remoteMessage.getNotification();
     try {
-      JSONObject json = new JSONObject()
-          .put("title", not.getTitle())
-          .put("body", not.getBody())
-          .put("foreground", true);
+      final JSONObject json = new JSONObject()
+        .put("foreground", true)
+        .put("from", remoteMessage.getFrom());
 
-      Map<String, String> data = remoteMessage.getData();
+      final RemoteMessage.Notification not = remoteMessage.getNotification();
+      if (not != null) {
+        json.put("title", not.getTitle())
+          .put("body", not.getBody());
+      }
+
+      final Map<String, String> data = remoteMessage.getData();
       for (Map.Entry<String, String> stringStringEntry : data.entrySet()) {
         json.put(stringStringEntry.getKey(), stringStringEntry.getValue());
       }