Merge pull request #270 from garnett/share-sheet

Implement methods exposing proper sharing completion handling

Author: Sarkar

Branch-SDK/Branch-SDK/BranchUniversalObject.h

@@ -11,6 +11,7 @@
 #import "Branch.h"
 
 typedef void (^callback) ();
+typedef void (^shareCompletion) (NSString *activityType, BOOL completed);
 
 @interface BranchUniversalObject : NSObject
 
@@ -40,8 +41,11 @@ typedef NS_ENUM(NSInteger, ContentIndexMode) {
 - (NSString *)getShortUrlWithLinkProperties:(BranchLinkProperties *)linkProperties;
 - (void)getShortUrlWithLinkProperties:(BranchLinkProperties *)linkProperties andCallback:(callbackWithUrl)callback;
 - (UIActivityItemProvider *)getBranchActivityItemWithLinkProperties:(BranchLinkProperties *)linkProperties;
-- (void)showShareSheetWithShareText:(NSString *)shareText andCallback:(callback)callback;
-- (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties andShareText:(NSString *)shareText fromViewController:(UIViewController *)viewController andCallback:(callback)callback;
+- (void)showShareSheetWithShareText:(NSString *)shareText andCallback:(callback)callback __attribute__((deprecated(("This method has been deprecated. Use -[showShareSheetWithShareText:completion:] instead."))));
+- (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties andShareText:(NSString *)shareText fromViewController:(UIViewController *)viewController andCallback:(callback)callback __attribute__((deprecated(("This method has been deprecated. Use -[showShareSheetWithLinkProperties:andShareText:fromViewController:viewController:completion:] instead."))));
+- (void)showShareSheetWithShareText:(NSString *)shareText completion:(shareCompletion)completion;
+- (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties andShareText:(NSString *)shareText fromViewController:(UIViewController *)viewController completion:(shareCompletion)completion;
+
 - (void)listOnSpotlight;
 - (void)listOnSpotlightWithCallback:(callbackWithUrl)callback;
 - (void)listOnSpotlightWithIdentifierCallback:(callbackWithUrlAndSpotlightIdentifier)spotlightCallback;

Branch-SDK/Branch-SDK/BranchUniversalObject.m

@@ -120,18 +120,28 @@ - (UIActivityItemProvider *)getBranchActivityItemWithLinkProperties:(BranchLinkP
                                              alias:linkProperties.alias];
 }
 
-- (void)showShareSheetWithShareText:(NSString *)shareText andCallback:(callback)callback {
-    [self showShareSheetWithLinkProperties:nil andShareText:shareText fromViewController:nil andCallback:callback];
+- (void)showShareSheetWithShareText:(NSString *)shareText completion:(shareCompletion)completion {
+    [self showShareSheetWithLinkProperties:nil andShareText:shareText fromViewController:nil completion:completion];
 }
 
-- (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties andShareText:(NSString *)shareText fromViewController:(UIViewController *)viewController andCallback:(callback)callback {
+- (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties andShareText:(NSString *)shareText fromViewController:(UIViewController *)viewController completion:(shareCompletion)completion {
     UIActivityItemProvider *itemProvider = [self getBranchActivityItemWithLinkProperties:linkProperties];
     NSMutableArray *items = [NSMutableArray arrayWithObject:itemProvider];
     if (shareText) {
         [items addObject:shareText];
     }
     UIActivityViewController *shareViewController = [[UIActivityViewController alloc] initWithActivityItems:items applicationActivities:nil];
 
+    if ([shareViewController respondsToSelector:@selector(completionWithItemsHandler)]) {
+        shareViewController.completionWithItemsHandler = ^(NSString *activityType, BOOL completed, NSArray *returnedItems, NSError *activityError) {
+            if (completion) {
+                completion(activityType, completed);
+            }
+        };
+    } else {
+        shareViewController.completionHandler = completion;
+    }
+    
     UIViewController *presentingViewController;
     if (viewController && [viewController respondsToSelector:@selector(presentViewController:animated:completion:)]) {
         presentingViewController = viewController;
@@ -154,13 +164,26 @@ - (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties
         if ([presentingViewController respondsToSelector:@selector(popoverPresentationController)]) {
             shareViewController.popoverPresentationController.sourceView = presentingViewController.view;
         }
-        [presentingViewController presentViewController:shareViewController animated:YES completion:callback];
+        [presentingViewController presentViewController:shareViewController animated:YES completion:nil];
     }
     else {
         NSLog(@"[Branch warning, fatal] No view controller is present to show the share sheet. Aborting.");
     }
 }
 
+
+- (void)showShareSheetWithShareText:(NSString *)shareText andCallback:(callback)callback {
+    [self showShareSheetWithLinkProperties:nil andShareText:shareText fromViewController:nil andCallback:callback];
+}
+
+- (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties andShareText:(NSString *)shareText fromViewController:(UIViewController *)viewController andCallback:(callback)callback {
+    [self showShareSheetWithLinkProperties:linkProperties andShareText:shareText fromViewController:viewController completion:^(NSString *activityType, BOOL completed) {
+        if (callback) {
+            callback();
+        }
+    }];
+}
+
 - (void)listOnSpotlight {
     [self listOnSpotlightWithCallback:nil];
 }

Branch-TestBed/Branch-TestBed/ViewController.m

@@ -56,11 +56,12 @@ - (IBAction)cmdShareLink:(id)sender {
     [linkProperties addControlParam:@"$ios_url" withValue:@"http://example.com/ios"];
 
 
-    [self.branchUniversalObject showShareSheetWithLinkProperties:linkProperties
-                                                    andShareText:@"Super amazing thing I want to share"
-                                              fromViewController:self
-                                                     andCallback:^{
-        NSLog(@"Finished showing the share sheet!!");
+    [self.branchUniversalObject
+     showShareSheetWithShareText:@"Super amazing thing I want to share"
+     completion:^(NSString *activityType, BOOL completed) {
+         if (completed) {
+             NSLog(@"%@", [NSString stringWithFormat:@"Completed sharing to %@", activityType]);
+         }
     }];
 }
 - (IBAction)cmdRegisterView:(id)sender {