Fix duplicate URL when sharing to clipboard (AIS-369,GH-#726).

Author: E-B-Smith

Branch-SDK/Branch-SDK/BranchActivityItemProvider.m

@@ -33,18 +33,30 @@ - (id)initWithParams:(NSDictionary *)params andTags:(NSArray *)tags andFeature:(
 
 - (id)initWithParams:(NSDictionary *)params tags:(NSArray *)tags feature:(NSString *)feature stage:(NSString *)stage campaign:(NSString *)campaign alias:(NSString *)alias delegate:(id <BranchActivityItemProviderDelegate>)delegate {
     NSString *url = [[Branch getInstance] getLongURLWithParams:params andChannel:nil andTags:tags andFeature:feature andStage:stage andAlias:alias];
-    
-    if ((self = [super initWithPlaceholderItem:[NSURL URLWithString:url]])) {
-        _params = params;
-        _tags = tags;
-        _feature = feature;
-        _stage = stage;
-        _campaign = campaign;
-        _alias = alias;
-        _userAgentString = [BNCDeviceInfo userAgentString];
-        _delegate = delegate;
+
+    if ([UIDevice currentDevice].systemVersion.doubleValue < 11.0) {
+        if ((self = [super initWithPlaceholderItem:[NSURL URLWithString:url]])) {
+            _params = params;
+            _tags = tags;
+            _feature = feature;
+            _stage = stage;
+            _campaign = campaign;
+            _alias = alias;
+            _userAgentString = [BNCDeviceInfo userAgentString];
+            _delegate = delegate;
+        }
+    } else {
+        if ((self = [super initWithPlaceholderItem:url])) {
+            _params = params;
+            _tags = tags;
+            _feature = feature;
+            _stage = stage;
+            _campaign = campaign;
+            _alias = alias;
+            _userAgentString = [BNCDeviceInfo userAgentString];
+            _delegate = delegate;
+        }
     }
-    
     return self;
 }
 
@@ -68,8 +80,8 @@ - (id)item {
     // existing list, telling the backend to ignore the first click
     NSArray *scrapers = @[@"Facebook", @"Twitter", @"Slack", @"Apple Notes"];
     for (NSString *scraper in scrapers) {
-        if ([channel isEqualToString:scraper])
-            return [NSURL URLWithString:[[Branch getInstance]
+        if ([channel isEqualToString:scraper]) {
+            NSURL *URL = [NSURL URLWithString:[[Branch getInstance]
                 getShortURLWithParams:params
                 andTags:tags
                 andChannel:channel
@@ -79,6 +91,8 @@ - (id)item {
                 andAlias:alias
                 ignoreUAString:self.userAgentString
                 forceLinkCreation:YES]];
+            return ([UIDevice currentDevice].systemVersion.doubleValue < 11.0) ? URL : URL.absoluteString;
+        }
     }
 
     // Wrap the link in HTML content
@@ -109,17 +123,18 @@ - (id)item {
             [params objectForKey:BRANCH_LINK_DATA_KEY_EMAIL_HTML_FOOTER]];
     }
 
-    return [NSURL URLWithString:[[Branch getInstance]
-        getShortURLWithParams:params
-        andTags:tags
-        andChannel:channel
-        andFeature:feature
-        andStage:stage
-        andCampaign:campaign
-        andAlias:alias
-        ignoreUAString:nil
-        forceLinkCreation:YES]];
-
+    NSURL *URL =
+        [NSURL URLWithString:[[Branch getInstance]
+            getShortURLWithParams:params
+            andTags:tags
+            andChannel:channel
+            andFeature:feature
+            andStage:stage
+            andCampaign:campaign
+            andAlias:alias
+            ignoreUAString:nil
+            forceLinkCreation:YES]];
+    return ([UIDevice currentDevice].systemVersion.doubleValue < 11.0) ? URL : URL.absoluteString;
 }
 
 #pragma mark - Internals

Branch-SDK/Branch-SDK/BranchShareLink.m

@@ -128,7 +128,10 @@ - (void) shareDidComplete:(BOOL)completed activityError:(NSError*)error {
             andStage:self.linkProperties.stage
             andAlias:self.linkProperties.alias];
     self.shareURL = [[NSURL alloc] initWithString:URLString];
-    item = [[BranchShareActivityItem alloc] initWithPlaceholderItem:self.shareURL];
+    if ([UIDevice currentDevice].systemVersion.doubleValue < 11.0)
+        item = [[BranchShareActivityItem alloc] initWithPlaceholderItem:self.shareURL];
+    else
+        item = [[BranchShareActivityItem alloc] initWithPlaceholderItem:self.shareURL.absoluteString];
     item.itemType = BranchShareActivityItemTypeBranchURL;
     item.parent = self;
     [items addObject:item];
@@ -258,7 +261,7 @@ - (id) shareObjectForItem:(BranchShareActivityItem*)activityItem
             ignoreUAString:userAgentString
             forceLinkCreation:YES];
     self.shareURL = [NSURL URLWithString:URLString];
-    return self.shareURL;
+    return ([UIDevice currentDevice].systemVersion.doubleValue < 11.0) ? self.shareURL :self.shareURL.absoluteString;
 }
 
 @end

ChangeLog.md

@@ -1,6 +1,7 @@
 Branch iOS SDK Change Log
 
 - v0.19.0
+  * Fixed duplicate URL being copied when a link is copied to the clipboard in iOS 11.
   * Changed the use of `typeof` to `__typeof`, for stricter compiler options.
   * The SDK now send the Apple Search Ad attribution only when it changes (DLA-969, #723).
   * Add local ip address to returned device info (AIS-341).