diff options
| author |  Michael Lehenbauer <mikelehen@google.com> | 2018-01-09 12:57:21 -0800 |
|---|---|---|
| committer | Michael Lehenbauer <mikelehen@google.com> | 2018-01-09 12:57:21 -0800 |
| commit | aa00c7444982de08b21604965a708d1cad5188f7 (patch) | |
| tree | 166325a14805321cbf5045fdd4a52dd634747218 /Firebase/Core/FIRApp.m | |
| parent | 2c6682c66ea7b86b3b7cb52e623086b4184d500a (diff) | |
| parent | c18af34fca72b5721cab4e3b26da7469df8fcc6b (diff) | |
Merge branch 'master' into mikelehen/merge-master-to-firestore-api-changes
Diffstat (limited to 'Firebase/Core/FIRApp.m')
| -rw-r--r-- | Firebase/Core/FIRApp.m | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Firebase/Core/FIRApp.m b/Firebase/Core/FIRApp.m index 800d180..b5e043f 100644 --- a/Firebase/Core/FIRApp.m +++ b/Firebase/Core/FIRApp.m @@ -368,7 +368,9 @@ static FIRApp *sDefaultApp; NSLocalizedRecoverySuggestionErrorKey : @"Check formatting and location of GoogleService-Info.plist." }; - return FIRCreateError(kFirebaseCoreErrorDomain, FIRErrorCodeInvalidPlistFile, errorDict); + return [NSError errorWithDomain:kFirebaseCoreErrorDomain + code:FIRErrorCodeInvalidPlistFile + userInfo:errorDict]; } + (NSError *)errorForSubspecConfigurationFailureWithDomain:(NSString *)domain @@ -379,7 +381,9 @@ static FIRApp *sDefaultApp; [NSString stringWithFormat:@"Configuration failed for service %@.", service]; NSDictionary *errorDict = @{NSLocalizedDescriptionKey : description, NSLocalizedFailureReasonErrorKey : reason}; - return FIRCreateError(domain, code, errorDict); + return [NSError errorWithDomain:domain + code:code + userInfo:errorDict]; } + (NSError *)errorForInvalidAppID { @@ -389,7 +393,9 @@ static FIRApp *sDefaultApp; @"Check formatting and location of GoogleService-Info.plist or GoogleAppID set in the " @"customized options." }; - return FIRCreateError(kFirebaseCoreErrorDomain, FIRErrorCodeInvalidAppID, errorDict); + return [NSError errorWithDomain:kFirebaseCoreErrorDomain + code:FIRErrorCodeInvalidAppID + userInfo:errorDict]; } + (BOOL)isDefaultAppConfigured { |