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

Author: Edward Smith

Branch-SDK/Branch-SDK/BNCSystemObserver.m

@@ -77,17 +77,15 @@ + (NSString *)getDefaultUriScheme {
     for (NSDictionary *urlType in urlTypes) {
         NSArray *urlSchemes = [urlType objectForKey:@"CFBundleURLSchemes"];
         for (NSString *uriScheme in urlSchemes) {
-            BOOL isFBScheme = [uriScheme hasPrefix:@"fb"];
-            BOOL isDBScheme = [uriScheme hasPrefix:@"db"];
-            BOOL isPinScheme = [uriScheme hasPrefix:@"pin"];
-            
-            // Don't use the schemes set aside for other integrations.
-            if (!isFBScheme && !isDBScheme && !isPinScheme) {
-                return uriScheme;
-            }
+            if ([uriScheme hasPrefix:@"fb"]) continue;  // Facebook
+            if ([uriScheme hasPrefix:@"db"]) continue;  // DB?
+            if ([uriScheme hasPrefix:@"pin"]) continue; // Pinterest
+            if ([uriScheme hasPrefix:@"com.googleusercontent.apps"]) continue; // Google
+
+            // Otherwise this must be it!
+            return uriScheme;
         }
     }
-
     return nil;
 }
 

Branch-TestBed-Swift/TestBed-Swift.xcodeproj/project.pbxproj

@@ -706,7 +706,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;

Branch-TestBed-Swift/TestBed-Swift/ViewController.swift

@@ -341,8 +341,8 @@ class ViewController: UITableViewController, BranchShareLinkDelegate {
 
         branchUniversalObject.getShortUrl(with: branchLinkProperties) { (url, error) in
             if (url != nil) {
-                print(self.branchLinkProperties.description())
-                print(self.branchUniversalObject.description())
+                print(branchLinkProperties.description())
+                print(branchUniversalObject.description())
                 print("Link Created: \(String(describing: url?.description))")
                 self.linkTextField.text = url
             } else {