messaging.send() now only accepts an object of type RemoteMessage as defined in messaging.js - this now includes all the previously missing options such as ttl and collapse key

@chrisbianca / note to self - ios needs doing ;p

Author: Salakar

android/src/main/java/io/fullstack/firestack/messaging/FirestackMessaging.java

@@ -165,31 +165,42 @@ public void unsubscribeFromTopic(String topic, final Callback callback) {
     }
   }
 
+  // String senderId, String messageId, String messageType,
   @ReactMethod
-  public void send(String senderId, String messageId, String messageType, ReadableMap params, final Callback callback) {
+  public void send(ReadableMap params, final Callback callback) {
+    ReadableMap data = params.getMap("data");
     FirebaseMessaging fm = FirebaseMessaging.getInstance();
-    RemoteMessage.Builder remoteMessage = new RemoteMessage.Builder(senderId);
-    remoteMessage.setMessageId(messageId);
-    remoteMessage.setMessageType(messageType);
-    ReadableMapKeySetIterator iterator = params.keySetIterator();
+    RemoteMessage.Builder remoteMessage = new RemoteMessage.Builder(params.getString("sender"));
+
+    remoteMessage.setMessageId(params.getString("id"));
+    remoteMessage.setMessageType(params.getString("type"));
+
+    if (params.hasKey("ttl")) {
+      remoteMessage.setTtl(params.getInt("ttl"));
+    }
+
+    if (params.hasKey("collapseKey")) {
+      remoteMessage.setCollapseKey(params.getString("collapseKey"));
+    }
+
+    ReadableMapKeySetIterator iterator = data.keySetIterator();
 
     while (iterator.hasNextKey()) {
       String key = iterator.nextKey();
-      ReadableType type = params.getType(key);
+      ReadableType type = data.getType(key);
       if (type == ReadableType.String) {
-        remoteMessage.addData(key, params.getString(key));
-        Log.d(TAG, "Firebase send: " + key);
-        Log.d(TAG, "Firebase send: " + params.getString(key));
+        remoteMessage.addData(key, data.getString(key));
       }
     }
 
     try {
       fm.send(remoteMessage.build());
       WritableMap res = Arguments.createMap();
       res.putString("status", "success");
+      Log.d(TAG, "send: Message sent");
       callback.invoke(null, res);
     } catch (Exception e) {
-      Log.e(TAG, "Error sending message", e);
+      Log.e(TAG, "send: error sending message", e);
       WritableMap error = Arguments.createMap();
       error.putString("code", e.toString());
       error.putString("message", e.toString());

lib/modules/messaging.js

@@ -5,6 +5,15 @@ import { promisify } from '../utils';
 const FirestackMessaging = NativeModules.FirestackMessaging || NativeModules.FirestackCloudMessaging;
 const FirestackMessagingEvt = new NativeEventEmitter(FirestackMessaging);
 
+type RemoteMessage = {
+  id: string,
+  type: string,
+  ttl?: number,
+  sender: string,
+  collapseKey?: string,
+  data: Object,
+};
+
 /**
  * @class Messaging
  */
@@ -39,20 +48,21 @@ export default class Messaging extends Base {
     return promisify('getToken', FirestackMessaging)();
   }
 
-  sendMessage(details: Object = {}, type: string = 'local') {
-    const methodName = `send${type == 'local' ? 'Local' : 'Remote'}`;
-    this.log.info('sendMessage', methodName, details);
-    return promisify(methodName, FirestackMessaging)(details);
-  }
-
-  scheduleMessage(details: Object = {}, type: string = 'local') {
-    const methodName = `schedule${type == 'local' ? 'Local' : 'Remote'}`;
-    return promisify(methodName, FirestackMessaging)(details);
-  }
+  // sendMessage(details: Object = {}, type: string = 'local') {
+  //   const methodName = `send${type == 'local' ? 'Local' : 'Remote'}`;
+  //   this.log.info('sendMessage', methodName, details);
+  //   return promisify(methodName, FirestackMessaging)(details);
+  // }
+  //
+  // scheduleMessage(details: Object = {}, type: string = 'local') {
+  //   const methodName = `schedule${type == 'local' ? 'Local' : 'Remote'}`;
+  //   return promisify(methodName, FirestackMessaging)(details);
+  // }
 
   // OLD
-  send(senderId, messageId, messageType, msg) {
-    return promisify('send', FirestackMessaging)(senderId, messageId, messageType, msg);
+  send(remoteMessage: RemoteMessage) {
+    if (!remoteMessage || !remoteMessage.data) return Promise.reject(new Error('Invalid remote message format provided.'));
+    return promisify('send', FirestackMessaging)(remoteMessage);
   }
 
   //