diff options
| -rw-r--r-- | Firebase/Core/FIRAnalyticsConfiguration.m | 7 | ||||
| -rw-r--r-- | Firebase/Core/FIRApp.m | 9 | ||||
| -rw-r--r-- | Firebase/Core/FIROptions.m | 15 | ||||
| -rw-r--r-- | Firebase/Core/Private/FIRLogger.h | 6 |
4 files changed, 20 insertions, 17 deletions
diff --git a/Firebase/Core/FIRAnalyticsConfiguration.m b/Firebase/Core/FIRAnalyticsConfiguration.m index 4fff0c1..3a5b9f6 100644 --- a/Firebase/Core/FIRAnalyticsConfiguration.m +++ b/Firebase/Core/FIRAnalyticsConfiguration.m @@ -50,9 +50,10 @@ // Persist the measurementEnabledState. Use FIRAnalyticsEnabledState values instead of YES/NO. FIRAnalyticsEnabledState analyticsEnabledState = analyticsCollectionEnabled ? kFIRAnalyticsEnabledStateSetYes : kFIRAnalyticsEnabledStateSetNo; - [[NSUserDefaults standardUserDefaults] setObject:@(analyticsEnabledState) - forKey:kFIRAPersistedConfigMeasurementEnabledStateKey]; - [[NSUserDefaults standardUserDefaults] synchronize]; + NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults]; + [userDefaults setObject:@(analyticsEnabledState) + forKey:kFIRAPersistedConfigMeasurementEnabledStateKey]; + [userDefaults synchronize]; [self postNotificationName:kFIRAnalyticsConfigurationSetEnabledNotification value:@(analyticsCollectionEnabled)]; diff --git a/Firebase/Core/FIRApp.m b/Firebase/Core/FIRApp.m index 758c924..718734b 100644 --- a/Firebase/Core/FIRApp.m +++ b/Firebase/Core/FIRApp.m @@ -158,11 +158,10 @@ static FIRApp *sDefaultApp; if ([name isEqualToString:kFIRDefaultAppName]) { [NSException raise:kFirebaseCoreErrorDomain format:@"Name cannot be __FIRAPP_DEFAULT."]; } - NSString *lowerCaseName = [name lowercaseString]; - for (NSInteger charIndex = 0; charIndex < lowerCaseName.length; charIndex++) { - char character = [lowerCaseName characterAtIndex:charIndex]; - if (!((character >= 'a' && character <= 'z') || (character >= '0' && character <= '9') || - character == '_' || character == '-')) { + for (NSInteger charIndex = 0; charIndex < name.length; charIndex++) { + char character = [name characterAtIndex:charIndex]; + if (!((character >= 'a' && character <= 'z') || (character >= 'A' && character <= 'Z') || + (character >= '0' && character <= '9') || character == '_' || character == '-')) { [NSException raise:kFirebaseCoreErrorDomain format: @"App name should only contain Letters, " diff --git a/Firebase/Core/FIROptions.m b/Firebase/Core/FIROptions.m index 6611af2..49375d4 100644 --- a/Firebase/Core/FIROptions.m +++ b/Firebase/Core/FIROptions.m @@ -375,27 +375,30 @@ static NSDictionary *sDefaultOptionsDictionary = nil; if (self.isAnalyticsCollectionDeactivated) { return NO; } - if (!self.analyticsOptionsDictionary[kFIRIsMeasurementEnabled]) { + NSNumber *value = self.analyticsOptionsDictionary[kFIRIsMeasurementEnabled]; + if (!value) { return YES; // Enable Measurement by default when the key is not in the dictionary. } - return [self.analyticsOptionsDictionary[kFIRIsMeasurementEnabled] boolValue]; + return [value boolValue]; } - (BOOL)isAnalyticsCollectionEnabled { if (self.isAnalyticsCollectionDeactivated) { return NO; } - if (!self.analyticsOptionsDictionary[kFIRIsAnalyticsCollectionEnabled]) { + NSNumber *value = self.analyticsOptionsDictionary[kFIRIsAnalyticsCollectionEnabled]; + if (!value) { return self.isMeasurementEnabled; // Fall back to older plist flag. } - return [self.analyticsOptionsDictionary[kFIRIsAnalyticsCollectionEnabled] boolValue]; + return [value boolValue]; } - (BOOL)isAnalyticsCollectionDeactivated { - if (!self.analyticsOptionsDictionary[kFIRIsAnalyticsCollectionDeactivated]) { + NSNumber *value = self.analyticsOptionsDictionary[kFIRIsAnalyticsCollectionDeactivated]; + if (!value) { return NO; // Analytics Collection is not deactivated when the key is not in the dictionary. } - return [self.analyticsOptionsDictionary[kFIRIsAnalyticsCollectionDeactivated] boolValue]; + return [value boolValue]; } - (BOOL)isAnalyticsEnabled { diff --git a/Firebase/Core/Private/FIRLogger.h b/Firebase/Core/Private/FIRLogger.h index f1aebd3..ee862ce 100644 --- a/Firebase/Core/Private/FIRLogger.h +++ b/Firebase/Core/Private/FIRLogger.h @@ -90,7 +90,7 @@ extern void FIRLogBasic(FIRLoggerLevel level, #ifdef __cplusplus extern "C" { -#endif // __cplusplus +#endif // __cplusplus /** * The following functions accept the following parameters in order: @@ -117,7 +117,7 @@ extern void FIRLogDebug(FIRLoggerService service, NSString *messageCode, NSStrin NS_FORMAT_FUNCTION(3, 4); #ifdef __cplusplus -} // extern "C" -#endif // __cplusplus +} // extern "C" +#endif // __cplusplus NS_ASSUME_NONNULL_END |