diff options
author | Chen Liang <chliang@google.com> | 2018-06-29 11:39:45 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-29 11:39:45 -0700 |
commit | 5e1472b49283e8c2374529ce89edb65ee0e8ea0b (patch) | |
tree | 571a2b4132f2e4c92a5081d4c7f6cb606d6296c5 /Firebase/Messaging/FIRMessaging+FIRApp.m | |
parent | 7c34f464d8b1d530bba08a3adc5191112adb4ff1 (diff) |
Fix the race condition of global data flag and fcm auto init enabled flag (#1466)
Diffstat (limited to 'Firebase/Messaging/FIRMessaging+FIRApp.m')
-rw-r--r-- | Firebase/Messaging/FIRMessaging+FIRApp.m | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/Firebase/Messaging/FIRMessaging+FIRApp.m b/Firebase/Messaging/FIRMessaging+FIRApp.m index d48a3b4..dda360c 100644 --- a/Firebase/Messaging/FIRMessaging+FIRApp.m +++ b/Firebase/Messaging/FIRMessaging+FIRApp.m @@ -26,12 +26,6 @@ #import "FIRMessagingVersionUtilities.h" #import "FIRMessaging_Private.h" -@interface FIRMessaging () - -@property(nonatomic, readwrite, strong) NSString *fcmSenderID; - -@end - @implementation FIRMessaging (FIRApp) + (void)load { @@ -58,22 +52,6 @@ } - (void)configureMessaging:(FIRApp *)app { - FIROptions *options = app.options; - NSError *error; - if (!options.GCMSenderID.length) { - error = - [FIRApp errorForSubspecConfigurationFailureWithDomain:kFirebaseCloudMessagingErrorDomain - errorCode:FIRErrorCodeCloudMessagingFailed - service:kFIRServiceMessaging - reason:@"Google Sender ID must not be nil" - @" or empty."]; - [self exitApp:app withError:error]; - return; - } - - self.fcmSenderID = [options.GCMSenderID copy]; - self.globalAutomaticDataCollectionEnabled = [app isAutomaticDataCollectionEnabled]; - // Swizzle remote-notification-related methods (app delegate and UNUserNotificationCenter) if ([FIRMessagingRemoteNotificationsProxy canSwizzleMethods]) { NSString *docsURLString = @"https://firebase.google.com/docs/cloud-messaging/ios/client" |