[messaging] Correctly bind messaging listeners

D1no · Jun 19, 2017 · cd34738 · cd34738
1 parent 782958d
commit cd34738
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/modules/messaging/index.js b/lib/modules/messaging/index.js
@@ -204,7 +204,7 @@ export default class Messaging extends Base {
    * @returns {*}
    */
   onMessage(listener: Function): () => any {
-    return FirebaseMessagingEvt.addListener(
+    const rnListener = FirebaseMessagingEvt.addListener(
       EVENT_TYPE.Notification,
       async(event) => {
         const data = {
@@ -217,7 +217,8 @@ export default class Messaging extends Base {
           data.finish();
         }
       }
-    ).remove;
+    );
+    return () => rnListener.remove();
   }
 
   /**
@@ -226,7 +227,8 @@ export default class Messaging extends Base {
    * @returns {*}
    */
   onTokenRefresh(listener: Function): () => any {
-    return FirebaseMessagingEvt.addListener(EVENT_TYPE.RefreshToken, listener).remove;
+    const rnListener = FirebaseMessagingEvt.addListener(EVENT_TYPE.RefreshToken, listener);
+    return () => rnListener.remove();
   }
 
   /**