Skip to content

Commit

Permalink
Move to explicit nil check. (firebase#782)
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanwilson committed Feb 12, 2018
1 parent fd83e07 commit 4afcfb1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Firebase/Core/FIROptions.m
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ - (BOOL)isMeasurementEnabled {
return NO;
}
NSNumber *value = self.analyticsOptionsDictionary[kFIRIsMeasurementEnabled];
if (!value) {
if (value == nil) {
return YES; // Enable Measurement by default when the key is not in the dictionary.
}
return [value boolValue];
Expand All @@ -397,15 +397,15 @@ - (BOOL)isAnalyticsCollectionEnabled {
return NO;
}
NSNumber *value = self.analyticsOptionsDictionary[kFIRIsAnalyticsCollectionEnabled];
if (!value) {
if (value == nil) {
return self.isMeasurementEnabled; // Fall back to older plist flag.
}
return [value boolValue];
}

- (BOOL)isAnalyticsCollectionDeactivated {
NSNumber *value = self.analyticsOptionsDictionary[kFIRIsAnalyticsCollectionDeactivated];
if (!value) {
if (value == nil) {
return NO; // Analytics Collection is not deactivated when the key is not in the dictionary.
}
return [value boolValue];
Expand Down

0 comments on commit 4afcfb1

Please sign in to comment.