diff options
| author |  Ryan Wilson <wilsonryan@google.com> | 2018-05-14 10:02:25 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-14 10:02:25 -0700 |
| commit | 08f447cd3fffae80748239daada493fcc19c111f (patch) | |
| tree | 52049deb6adda8eb87c07d01264bdc2e0be26ac5 /Firebase/Messaging/FIRMessaging.m | |
| parent | 281d145dc93d310d1dc21fdff61e004faba3b057 (diff) | |
Add global data collection switch. (#1219)
* Addition of global data collection switch.
* Added Messaging conformance to data switch.
Also formatted code.
* Move data collection flag internal until all SDKs conform to it.
* Formatting in response to code review.
Diffstat (limited to 'Firebase/Messaging/FIRMessaging.m')
| -rw-r--r-- | Firebase/Messaging/FIRMessaging.m | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Firebase/Messaging/FIRMessaging.m b/Firebase/Messaging/FIRMessaging.m index 339bd7d..6222420 100644 --- a/Firebase/Messaging/FIRMessaging.m +++ b/Firebase/Messaging/FIRMessaging.m @@ -75,7 +75,7 @@ NSString *const kFIRMessagingUserDefaultsKeyAutoInitEnabled = NSString *const kFIRMessagingAPNSTokenType = @"APNSTokenType"; // APNS Token type key stored in user info. -static NSString *const kFIRMessagingPlistAutoInitEnabled = +NSString *const kFIRMessagingPlistAutoInitEnabled = @"FirebaseMessagingAutoInitEnabled"; // Auto Init Enabled key stored in Info.plist @interface FIRMessagingMessageInfo () @@ -471,8 +471,9 @@ static NSString *const kFIRMessagingPlistAutoInitEnabled = if (isAutoInitEnabledObject) { return [isAutoInitEnabledObject boolValue]; } - // If none of above exists, we default assume FCM auto init is enabled. - return YES; + + // If none of above exists, we default to the global switch that comes from FIRApp. + return self.isGlobalAutomaticDataCollectionEnabled; } - (void)setAutoInitEnabled:(BOOL)autoInitEnabled { |