minor refactor

Author: ahmednawar

Branch-SDK/Branch-SDK/BNCContentDiscoveryManager.m

@@ -39,14 +39,15 @@ @implementation BNCContentDiscoveryManager
 #pragma mark - Launch handling
 
 - (NSString *)spotlightIdentifierFromActivity:(NSUserActivity *)userActivity {
-    
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000
-    // Matched if it has our prefix, then the link identifier is just the last piece of the identifier.
+    // If it has our prefix, then the link identifier is just the last piece of the identifier.
     NSString *activityIdentifier = userActivity.userInfo[CSSearchableItemActivityIdentifier];
     BOOL isBranchIdentifier = [activityIdentifier hasPrefix:BRANCH_SPOTLIGHT_PREFIX];
 
+    // Checking for CSSearchableItemActionType in the activity for legacy spotlight indexing (pre 0.12.7)
+    // Now we index NSUserActivies with type set to io.branch. + bundleId for better SEO
     if ([userActivity.activityType isEqualToString:CSSearchableItemActionType] || isBranchIdentifier) {
-            return activityIdentifier;
+        return activityIdentifier;
     }
 #endif
 
@@ -446,7 +447,7 @@ - (void)indexContentWithUrl:(NSString *)url spotlightIdentifier:(NSString *)spot
                                                  };
     [self indexUsingNSUserActivity:userActivityIndexingParams];
 
-    // not handling error scenarios because they are already handled upstream by the caller
+    // Not handling error scenarios because they are already handled upstream by the caller
     if (url) {
         if (callback) {
             callback(url, nil);
@@ -488,13 +489,14 @@ - (void)indexUsingNSUserActivity:(NSDictionary *)params {
 
     UIViewController *activeViewController = [self getActiveViewController];
     NSString *uniqueIdentifier = [NSString stringWithFormat:@"io.branch.%@", [[NSBundle mainBundle] bundleIdentifier]];
+    // Can't create any weak references here to the userActivity, otherwise it will not index.
     activeViewController.userActivity = [[NSUserActivity alloc] initWithActivityType:uniqueIdentifier];
     activeViewController.userActivity.delegate = self;
     activeViewController.userActivity.title = params[@"title"];
     activeViewController.userActivity.webpageURL = [NSURL URLWithString:params[@"url"]];
     activeViewController.userActivity.eligibleForSearch = YES;
     activeViewController.userActivity.eligibleForPublicIndexing = params[@"publiclyIndexable"];
-    activeViewController.userActivity.userInfo = self.userInfo; // This alone doesn't pass userInfo thru
+    activeViewController.userActivity.userInfo = self.userInfo; // This alone doesn't pass userInfo through
     activeViewController.userActivity.requiredUserInfoKeys = [NSSet setWithArray:self.userInfo.allKeys]; // This along with the delegate method userActivityWillSave, however, seem to force the userInfo to come through.
     activeViewController.userActivity.keywords = params[@"keywords"];
     SEL setContentAttributeSetSelector = NSSelectorFromString(@"setContentAttributeSet:");

Branch-SDK/Branch-SDK/Branch.m

@@ -406,7 +406,7 @@ - (BOOL)continueUserActivity:(NSUserActivity *)userActivity {
         return NO;
     }
 
-    //check to see if a spotlight activity needs to be handled
+    // Check to see if a spotlight activity needs to be handled
     NSString *spotlightIdentifier = [self.contentDiscoveryManager spotlightIdentifierFromActivity:userActivity];
 
     if (spotlightIdentifier) {
@@ -418,6 +418,7 @@ - (BOOL)continueUserActivity:(NSUserActivity *)userActivity {
             self.preferenceHelper.spotlightIdentifier = nonBranchSpotlightIdentifier;
         }
     }
+    
     [self initUserSessionAndCallCallback:YES];
     self.preferenceHelper.shouldWaitForInit = NO;
 
@@ -1325,4 +1326,4 @@ + (NSString *)kitDisplayVersion {
 	return @"0.12.6";
 }
 
-@end
+@end

Branch-TestBed/Branch-TestBed/AppDelegate.m

@@ -20,7 +20,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
      */
 
     Branch *branch = [Branch getInstance];
-    [branch setDebug];
+    //[branch setDebug];
     [branch setWhiteListedSchemes:@[@"branchtest"]];
 
     // Automatic Deeplinking on "deeplink_text"
@@ -69,7 +69,7 @@ - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceAppl
 
 
 - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray *))restorationHandler {
-    NSLog(@"application:continueUserActivity:restorationHandler: invoked. userActivity.webpageURL if any: %@", userActivity.webpageURL.absoluteString);
+    NSLog(@"application:continueUserActivity:restorationHandler: invoked. activityType: %@ userActivity.webpageURL: %@", userActivity.activityType, userActivity.webpageURL.absoluteString);
 
     // Required. Returns YES if Branch Universal Link, else returns NO. Add `branch_universal_link_domains` to .plist (String or Array) for custom domain(s).
     [[Branch getInstance] continueUserActivity:userActivity];

Branch-TestBed/Branch-TestBed/ViewController.m

@@ -198,18 +198,6 @@ - (IBAction)shareLinkButtonTouchUpInside:(id)sender {
 }
 
 
-/*
- - (IBAction)cmdIndexSpotlight:(id)sender {
- [self.branchUniversalObject listOnSpotlightWithCallback:^(NSString *url, NSError *error) {
- if (!error) {
- NSLog(@"Branch TestBed: ShortURL: %@", url);
- } else {
- NSLog(@"Branch TestBed: Error: %@", error);
- }
- }];
- }*/
-
-
 //example using callbackWithURLandSpotlightIdentifier
 - (IBAction)registerWithSpotlightButtonTouchUpInside:(id)sender {
     [self.branchUniversalObject addMetadataKey:@"deeplink_text" value:@"This link was generated for Spotlight registration"];