From cd4664fb6886c457daec03d2b11677e8694ec11f Mon Sep 17 00:00:00 2001 From: Salakar Date: Wed, 15 Mar 2017 13:05:56 +0000 Subject: [PATCH] [ios] fixed messaging getToken, listen/unlisten token refresh --- ios/RNFirebase/RNFirebaseEvents.h | 6 +++--- lib/modules/messaging/index.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ios/RNFirebase/RNFirebaseEvents.h b/ios/RNFirebase/RNFirebaseEvents.h index c8f00509..8a7f97c9 100644 --- a/ios/RNFirebase/RNFirebaseEvents.h +++ b/ios/RNFirebase/RNFirebaseEvents.h @@ -41,9 +41,9 @@ static NSString *const STORAGE_DOWNLOAD_FAILURE = @"download_failure"; // Messaging static NSString *const MESSAGING_SUBSYSTEM_EVENT = @"messaging_event"; static NSString *const MESSAGING_SUBSYSTEM_ERROR = @"messaging_error"; -static NSString *const MESSAGING_TOKEN_REFRESH = @"messaging_token_refresh"; +static NSString *const MESSAGING_TOKEN_REFRESH = @"RNFirebaseRefreshToken"; -static NSString *const MESSAGING_MESSAGE_RECEIVED_REMOTE = @"messaging_remote_event_received"; -static NSString *const MESSAGING_MESSAGE_RECEIVED_LOCAL = @"messaging_local_event_received"; +static NSString *const MESSAGING_MESSAGE_RECEIVED_REMOTE = @"RNFirebaseReceiveNotification"; +static NSString *const MESSAGING_MESSAGE_RECEIVED_LOCAL = @"RNFirebaseReceiveNotification"; #endif diff --git a/lib/modules/messaging/index.js b/lib/modules/messaging/index.js index 6c598baa..207d9e85 100644 --- a/lib/modules/messaging/index.js +++ b/lib/modules/messaging/index.js @@ -29,7 +29,7 @@ export default class Messaging extends Base { // TODO move to new event emitter logic onMessage(callback) { this.log.info('Setting up onMessage callback'); - const sub = this._on('FirebaseReceiveNotification', callback, FirebaseMessagingEvt); + const sub = this._on('RNFirebaseReceiveNotification', callback, FirebaseMessagingEvt); return promisify(() => sub, FirebaseMessaging)(sub); } @@ -55,13 +55,13 @@ export default class Messaging extends Base { // listenForTokenRefresh(callback) { this.log.info('Setting up listenForTokenRefresh callback'); - const sub = this._on('FirebaseRefreshToken', callback, FirebaseMessagingEvt); + const sub = this._on('RNFirebaseRefreshToken', callback, FirebaseMessagingEvt); return promisify(() => sub, FirebaseMessaging)(sub); } unlistenForTokenRefresh() { this.log.info('Unlistening for TokenRefresh'); - this._off('FirebaseRefreshToken'); + this._off('RNFirebaseRefreshToken'); } subscribeToTopic(topic) {