From 14c578d3ae4e3c24bbc6686551aafc01779629b2 Mon Sep 17 00:00:00 2001 From: Libin Lu Date: Mon, 12 Feb 2018 20:42:55 -0500 Subject: [PATCH] revert change --- ios/RNFIRMessaging.m | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/ios/RNFIRMessaging.m b/ios/RNFIRMessaging.m index b7de5e2..42540b0 100644 --- a/ios/RNFIRMessaging.m +++ b/ios/RNFIRMessaging.m @@ -364,8 +364,7 @@ RCT_EXPORT_METHOD(getInitialNotification:(RCTPromiseResolveBlock)resolve rejecte [initialNotif setValue:@YES forKey:@"opened_from_tray"]; resolve(initialNotif); } else { - - resolve([self.bridge.launchOptions[UIApplicationLaunchOptionsUserActivityTypeKey] copy]); + resolve(nil); } } @@ -387,6 +386,37 @@ RCT_EXPORT_METHOD(getFCMToken:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromi resolve([FIRMessaging messaging].FCMToken); } +RCT_EXPORT_METHOD(getEntityFCMToken:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) +{ + FIROptions *options = FIROptions.defaultOptions; + NSString *entity = options.GCMSenderID; + NSData * deviceToken = [FIRMessaging messaging].APNSToken; + + [[FIRInstanceID instanceID]tokenWithAuthorizedEntity:entity scope:kFIRInstanceIDScopeFirebaseMessaging options:@{@"apns_token": deviceToken} handler:^(NSString * _Nullable token, NSError * _Nullable error) { + + if (error != nil) { + reject([NSString stringWithFormat:@"%ld",error.code],error.localizedDescription,nil); + } else { + resolve(token); + } + }]; +} + +RCT_EXPORT_METHOD(deleteEntityFCMToken:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) +{ + FIROptions *options = FIROptions.defaultOptions;; + NSString *entity = options.GCMSenderID; + + [[FIRInstanceID instanceID]deleteTokenWithAuthorizedEntity:entity scope:kFIRInstanceIDScopeFirebaseMessaging handler:^(NSError * _Nullable error) { + + if (error != nil) { + reject([NSString stringWithFormat:@"%ld",error.code],error.localizedDescription,nil); + } else { + resolve(nil); + } + }]; +} + RCT_EXPORT_METHOD(deleteInstanceId:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) { [[FIRInstanceID instanceID]deleteIDWithHandler:^(NSError * _Nullable error) { -- 2.26.2