Merge pull request #417 from BranchMetrics/ios-imessage-support

iOS 10 iMessage support for deep linking and BUO

Author: ahmednawar

Branch-SDK/Branch-SDK/BNCStrongMatchHelper.m

@@ -106,7 +106,8 @@ - (void)presentSafariVCWithBranchKey:(NSString *)branchKey {
     [urlString appendFormat:@"&sdk=ios%@", SDK_VERSION];
 
     Class SFSafariViewControllerClass = NSClassFromString(@"SFSafariViewController");
-    if (SFSafariViewControllerClass) {
+    Class UIApplicationClass = NSClassFromString(@"UIApplication");
+    if (SFSafariViewControllerClass && UIApplicationClass) {
         NSURL *strongMatchUrl = [NSURL URLWithString:[urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
         if (!strongMatchUrl) {
             self.requestInProgress = NO;
@@ -120,7 +121,7 @@ - (void)presentSafariVCWithBranchKey:(NSString *)branchKey {
             self.secondWindow.rootViewController = safController;
             self.secondWindow.windowLevel = UIWindowLevelNormal - 100;
             [self.secondWindow setHidden:NO];
-            UIWindow *keyWindow = [[UIApplication sharedApplication] keyWindow];
+            UIWindow *keyWindow = [[UIApplicationClass sharedApplication] keyWindow];
             [self.secondWindow makeKeyWindow];
 
             // Give enough time for Safari to load the request (optimized for 3G)

Branch-SDK/Branch-SDK/Branch.h

@@ -225,7 +225,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  @param alias The alias for a link.
  @warning This can fail if the alias is already taken.
  */
-+ (BranchActivityItemProvider *)getBranchActivityItemWithParams:(NSDictionary *)params feature:(NSString *)feature stage:(NSString *)stage campaign:(NSString *)campmaign tags:(NSArray *)tags alias:(NSString *)alias;
++ (BranchActivityItemProvider *)getBranchActivityItemWithParams:(NSDictionary *)params feature:(NSString *)feature stage:(NSString *)stage campaign:(NSString *)campaign tags:(NSArray *)tags alias:(NSString *)alias;
 
 /**
  Create a BranchActivityItemProvider which subclasses the `UIActivityItemProvider` This can be used for simple sharing via a `UIActivityViewController`.
@@ -388,14 +388,14 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
 /**
  Add a scheme to a whitelist of URI schemes that will be tracked by Branch. Default to all schemes.
  
- @param the scheme to add to the whitelist, i.e. @"http", @"https" or @"myapp"
+ @param scheme to add to the whitelist, i.e. @"http", @"https" or @"myapp"
  */
 -(void)addWhiteListedScheme:(NSString *)scheme;
 
 /**
  Add an array of schemes to a whitelist of URI schemes that will be tracked by Branch. Default to all schemes.
  
- @param the array of schemes to add to the whitelist, i.e. @[@"http", @"https", @"myapp"]
+ @param schemes array to add to the whitelist, i.e. @[@"http", @"https", @"myapp"]
  */
 -(void)setWhiteListedSchemes:(NSArray *)schemes;
 
@@ -739,7 +739,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  @param channel The channel for the link. Examples could be Facebook, Twitter, SMS, etc, depending on where it will be shared.
  @param feature The feature this is utilizing. Examples could be Sharing, Referring, Inviting, etc.
  @param stage The stage used for the generated link, indicating what part of a funnel the user is in.
- @param matchDuration How long to keep an unmatched link click in the Branch backend server's queue before discarding.
+ @param duration How long to keep an unmatched link click in the Branch backend server's queue before discarding.
  @warning This method makes a synchronous url request.
  */
 - (NSString *)getShortURLWithParams:(NSDictionary *)params andChannel:(NSString *)channel andFeature:(NSString *)feature andStage:(NSString *)stage andMatchDuration:(NSUInteger)duration;
@@ -825,7 +825,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  @param channel The channel for the link. Examples could be Facebook, Twitter, SMS, etc, depending on where it will be shared.
  @param feature The feature this is utilizing. Examples could be Sharing, Referring, Inviting, etc.
  @param stage The stage used for the generated link, indicating what part of a funnel the user is in.
- @param matchDuration How long to keep an unmatched link click in the Branch backend server's queue before discarding.
+ @param duration How long to keep an unmatched link click in the Branch backend server's queue before discarding.
  @warning This method makes a synchronous url request.
  */
 - (NSString *)getShortURLWithParams:(NSDictionary *)params andTags:(NSArray *)tags andChannel:(NSString *)channel andFeature:(NSString *)feature andStage:(NSString *)stage andMatchDuration:(NSUInteger)duration;
@@ -839,7 +839,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  @param channel The channel for the link. Examples could be Facebook, Twitter, SMS, etc, depending on where it will be shared.
  @param feature The feature this is utilizing. Examples could be Sharing, Referring, Inviting, etc.
  @param stage The stage used for the generated link, indicating what part of a funnel the user is in.
- @param matchDuration How long to keep an unmatched link click in the Branch backend server's queue before discarding.
+ @param duration How long to keep an unmatched link click in the Branch backend server's queue before discarding.
  @warning This method makes a synchronous url request.
  @warning This can fail if the alias is already taken.
  */
@@ -856,7 +856,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  @param feature The feature this is utilizing. Examples could be Sharing, Referring, Inviting, etc.
  @param stage The stage used for the generated link, indicating what part of a funnel the user is in.
  @param campaign Use this field to organize the links by actual marketing campaign.
- @param matchDuration How long to keep an unmatched link click in the Branch backend server's queue before discarding.
+ @param duration How long to keep an unmatched link click in the Branch backend server's queue before discarding.
  @warning This method makes a synchronous url request.
  */
 - (NSString *)getShortUrlWithParams:(NSDictionary *)params andTags:(NSArray *)tags andAlias:(NSString *)alias andChannel:(NSString *)channel andFeature:(NSString *)feature andStage:(NSString *)stage andCampaign:campaign andMatchDuration:(NSUInteger)duration;
@@ -999,7 +999,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  @param channel The channel for the link. Examples could be Facebook, Twitter, SMS, etc, depending on where it will be shared.
  @param feature The feature this is utilizing. Examples could be Sharing, Referring, Inviting, etc.
  @param stage The stage used for the generated link, indicating what part of a funnel the user is in.
- @param matchDuration How long to keep an unmatched link click in the Branch backend server's queue before discarding.
+ @param duration How long to keep an unmatched link click in the Branch backend server's queue before discarding.
  @param callback Callback called with the url.
  */
 - (void)getShortURLWithParams:(NSDictionary *)params andChannel:(NSString *)channel andFeature:(NSString *)feature andStage:(NSString *)stage andMatchDuration:(NSUInteger)duration andCallback:(callbackWithUrl)callback;
@@ -1051,7 +1051,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  @param tags An array of tags to associate with this link, useful for tracking.
  @param feature The feature this is utilizing. Examples could be Sharing, Referring, Inviting, etc.
  @param stage The stage used for the generated link, indicating what part of a funnel the user is in.
- @param matchDuration How long to keep an unmatched link click in the Branch backend server's queue before discarding.
+ @param duration How long to keep an unmatched link click in the Branch backend server's queue before discarding.
  @param callback Callback called with the url.
  */
 - (void)getShortURLWithParams:(NSDictionary *)params andTags:(NSArray *)tags andChannel:(NSString *)channel andFeature:(NSString *)feature andStage:(NSString *)stage andMatchDuration:(NSUInteger)duration andCallback:(callbackWithUrl)callback;
@@ -1064,7 +1064,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  @param tags An array of tags to associate with this link, useful for tracking.
  @param feature The feature this is utilizing. Examples could be Sharing, Referring, Inviting, etc.
  @param stage The stage used for the generated link, indicating what part of a funnel the user is in.
- @param matchDuration How long to keep an unmatched link click in the Branch backend server's queue before discarding.
+ @param duration How long to keep an unmatched link click in the Branch backend server's queue before discarding.
  @param callback Callback called with the url.
  @param alias The alias for a link.
  @warning This can fail if the alias is already taken.
@@ -1079,7 +1079,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  @param tags An array of tags to associate with this link, useful for tracking.
  @param feature The feature this is utilizing. Examples could be Sharing, Referring, Inviting, etc.
  @param stage The stage used for the generated link, indicating what part of a funnel the user is in.
- @param matchDuration How long to keep an unmatched link click in the Branch backend server's queue before discarding.
+ @param duration How long to keep an unmatched link click in the Branch backend server's queue before discarding.
  @param campaign Use this field to organize the links by actual marketing campaign.
  @param callback Callback called with the url.
  @param alias The alias for a link.
@@ -1210,9 +1210,8 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  @param title Title for the spotlight preview item.
  @param description Description for the spotlight preview item.
  @param thumbnailUrl Url to an image to be used for the thumnbail in spotlight.
- @param type The type to use for the NSUserActivity, taken from the list of constants provided in the MobileCoreServices framework.
  @param publiclyIndexable Whether or not this item should be added to Apple's public search index.
- @param keywords A set of keywords to be used in Apple's search index.
+ @param linkParams A set of keywords to be used in Apple's search index.
  @warning These functions are only usable on iOS 9 or above. Earlier versions will simply receive the callback with an error.
  */
 - (void)createDiscoverableContentWithTitle:(NSString *)title description:(NSString *)description thumbnailUrl:(NSURL *)thumbnailUrl linkParams:(NSDictionary *)linkParams publiclyIndexable:(BOOL)publiclyIndexable;
@@ -1259,7 +1258,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  @param type The type to use for the NSUserActivity, taken from the list of constants provided in the MobileCoreServices framework.
  @param keywords A set of keywords to be used in Apple's search index.
  @param expirationDate ExpirationDate after which this will not appear in Apple's search index.
- @param callback Callback called with the Branch url this will fallback to.
+ @param spotlightCallback Callback called with the Branch url this will fallback to.
  @warning These functions are only usable on iOS 9 or above. Earlier versions will simply receive the callback with an error.
  */
 - (void)createDiscoverableContentWithTitle:(NSString *)title description:(NSString *)description thumbnailUrl:(NSURL *)thumbnailUrl linkParams:(NSDictionary *)linkParams type:(NSString *)type publiclyIndexable:(BOOL)publiclyIndexable keywords:(NSSet *)keywords expirationDate:(NSDate *)expirationDate spotlightCallback:(callbackWithUrlAndSpotlightIdentifier)spotlightCallback;

Branch-SDK/Branch-SDK/Branch.m

@@ -429,9 +429,13 @@ - (BOOL)continueUserActivity:(NSUserActivity *)userActivity {
 #pragma mark - Push Notification support
 
 // handle push notification if app is already launched
-- (void)handlePushNotification:(NSDictionary *) userInfo {
+- (void)handlePushNotification:(NSDictionary *)userInfo {
+    Class UIApplicationClass = NSClassFromString(@"UIApplication");
+    
+    if (!UIApplicationClass) { return; }
+
     // If app is active, then close out the session and start a new one
-    if ([[UIApplication sharedApplication] applicationState] == UIApplicationStateActive) {
+    if ([[UIApplicationClass sharedApplication] applicationState] == UIApplicationStateActive) {
         [self callClose];
     }
 
@@ -443,7 +447,7 @@ - (void)handlePushNotification:(NSDictionary *) userInfo {
     }
 
     // Again, if app is active, then close out the session and start a new one
-    if ([[UIApplication sharedApplication] applicationState] == UIApplicationStateActive) {
+    if ([[UIApplicationClass sharedApplication] applicationState] == UIApplicationStateActive) {
         [self applicationDidBecomeActive];
     }
 }
@@ -1260,7 +1264,8 @@ - (void)handleInitSuccess {
         }
     }
 
-    if (self.shouldAutomaticallyDeepLink) {
+    Class UIApplicationClass = NSClassFromString(@"UIApplication");
+    if (self.shouldAutomaticallyDeepLink && UIApplicationClass) {
         // Find any matched keys, then launch any controllers that match
         // TODO which one to launch if more than one match?
         NSMutableSet *keysInParams = [NSMutableSet setWithArray:[latestReferringParams allKeys]];
@@ -1278,7 +1283,7 @@ - (void)handleInitSuccess {
                 [self.preferenceHelper log:FILE_NAME line:LINE_NUM message:@"[Branch Warning] View controller does not implement configureControlWithData:"];
             }
             branchSharingController.deepLinkingCompletionDelegate = self;
-            self.deepLinkPresentingController = [[[UIApplication sharedApplication].delegate window] rootViewController];
+            self.deepLinkPresentingController = [[[UIApplicationClass sharedApplication].delegate window] rootViewController];
 
             if ([self.deepLinkPresentingController presentedViewController]) {
                 [self.deepLinkPresentingController dismissViewControllerAnimated:NO completion:^{

Branch-SDK/Branch-SDK/BranchUniversalObject.m

@@ -198,8 +198,11 @@ - (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties
     if (viewController && [viewController respondsToSelector:@selector(presentViewController:animated:completion:)]) {
         presentingViewController = viewController;
     }
-    else if ([[[[UIApplication sharedApplication].delegate window] rootViewController] respondsToSelector:@selector(presentViewController:animated:completion:)]) {
-        presentingViewController = [[[UIApplication sharedApplication].delegate window] rootViewController];
+    else {
+        Class UIApplicationClass = NSClassFromString(@"UIApplication");
+        if (UIApplicationClass && [[[[UIApplicationClass sharedApplication].delegate window] rootViewController] respondsToSelector:@selector(presentViewController:animated:completion:)]) {
+            presentingViewController = [[[UIApplicationClass sharedApplication].delegate window] rootViewController];
+        }
     }
 
     if (linkProperties.controlParams[BRANCH_LINK_DATA_KEY_EMAIL_SUBJECT]) {

Branch-SDK/Branch-SDK/BranchViewHandler.m

@@ -40,11 +40,12 @@ + (BranchViewHandler *)getInstance {
 
 - (BOOL)showBranchView:(NSString *)actionName withBranchViewDictionary:(NSDictionary*)branchViewDict andWithDelegate:(id)callback {
     BranchView *branchView = [[BranchView alloc] initWithBranchView:branchViewDict andActionName:actionName];
-    return[self showBranchView:branchView withDelegate:callback];
+    return [self showBranchView:branchView withDelegate:callback];
 }
 
 - (BOOL)showBranchView:(BranchView *)branchView withDelegate:(id)callback {
-    if ([branchView isAvailable]){
+    Class UIApplicationClass = NSClassFromString(@"UIApplication");
+    if (UIApplicationClass && [branchView isAvailable]){
         self.branchViewCallback = callback;
         [self showView:branchView];
         return YES;
@@ -87,7 +88,8 @@ - (void)showView:(BranchView *)branchView {
 }
 
 - (void)closeBranchView {
-    UIViewController *presentingViewController = [[[[UIApplication sharedApplication] windows] firstObject] rootViewController];
+    Class UIApplicationClass = NSClassFromString(@"UIApplication");
+    UIViewController *presentingViewController = [[[[UIApplicationClass sharedApplication] windows] firstObject] rootViewController];
     [presentingViewController dismissViewControllerAnimated:YES completion:nil];
 
     if (self.branchViewCallback) {
@@ -115,7 +117,8 @@ - (void)webViewDidFinishLoad:(UIWebView *)webView {
         if (self.pendingBranchView != nil && self.pendingWebview != nil) {
             UIViewController *holderView = [[UIViewController alloc] init];
             [holderView.view insertSubview:self.pendingWebview atIndex:0];
-            UIViewController *presentingViewController = [[[[UIApplication sharedApplication] windows] firstObject] rootViewController];
+            Class UIApplicationClass = NSClassFromString(@"UIApplication");
+            UIViewController *presentingViewController = [[[[UIApplicationClass sharedApplication] windows] firstObject] rootViewController];
             [presentingViewController presentViewController:holderView animated:YES completion:nil];
 
             [self.pendingBranchView updateUsageCount];
@@ -149,4 +152,4 @@ - (BOOL)handleUserActionRedirects:(NSURLRequest *)request {
 }
 
 
-@end
+@end

Branch-SDK/Fabric/Fabric.h

@@ -40,7 +40,7 @@ NS_ASSUME_NONNULL_BEGIN
  *
  * Only the first call to this method is honored. Subsequent calls are no-ops.
  *
- * @param kits An array of kit Class objects
+ * @param kitClasses An array of kit Class objects
  *
  * @return Returns the shared Fabric instance. In most cases this can be ignored.
  */