indexing cleanup

Author: ahmednawar

Branch-SDK/Branch-SDK/BNCContentDiscoveryManager.m

@@ -416,18 +416,14 @@ - (void)indexContentWithTitle:(NSString *)title
 
 
 - (void)indexContentWithUrl:(NSString *)url spotlightIdentifier:(NSString *)spotlightIdentifier title:(NSString *)title description:(NSString *)description type:(NSString *)type thumbnailUrl:(NSURL *)thumbnailUrl thumbnailData:(NSData *)thumbnailData publiclyIndexable:(BOOL)publiclyIndexable userInfo:(NSDictionary *)userInfo keywords:(NSSet *)keywords expirationDate:(NSDate *)expirationDate callback:(callbackWithUrl)callback spotlightCallback:(callbackWithUrlAndSpotlightIdentifier)spotlightCallback {
-    // NSUserActivity is available iOS 8+
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 90000
 
     id CSSearchableItemAttributeSetClass = NSClassFromString(@"CSSearchableItemAttributeSet");
     id attributes = [CSSearchableItemAttributeSetClass alloc];
     SEL initAttributesSelector = NSSelectorFromString(@"initWithItemContentType:");
     attributes = ((id (*)(id, SEL, NSString *))[attributes methodForSelector:initAttributesSelector])(attributes, initAttributesSelector, type);
     SEL setIdentifierSelector = NSSelectorFromString(@"setIdentifier:");
     ((void (*)(id, SEL, NSString *))[attributes methodForSelector:setIdentifierSelector])(attributes, setIdentifierSelector, spotlightIdentifier);
-    // NSUserActivity.CSSearchableItemAttributeSet.relatedUniqueIdentifier
-    SEL setRelatedUniqueIdentifierSelector = NSSelectorFromString(@"setRelatedUniqueIdentifier:");
-    ((void (*)(id, SEL, NSString *))[attributes methodForSelector:setRelatedUniqueIdentifierSelector])(attributes, setRelatedUniqueIdentifierSelector, url);
     SEL setTitleSelector = NSSelectorFromString(@"setTitle:");
     ((void (*)(id, SEL, NSString *))[attributes methodForSelector:setTitleSelector])(attributes, setTitleSelector, title);
     SEL setContentDescriptionSelector = NSSelectorFromString(@"setContentDescription:");
@@ -449,6 +445,15 @@ - (void)indexContentWithUrl:(NSString *)url spotlightIdentifier:(NSString *)spot
                                                  @"attributeSet": attributes
                                                  };
     [self indexUsingNSUserActivity:userActivityIndexingParams];
+    
+    // not handling error scenarios because they are already handled upstream by the caller
+    if (url) {
+        if (callback) {
+            callback(url, nil);
+        } else if (spotlightCallback) {
+            spotlightCallback(url, spotlightIdentifier, nil);
+        }
+    }
 #endif
 }
 
@@ -478,20 +483,19 @@ - (UIViewController *)getActiveViewController:(UIViewController *)rootViewContro
 }
 
 - (void)indexUsingNSUserActivity:(NSDictionary *)params {
-    NSLog(@"indexUsingNSUserActivity %@", params);
     self.userInfo = params[@"userInfo"];
     self.userInfo[CSSearchableItemActivityIdentifier] = params[@"spotlightId"];
 
     UIViewController *activeViewController = [self getActiveViewController];
     NSString *uniqueIdentifier = [NSString stringWithFormat:@"io.branch.%@", [[NSBundle mainBundle] bundleIdentifier]];
     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;
-    activeViewController.userActivity.delegate = self;
-    activeViewController.userActivity.requiredUserInfoKeys = [NSSet setWithArray:self.userInfo.allKeys]; // This, however, seems to force the userInfo to come through.
+    activeViewController.userActivity.userInfo = self.userInfo; // This alone doesn't pass userInfo thru
+    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:");
     ((void (*)(id, SEL, id))[activeViewController.userActivity methodForSelector:setContentAttributeSetSelector])(activeViewController.userActivity, setContentAttributeSetSelector, params[@"attributeSet"]);

Branch-SDK/Branch-SDK/BranchUniversalObject.h

@@ -60,9 +60,7 @@ typedef NS_ENUM(NSInteger, ContentIndexMode) {
 
 - (void)listOnSpotlight;
 - (void)listOnSpotlightWithCallback:(callbackWithUrl)callback;
-// DEPRECATE  https://dev.branch.io/features/spotlight-indexing/overview/
-//Message: “iOS 10 has changed how Spotlight indexing works and we’ve updated the SDK to reflect this. Please see <link> for instructions on migration"
-- (void)listOnSpotlightWithIdentifierCallback:(callbackWithUrlAndSpotlightIdentifier)spotlightCallback;
+- (void)listOnSpotlightWithIdentifierCallback:(callbackWithUrlAndSpotlightIdentifier)spotlightCallback __attribute__((deprecated(("iOS 10 has changed how Spotlight indexing works and we’ve updated the SDK to reflect this. Please see https://dev.branch.io/features/spotlight-indexing/overview/ for instructions on migration"))));;
 
 // Convenience method for initSession methods that return BranchUniversalObject, but can be used safely by anyone.
 + (BranchUniversalObject *)getBranchUniversalObjectFromDictionary:(NSDictionary *)dictionary;