Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[url_launcher] Removed reference to rootViewController during initialization #2038

Merged
mklim merged 6 commits into from
Sep 12, 2019
Merged

[url_launcher] Removed reference to rootViewController during initialization #2038

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
69358fb
Fixed app2app scenario.
Sep 3, 2019
066725b
Fix for infinite recursion.
Sep 4, 2019
92d51b2
Fixed PR discussions.
Sep 5, 2019
8033b14
Renamed parameter.
Sep 6, 2019
e615241
Fixed format.
Sep 6, 2019
e30ec34
Merge branch 'master' of github.com:flutter/plugins
Sep 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Renamed parameter. 
Fixed format.
  • Loading branch information
Vitor Magalhães committed Sep 6, 2019
commit 8033b14b4155634ecc2adea34800f18860ea1337
17 changes: 8 additions & 9 deletions packages/url_launcher/ios/Classes/UrlLauncherPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,19 +165,18 @@ - (UIViewController *)topViewController {
*
* @return The top most view controller.
*/
- (UIViewController *)topViewControllerFromViewController:(UIViewController *)rootViewController
{
if ([rootViewController isKindOfClass:[UINavigationController class]]) {
UINavigationController *navigationController = (UINavigationController *)rootViewController;
- (UIViewController *)topViewControllerFromViewController:(UIViewController *)viewController {
if ([viewController isKindOfClass:[UINavigationController class]]) {
UINavigationController *navigationController = (UINavigationController *)viewController;
return [self topViewControllerFromViewController:[navigationController.viewControllers lastObject]];
}
if ([rootViewController isKindOfClass:[UITabBarController class]]) {
UITabBarController *tabController = (UITabBarController *)rootViewController;
if ([viewController isKindOfClass:[UITabBarController class]]) {
UITabBarController *tabController = (UITabBarController *)viewController;
return [self topViewControllerFromViewController:tabController.selectedViewController];
}
if (rootViewController.presentedViewController) {
return [self topViewControllerFromViewController:rootViewController.presentedViewController];
if (viewController.presentedViewController) {
return [self topViewControllerFromViewController:viewController.presentedViewController];
}
return rootViewController;
return viewController;
}
@end