Skip to content

Commit 23474b4

Browse files
committed
Merge remote-tracking branch 'origin_src/v1.0.0' into refactor
2 parents e2db215 + 943519b commit 23474b4

File tree

4 files changed

+25
-2
lines changed

4 files changed

+25
-2
lines changed

samples/objc/FirebaseUI-demo-objc.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@
411411
buildSettings = {
412412
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
413413
INFOPLIST_FILE = "FirebaseUI-demo-objc/Info.plist";
414+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
414415
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
415416
PRODUCT_BUNDLE_IDENTIFIER = "com.google.firebase.FirebaseUI-demo-objc";
416417
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -423,6 +424,7 @@
423424
buildSettings = {
424425
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
425426
INFOPLIST_FILE = "FirebaseUI-demo-objc/Info.plist";
427+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
426428
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
427429
PRODUCT_BUNDLE_IDENTIFIER = "com.google.firebase.FirebaseUI-demo-objc";
428430
PRODUCT_NAME = "$(TARGET_NAME)";

samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.m

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,18 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
2929
[FIRApp configure];
3030
return YES;
3131
}
32+
3233
- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString*, id> *)options {
34+
NSString *sourceApplication = options[UIApplicationOpenURLOptionsSourceApplicationKey];
35+
return [self handleOpenUrl:url sourceApplication:sourceApplication];
36+
}
3337

34-
NSString *sourceApp = options[UIApplicationOpenURLOptionsSourceApplicationKey];
38+
- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(nullable NSString *)sourceApplication annotation:(id)annotation {
39+
return [self handleOpenUrl:url sourceApplication:sourceApplication];
40+
}
3541

36-
if ([FIRAuthUI.defaultAuthUI handleOpenURL:url sourceApplication:sourceApp]) {
42+
- (BOOL)handleOpenUrl:(NSURL *)url sourceApplication:(nullable NSString *)sourceApplication {
43+
if ([FIRAuthUI.defaultAuthUI handleOpenURL:url sourceApplication:sourceApplication]) {
3744
return YES;
3845
}
3946
return NO;

samples/swift/FirebaseUI-demo-swift.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,7 @@
490490
BITCODE_GENERATION_MODE = "";
491491
CLANG_ENABLE_MODULES = YES;
492492
INFOPLIST_FILE = "FirebaseUI-demo-swift/Info.plist";
493+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
493494
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
494495
PRODUCT_BUNDLE_IDENTIFIER = "com.google.firebase.firebaseui.FirebaseUI-demo-swift";
495496
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -508,6 +509,7 @@
508509
CLANG_ENABLE_MODULES = YES;
509510
DEVELOPMENT_TEAM = "";
510511
INFOPLIST_FILE = "FirebaseUI-demo-swift/Info.plist";
512+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
511513
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
512514
PRODUCT_BUNDLE_IDENTIFIER = "com.google.firebase.firebaseui.FirebaseUI-demo-swift";
513515
PRODUCT_NAME = "$(TARGET_NAME)";

samples/swift/FirebaseUI-demo-swift/AppDelegate.swift

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,25 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
3333
return true
3434
}
3535

36+
@available(iOS 9.0, *)
3637
func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any]) -> Bool {
3738
let sourceApplication = options[UIApplicationOpenURLOptionsKey.sourceApplication] as! String?
39+
return self.handleOpenUrl(url, sourceApplication: sourceApplication)
40+
}
41+
42+
@available(iOS 8.0, *)
43+
func application(_ application: UIApplication, open url: URL, sourceApplication: String?, annotation: Any) -> Bool {
44+
return self.handleOpenUrl(url, sourceApplication: sourceApplication)
45+
}
46+
47+
48+
func handleOpenUrl(_ url: URL, sourceApplication: String?) -> Bool {
3849
if FIRAuthUI.default()?.handleOpen(url, sourceApplication: sourceApplication) ?? false {
3950
return true
4051
}
4152
// other URL handling goes here.
4253
return false
4354
}
55+
4456
}
4557

0 commit comments

Comments
 (0)