From 312bc00e37735a39e29226b466dbf377297b58cb Mon Sep 17 00:00:00 2001 From: Zsika Phillip Date: Wed, 30 May 2018 17:59:18 -0700 Subject: App extension check (#1358) --- Firebase/Auth/Source/FIRAuthDefaultUIDelegate.m | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'Firebase/Auth/Source/FIRAuthDefaultUIDelegate.m') diff --git a/Firebase/Auth/Source/FIRAuthDefaultUIDelegate.m b/Firebase/Auth/Source/FIRAuthDefaultUIDelegate.m index a00d0e9..e5aa7f4 100644 --- a/Firebase/Auth/Source/FIRAuthDefaultUIDelegate.m +++ b/Firebase/Auth/Source/FIRAuthDefaultUIDelegate.m @@ -16,6 +16,8 @@ #import "FIRAuthDefaultUIDelegate.h" +#import + NS_ASSUME_NONNULL_BEGIN @interface FIRAuthDefaultUIDelegate () @@ -58,8 +60,17 @@ NS_ASSUME_NONNULL_BEGIN } + (id)defaultUIDelegate { - UIViewController *topViewController = - [UIApplication sharedApplication].keyWindow.rootViewController; + // iOS App extensions should not call [UIApplication sharedApplication], even if UIApplication + // responds to it. + static Class applicationClass = nil; + if (![FIRAppEnvironmentUtil isAppExtension]) { + Class cls = NSClassFromString(@"UIApplication"); + if (cls && [cls respondsToSelector:NSSelectorFromString(@"sharedApplication")]) { + applicationClass = cls; + } + } + UIApplication *application = [applicationClass sharedApplication]; + UIViewController *topViewController = application.keyWindow.rootViewController; while (true){ if (topViewController.presentedViewController) { topViewController = topViewController.presentedViewController; -- cgit v1.2.3