Merge pull request #425 from BranchMetrics/extension_tracking

Tracking iOS extension usage

Author: ahmednawar

Branch-SDK/Branch-SDK/BNCContentDiscoveryManager.m

@@ -468,12 +468,8 @@ - (void)userActivityWillSave:(NSUserActivity *)userActivity {
 
 - (UIViewController *)getActiveViewController {
     Class UIApplicationClass = NSClassFromString(@"UIApplication");
-    if (UIApplicationClass) {
-        UIViewController *rootViewController = [UIApplication sharedApplication].keyWindow.rootViewController;
-        return [self getActiveViewController:rootViewController];
-    }
-    
-    return nil;
+    UIViewController *rootViewController = [UIApplicationClass sharedApplication].keyWindow.rootViewController;
+    return [self getActiveViewController:rootViewController];
 }
 
 - (UIViewController *)getActiveViewController:(UIViewController *)rootViewController {

Branch-SDK/Branch-SDK/BNCServerInterface.m

@@ -232,6 +232,9 @@ - (NSDictionary *)prepareParamDict:(NSDictionary *)params key:(NSString *)key re
     NSMutableDictionary *fullParamDict = [[NSMutableDictionary alloc] init];
     [fullParamDict addEntriesFromDictionary:params];
     fullParamDict[@"sdk"] = [NSString stringWithFormat:@"ios%@", SDK_VERSION];
+    if ([[[NSBundle mainBundle] executablePath] containsString:@".appex/"]) {
+        fullParamDict[@"ios_extension"] = @(1);
+    }
     fullParamDict[@"retryNumber"] = @(retryNumber);
     fullParamDict[@"branch_key"] = key;
 

Branch-SDK/Branch-SDK/BNCStrongMatchHelper.m

@@ -107,7 +107,7 @@ - (void)presentSafariVCWithBranchKey:(NSString *)branchKey {
 
     Class SFSafariViewControllerClass = NSClassFromString(@"SFSafariViewController");
     Class UIApplicationClass = NSClassFromString(@"UIApplication");
-    if (SFSafariViewControllerClass && UIApplicationClass) {
+    if (SFSafariViewControllerClass) {
         NSURL *strongMatchUrl = [NSURL URLWithString:[urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
         if (!strongMatchUrl) {
             self.requestInProgress = NO;

Branch-SDK/Branch-SDK/Branch.m

@@ -432,8 +432,6 @@ - (BOOL)continueUserActivity:(NSUserActivity *)userActivity {
 - (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 ([[UIApplicationClass sharedApplication] applicationState] == UIApplicationStateActive) {
         [self callClose];
@@ -1265,7 +1263,7 @@ - (void)handleInitSuccess {
     }
 
     Class UIApplicationClass = NSClassFromString(@"UIApplication");
-    if (self.shouldAutomaticallyDeepLink && UIApplicationClass) {
+    if (self.shouldAutomaticallyDeepLink) {
         // 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]];

Branch-SDK/Branch-SDK/BranchUniversalObject.m

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

Branch-SDK/Branch-SDK/BranchViewHandler.m

@@ -44,8 +44,7 @@ - (BOOL)showBranchView:(NSString *)actionName withBranchViewDictionary:(NSDictio
 }
 
 - (BOOL)showBranchView:(BranchView *)branchView withDelegate:(id)callback {
-    Class UIApplicationClass = NSClassFromString(@"UIApplication");
-    if (UIApplicationClass && [branchView isAvailable]){
+    if ([branchView isAvailable]) {
         self.branchViewCallback = callback;
         [self showView:branchView];
         return YES;