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

Author: Edward Smith

Branch-SDK/Branch-SDK/BranchShareLink.m

@@ -23,7 +23,7 @@ typedef NS_ENUM(NSInteger, BranchShareActivityItemType) {
 #pragma mark BranchShareLink
 
 @interface BranchShareLink () {
-    NSArray<UIActivityItemProvider*>* _activityItems;
+    NSPointerArray* _activityItems;
 }
 
 - (id) shareObjectForItem:(BranchShareActivityItem*)activityItem
@@ -36,7 +36,7 @@ - (id) shareObjectForItem:(BranchShareActivityItem*)activityItem
 
 @interface BranchShareActivityItem : UIActivityItemProvider
 @property (nonatomic, assign) BranchShareActivityItemType itemType;
-@property (nonatomic, weak)   BranchShareLink *parent;
+@property (nonatomic, strong) BranchShareLink *parent;
 @end
 
 @implementation BranchShareActivityItem
@@ -85,10 +85,9 @@ - (void) shareDidComplete:(BOOL)completed activityError:(NSError*)error {
 
 - (NSArray<UIActivityItemProvider*>*_Nonnull) activityItems {
     if (_activityItems) {
-        return _activityItems;
+        return [_activityItems allObjects];
     }
 
-
     // Make sure we can share
 
     if (!(self.universalObject.canonicalIdentifier ||
@@ -111,12 +110,12 @@ - (void) shareDidComplete:(BOOL)completed activityError:(NSError*)error {
     [self.universalObject userCompletedAction:BNCShareInitiatedEvent];
 
     BranchShareActivityItem *item = nil;
-    NSMutableArray *items = [NSMutableArray new];
+    _activityItems = [NSPointerArray weakObjectsPointerArray];
     if (self.shareText.length) {
         item = [[BranchShareActivityItem alloc] initWithPlaceholderItem:self.shareText];
         item.itemType = BranchShareActivityItemTypeShareText;
         item.parent = self;
-        [items addObject:item];
+        [_activityItems addPointer:(__bridge void * _Nullable)(item)];
     }
 
     NSString *URLString =
@@ -131,17 +130,16 @@ - (void) shareDidComplete:(BOOL)completed activityError:(NSError*)error {
     item = [[BranchShareActivityItem alloc] initWithPlaceholderItem:URL];
     item.itemType = BranchShareActivityItemTypeBranchURL;
     item.parent = self;
-    [items addObject:item];
+    [_activityItems addPointer:(__bridge void * _Nullable)(item)];
 
     if (self.shareObject) {
         item = [[BranchShareActivityItem alloc] initWithPlaceholderItem:self.shareObject];
         item.itemType = BranchShareActivityItemTypeOther;
         item.parent = self;
-        [items addObject:self.shareObject];
+        [_activityItems addPointer:(__bridge void * _Nullable)(item)];
     }
 
-    _activityItems = items;
-    return _activityItems;
+    return [_activityItems allObjects];
 }
 
 - (void) presentActivityViewControllerFromViewController:(UIViewController*_Nullable)viewController

Branch-TestBed-Swift/TestBed-Swift/Base.lproj/Main.storyboard

@@ -272,7 +272,7 @@
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <state key="normal" title="Share Alias Branch Link"/>
                                                     <connections>
-                                                        <action selector="shareAliasBranchLinkAction:" destination="3bi-5k-7qj" eventType="touchUpInside" id="9Zf-kF-7nj"/>
+                                                        <action selector="shareAliasActivityViewController:" destination="3bi-5k-7qj" eventType="touchUpInside" id="ibr-Hq-JNL"/>
                                                     </connections>
                                                 </button>
                                             </subviews>

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

@@ -261,14 +261,46 @@ class ViewController: UITableViewController, BranchShareLinkDelegate {
         ) {
             branchShareLink.title = "Share your alias link!"
             branchShareLink.delegate = self
-            branchShareLink.shareText = "Shared from Branch's TestBed-Swift at \(self.dateFormatter().string(from: Date()))"
+            branchShareLink.shareText = 
+                "Shared from Branch's TestBed-Swift at \(self.dateFormatter().string(from: Date()))"
             branchShareLink.presentActivityViewController(
                 from: self,
                 anchor: actionButton
             )
         }
     }
 
+    @IBAction func shareAliasActivityViewController(_ sender: AnyObject) {
+        //  Share an alias Branch link:
+
+        let alias = "Share-Alias-Link-Example"
+        let canonicalIdentifier = alias
+
+        let shareBranchObject = BranchUniversalObject.init(canonicalIdentifier: canonicalIdentifier)
+        shareBranchObject.title = "Share Branch Link Example"
+        shareBranchObject.canonicalUrl = "https://developer.branch.io/"
+        shareBranchObject.imageUrl = "https://branch.io/img/press/kit/badge-black.png"
+        shareBranchObject.keywords = [ "example", "short", "share", "link" ]
+        shareBranchObject.contentDescription = "This is an example shared alias link."
+        shareBranchObject.addMetadataKey("publicSlug", value: canonicalIdentifier)
+
+        let shareLinkProperties = BranchLinkProperties()
+        shareLinkProperties.alias = alias
+        shareLinkProperties.controlParams = ["$fallback_url": "https://support.branch.io/support/home"]
+
+        if let branchShareLink = BranchShareLink.init(
+            universalObject: shareBranchObject,
+            linkProperties:  shareLinkProperties
+        ) {
+            branchShareLink.delegate = self
+            let activityViewController = UIActivityViewController.init(
+                activityItems: branchShareLink.activityItems(),
+                applicationActivities: nil
+            )
+            self.present(activityViewController, animated: true, completion: nil)
+        }
+    }
+
     func branchShareLinkWillShare(_ shareLink: BranchShareLink) {
 
         // Link properties, such as alias or channel can be overridden here based on the users'