Merge branch 'staging' of ssh://github.com/BranchMetrics/ios-branch-deep-linking into QA

Edward Smith · Edward Smith · commit 6fb8b4c2fdd5 · 2017-05-17T08:59:57.000-07:00
diff --git a/Branch-SDK/Branch-SDK/BNCStrongMatchHelper.m b/Branch-SDK/Branch-SDK/BNCStrongMatchHelper.m
@@ -254,7 +254,7 @@ - (UIWindow*) keyWindow {
 }
 
 /**
-  Find the top view controller that is not of type UINavigationController or UITabBarController
+  Find the top view controller that is not of type UINavigationController, UITabBarController, UISplitViewController
  */
 - (UIViewController *)topViewController:(UIViewController *)baseViewController {
     if ([baseViewController isKindOfClass:[UINavigationController class]]) {
@@ -265,6 +265,10 @@ - (UIViewController *)topViewController:(UIViewController *)baseViewController {
         return [self topViewController: ((UITabBarController *)baseViewController).selectedViewController];
     }
 
+    if ([baseViewController isKindOfClass:[UISplitViewController class]]) {
+        return [self topViewController: ((UISplitViewController *)baseViewController).viewControllers.firstObject];
+    }
+
     if ([baseViewController presentedViewController] != nil) {
         return [self topViewController: [baseViewController presentedViewController]];
     }

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ - (UIWindow*) keyWindow {`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`/**`
`257`		`- Find the top view controller that is not of type UINavigationController or UITabBarController`
	`257`	`+ Find the top view controller that is not of type UINavigationController, UITabBarController, UISplitViewController`
`258`	`258`	`*/`
`259`	`259`	`- (UIViewController )topViewController:(UIViewController )baseViewController {`
`260`	`260`	`if ([baseViewController isKindOfClass:[UINavigationController class]]) {`
`@@ -265,6 +265,10 @@ - (UIViewController )topViewController:(UIViewController )baseViewController {`
`265`	`265`	`return [self topViewController: ((UITabBarController *)baseViewController).selectedViewController];`
`266`	`266`	`}`
`267`	`267`
	`268`	`+ if ([baseViewController isKindOfClass:[UISplitViewController class]]) {`
	`269`	`+ return [self topViewController: ((UISplitViewController *)baseViewController).viewControllers.firstObject];`
	`270`	`+ }`
	`271`	`+`
`268`	`272`	`if ([baseViewController presentedViewController] != nil) {`
`269`	`273`	`return [self topViewController: [baseViewController presentedViewController]];`
`270`	`274`	`}`