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

Author: E-B-Smith

Branch-SDK/Branch-SDK/BNCStrongMatchHelper.m

@@ -248,6 +248,25 @@ - (UIWindow*) keyWindow {
     return nil;
 }
 
+/**
+  Find the top view controller that is not of type UINavigationController or UITabBarController
+ */
+- (UIViewController *)topViewController:(UIViewController *)baseViewController {
+    if ([baseViewController isKindOfClass:[UINavigationController class]]) {
+        return [self topViewController: ((UINavigationController *)baseViewController).visibleViewController];
+    }
+
+    if ([baseViewController isKindOfClass:[UITabBarController class]]) {
+        return [self topViewController: ((UITabBarController *)baseViewController).selectedViewController];
+    }
+
+    if ([baseViewController presentedViewController] != nil) {
+        return [self topViewController: [baseViewController presentedViewController]];
+    }
+
+    return baseViewController;
+}
+
 - (BOOL) willLoadViewControllerWithURL:(NSURL*)matchURL {
     if (self.primaryWindow) return NO;
 
@@ -291,11 +310,13 @@ - (BOOL) willLoadViewControllerWithURL:(NSURL*)matchURL {
     self.matchView.alpha = 1.0;
     [self.matchView addSubview:self.matchViewController.view];
 
-    [self.primaryWindow.rootViewController addChildViewController:self.matchViewController];
-    UIView *parentView = self.primaryWindow.rootViewController.view ?: self.primaryWindow;
+    UIViewController *rootViewController = [self topViewController:self.primaryWindow.rootViewController];
+
+    [rootViewController addChildViewController:self.matchViewController];
+    UIView *parentView = rootViewController.view ?: self.primaryWindow;
     [parentView insertSubview:self.matchView atIndex:0];
 
-    [self.matchViewController didMoveToParentViewController:self.primaryWindow.rootViewController];
+    [self.matchViewController didMoveToParentViewController:rootViewController];
 
     return YES;
 }