Share always reports completed even when cancelled (AIS-395). (#736)

* Fixed logic change.

Author: E-B-Smith

Branch-SDK/Branch-SDK/BranchShareLink.m

@@ -79,7 +79,8 @@ - (void) shareDidComplete:(BOOL)completed activityError:(NSError*)error {
     if ([self.delegate respondsToSelector:@selector(branchShareLink:didComplete:withError:)]) {
         [self.delegate branchShareLink:self didComplete:completed withError:error];
     }
-    [self.universalObject userCompletedAction:BNCShareCompletedEvent];
+    if (completed && !error)
+        [self.universalObject userCompletedAction:BNCShareCompletedEvent];
     NSDictionary *attributes = [self.universalObject getDictionaryWithCompleteLinkProperties:self.linkProperties];
     [BNCFabricAnswers sendEventWithName:@"Branch Share" andAttributes:attributes];
 }

Branch-SDK/Branch-SDK/BranchUniversalObject.m

@@ -257,19 +257,21 @@ - (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties
     if ([shareViewController respondsToSelector:@selector(completionWithItemsHandler)]) {
         shareViewController.completionWithItemsHandler = ^(NSString *activityType, BOOL completed, NSArray *returnedItems, NSError *activityError) {
             // Log share completed event
-            [self userCompletedAction:BNCShareCompletedEvent];
-            if (completion || completionError) {
-                if (completion) { completion(activityType, completed); }
-                else if (completionError) { completionError(activityType, completed, activityError); }
-                [BNCFabricAnswers sendEventWithName:@"Branch Share" andAttributes:[self getDictionaryWithCompleteLinkProperties:linkProperties]];
-            }
+            if (completed && !activityError)
+                [self userCompletedAction:BNCShareCompletedEvent];
+            if (completion)
+                completion(activityType, completed);
+            else
+            if (completionError)
+                completionError(activityType, completed, activityError);
+            [BNCFabricAnswers sendEventWithName:@"Branch Share" andAttributes:[self getDictionaryWithCompleteLinkProperties:linkProperties]];
         };
     } else {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+        #pragma clang diagnostic push
+        #pragma clang diagnostic ignored "-Wdeprecated-declarations"
         // Deprecated in iOS 8.  Safe to hide deprecation warnings as the new completion handler is checked for above
         shareViewController.completionHandler = completion;
-#pragma clang diagnostic pop
+        #pragma clang diagnostic pop
     }
 
     UIViewController *presentingViewController;
@@ -278,7 +280,8 @@ - (void)showShareSheetWithLinkProperties:(BranchLinkProperties *)linkProperties
     }
     else {
         Class UIApplicationClass = NSClassFromString(@"UIApplication");
-        if ([[[[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];
         }
     }