diff options
author | Paul Beusterien <paulbeusterien@google.com> | 2018-07-06 09:37:23 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-06 09:37:23 -0700 |
commit | 98b6eef71eac368692ae249f056a75d89ed0350d (patch) | |
tree | 0a4a16612d7bbb5eeba981b40564db3c2fc66833 /Firebase/Auth | |
parent | a3f792f3f093e913be5823cb4df9dfeac7612a52 (diff) |
Split GoogleUtilities from FirebaseCore (#1370)
Diffstat (limited to 'Firebase/Auth')
-rw-r--r-- | Firebase/Auth/Source/FIRAuth.m | 4 | ||||
-rw-r--r-- | Firebase/Auth/Source/FIRAuthAPNSTokenManager.m | 44 | ||||
-rw-r--r-- | Firebase/Auth/Source/FIRAuthAppDelegateProxy.m | 4 | ||||
-rw-r--r-- | Firebase/Auth/Source/FIRAuthDefaultUIDelegate.m | 4 |
4 files changed, 18 insertions, 38 deletions
diff --git a/Firebase/Auth/Source/FIRAuth.m b/Firebase/Auth/Source/FIRAuth.m index 81008ca..691c6ce 100644 --- a/Firebase/Auth/Source/FIRAuth.m +++ b/Firebase/Auth/Source/FIRAuth.m @@ -19,10 +19,10 @@ #import "FIRAuth_Internal.h" #import <FirebaseCore/FIRAppAssociationRegistration.h> -#import <FirebaseCore/FIRAppEnvironmentUtil.h> #import <FirebaseCore/FIRAppInternal.h> #import <FirebaseCore/FIRLogger.h> #import <FirebaseCore/FIROptions.h> +#import <GoogleUtilities/GULAppEnvironmentUtil.h> #import "AuthProviders/EmailPassword/FIREmailPasswordAuthCredential.h" #import "FIRAdditionalUserInfo_Internal.h" @@ -443,7 +443,7 @@ static NSMutableDictionary *gKeychainServiceNameForAppName; static Class applicationClass = nil; // iOS App extensions should not call [UIApplication sharedApplication], even if UIApplication // responds to it. - if (![FIRAppEnvironmentUtil isAppExtension]) { + if (![GULAppEnvironmentUtil isAppExtension]) { Class cls = NSClassFromString(@"UIApplication"); if (cls && [cls respondsToSelector:NSSelectorFromString(@"sharedApplication")]) { applicationClass = cls; diff --git a/Firebase/Auth/Source/FIRAuthAPNSTokenManager.m b/Firebase/Auth/Source/FIRAuthAPNSTokenManager.m index 2b39aef..3e8dd90 100644 --- a/Firebase/Auth/Source/FIRAuthAPNSTokenManager.m +++ b/Firebase/Auth/Source/FIRAuthAPNSTokenManager.m @@ -17,6 +17,8 @@ #import "FIRAuthAPNSTokenManager.h" #import <FirebaseCore/FIRLogger.h> +#import <GoogleUtilities/GULAppEnvironmentUtil.h> + #import "FIRAuthAPNSToken.h" #import "FIRAuthGlobalWorkQueue.h" @@ -137,42 +139,20 @@ static const NSTimeInterval kLegacyRegistrationTimeout = 30; NSError *error = nil; - Class envClass = NSClassFromString(@"FIRAppEnvironmentUtil"); - SEL isSimulatorSelector = NSSelectorFromString(@"isSimulator"); - if ([envClass respondsToSelector:isSimulatorSelector]) { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Warc-performSelector-leaks" - if ([envClass performSelector:isSimulatorSelector]) { -#pragma clang diagnostic pop - FIRLogInfo(kFIRLoggerAuth, @"I-AUT000006", - @"Assuming prod APNs token type on simulator."); - return defaultAppTypeProd; - } + if ([GULAppEnvironmentUtil isSimulator]) { + FIRLogInfo(kFIRLoggerAuth, @"I-AUT000006", @"Assuming prod APNs token type on simulator."); + return defaultAppTypeProd; } - NSString *path = [[[NSBundle mainBundle] bundlePath] - stringByAppendingPathComponent:@"embedded.mobileprovision"]; - // Apps distributed via AppStore or TestFlight use the Production APNS certificates. - SEL isFromAppStoreSelector = NSSelectorFromString(@"isFromAppStore"); - if ([envClass respondsToSelector:isFromAppStoreSelector]) { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Warc-performSelector-leaks" - if ([envClass performSelector:isFromAppStoreSelector]) { -#pragma clang diagnostic pop - return defaultAppTypeProd; - } + if ([GULAppEnvironmentUtil isFromAppStore]) { + return defaultAppTypeProd; } - - SEL isAppStoreReceiptSandboxSelector = NSSelectorFromString(@"isAppStoreReceiptSandbox"); - if ([envClass respondsToSelector:isAppStoreReceiptSandboxSelector]) { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Warc-performSelector-leaks" - if ([envClass performSelector:isAppStoreReceiptSandboxSelector] && !path.length) { -#pragma clang diagnostic pop - // Distributed via TestFlight - return defaultAppTypeProd; - } + NSString *path = [[[NSBundle mainBundle] bundlePath] + stringByAppendingPathComponent:@"embedded.mobileprovision"]; + if ([GULAppEnvironmentUtil isAppStoreReceiptSandbox] && !path.length) { + // Distributed via TestFlight + return defaultAppTypeProd; } NSMutableData *profileData = [NSMutableData dataWithContentsOfFile:path options:0 error:&error]; diff --git a/Firebase/Auth/Source/FIRAuthAppDelegateProxy.m b/Firebase/Auth/Source/FIRAuthAppDelegateProxy.m index 73fbfda..d97fedc 100644 --- a/Firebase/Auth/Source/FIRAuthAppDelegateProxy.m +++ b/Firebase/Auth/Source/FIRAuthAppDelegateProxy.m @@ -16,7 +16,7 @@ #import "FIRAuthAppDelegateProxy.h" -#import <FirebaseCore/FIRAppEnvironmentUtil.h> +#import <GoogleUtilities/GULAppEnvironmentUtil.h> #import <objc/runtime.h> @@ -206,7 +206,7 @@ static BOOL isIOS9orLater() { // responds to it. static Class applicationClass = nil; dispatch_once(&onceToken, ^{ - if (![FIRAppEnvironmentUtil isAppExtension]) { + if (![GULAppEnvironmentUtil isAppExtension]) { Class cls = NSClassFromString(@"UIApplication"); if (cls && [cls respondsToSelector:NSSelectorFromString(@"sharedApplication")]) { applicationClass = cls; diff --git a/Firebase/Auth/Source/FIRAuthDefaultUIDelegate.m b/Firebase/Auth/Source/FIRAuthDefaultUIDelegate.m index e5aa7f4..fb8b457 100644 --- a/Firebase/Auth/Source/FIRAuthDefaultUIDelegate.m +++ b/Firebase/Auth/Source/FIRAuthDefaultUIDelegate.m @@ -16,7 +16,7 @@ #import "FIRAuthDefaultUIDelegate.h" -#import <FirebaseCore/FIRAppEnvironmentUtil.h> +#import <GoogleUtilities/GULAppEnvironmentUtil.h> NS_ASSUME_NONNULL_BEGIN @@ -63,7 +63,7 @@ NS_ASSUME_NONNULL_BEGIN // iOS App extensions should not call [UIApplication sharedApplication], even if UIApplication // responds to it. static Class applicationClass = nil; - if (![FIRAppEnvironmentUtil isAppExtension]) { + if (![GULAppEnvironmentUtil isAppExtension]) { Class cls = NSClassFromString(@"UIApplication"); if (cls && [cls respondsToSelector:NSSelectorFromString(@"sharedApplication")]) { applicationClass = cls; |