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

Author: E-B-Smith

Branch-SDK/Branch-SDK/BNCConfig.m

@@ -12,4 +12,4 @@
 BOOL       const BNC_API_PINNED      = YES;
 NSString * const BNC_API_VERSION     = @"v1";
 NSString * const BNC_LINK_URL        = @"https://bnc.lt";
-NSString * const BNC_SDK_VERSION     = @"0.23.4";
+NSString * const BNC_SDK_VERSION     = @"0.23.5";

Branch-SDK/Branch-SDK/BNCEncodingUtils.h

@@ -49,6 +49,7 @@ extern NSString* BNCWireFormatFromString(NSString *string);
 + (NSData *)encodeDictionaryToJsonData:(NSDictionary *)dictionary;
 
 + (NSString*) stringByPercentDecodingString:(NSString*)string;
++ (NSString*) stringByPercentEncodingStringForQuery:(NSString *)string;
 
 + (NSDictionary *)decodeJsonDataToDictionary:(NSData *)jsonData;
 + (NSDictionary *)decodeJsonStringToDictionary:(NSString *)jsonString;

Branch-SDK/Branch-SDK/BNCEncodingUtils.m

@@ -325,6 +325,11 @@ + (NSString*) stringByPercentDecodingString:(NSString *)string {
     return [string stringByRemovingPercentEncoding];
 }
 
++ (NSString*) stringByPercentEncodingStringForQuery:(NSString *)string {
+    return [string stringByAddingPercentEncodingWithAllowedCharacters:
+                [NSCharacterSet URLQueryAllowedCharacterSet]];
+}
+
 #pragma mark - Param Decoding Methods
 
 + (NSDictionary *)decodeJsonDataToDictionary:(NSData *)jsonData {

Branch-SDK/Branch-SDK/BNCLog.h

@@ -131,7 +131,7 @@ extern BNCLogFlushFunctionPtr _Nullable BNCLogFlushFunction(void);
 extern void BNCLogWriteMessageFormat(
     BNCLogLevel logLevel,
     const char *_Nullable sourceFileName,
-    int sourceLineNumber,
+    int32_t sourceLineNumber,
     id _Nullable messageFormat,
     ...
 );
@@ -140,7 +140,7 @@ extern void BNCLogWriteMessageFormat(
 extern void BNCLogWriteMessage(
     BNCLogLevel logLevel,
     NSString *_Nonnull sourceFileName,
-    NSUInteger sourceLineNumber,
+    int32_t sourceLineNumber,
     NSString *_Nonnull message
 );
 

Branch-SDK/Branch-SDK/BNCLog.m

@@ -593,7 +593,7 @@ void BNCLogSetFlushFunction(BNCLogFlushFunctionPtr flushFunction) {
 void BNCLogWriteMessageFormat(
         BNCLogLevel logLevel,
         const char *_Nullable file,
-        int lineNumber,
+        int32_t lineNumber,
         NSString *_Nullable message,
         ...
     ) {
@@ -642,10 +642,10 @@ void BNCLogWriteMessageFormat(
 void BNCLogWriteMessage(
         BNCLogLevel logLevel,
         NSString *_Nonnull file,
-        NSUInteger lineNumber,
+        int32_t lineNumber,
         NSString *_Nonnull message
     ) {
-    BNCLogWriteMessageFormat(logLevel, file.UTF8String, (int)lineNumber, @"%@", message);
+    BNCLogWriteMessageFormat(logLevel, file.UTF8String, lineNumber, @"%@", message);
 }
 
 void BNCLogFlushMessages() {

Branch-SDK/Branch-SDK/BNCURLBlackList.m

@@ -149,8 +149,12 @@ - (void) processServerOperation:(id<BNCNetworkOperationProtocol>)operation {
     NSString *responseString = nil;
     if (operation.responseData)
         responseString = [[NSString alloc] initWithData:operation.responseData encoding:NSUTF8StringEncoding];
-    BNCLogDebugSDK(@"No new BlackList refresh found. Error was: %@ status: %ld body:\n%@.",
-        operation.error, operation.response.statusCode, responseString);
+    if (operation.response.statusCode == 404) {
+        BNCLogDebugSDK(@"No new BlackList refresh found.");
+    } else {
+        BNCLogDebugSDK(@"BlackList refresh result. Error: %@ status: %ld body:\n%@.",
+            operation.error, operation.response.statusCode, responseString);
+    }
     if (operation.error || operation.responseData == nil || operation.response.statusCode != 200) {
         self.error = operation.error;
         return;

Branch-SDK/Branch-SDK/Branch.m

@@ -664,7 +664,7 @@ - (void) setBlackListURLRegex:(NSArray<NSString*>*)blackListURLs {
 }
 
 - (BOOL)handleDeepLink:(NSURL *)url {
-    return [self handleDeepLink:url fromSelf:NO];
+    return [self handleDeepLink:url fromSelf:YES];
 }
 
 -(BOOL)handleDeepLinkWithNewSession:(NSURL *)url{
@@ -1777,23 +1777,23 @@ - (NSString *)longUrlWithBaseUrl:(NSString *)baseUrl
     NSMutableString *longUrl = [[NSMutableString alloc] initWithFormat:@"%@?", baseUrl];
 
     for (NSString *tag in tags) {
-        [longUrl appendFormat:@"tags=%@&", tag];
+        [longUrl appendFormat:@"tags=%@&", [BNCEncodingUtils stringByPercentEncodingStringForQuery:tag]];
     }
 
     if ([alias length]) {
-        [longUrl appendFormat:@"alias=%@&", alias];
+        [longUrl appendFormat:@"alias=%@&", [BNCEncodingUtils stringByPercentEncodingStringForQuery:alias]];
     }
 
     if ([channel length]) {
-        [longUrl appendFormat:@"channel=%@&", channel];
+        [longUrl appendFormat:@"channel=%@&", [BNCEncodingUtils stringByPercentEncodingStringForQuery:channel]];
     }
 
     if ([feature length]) {
-        [longUrl appendFormat:@"feature=%@&", feature];
+        [longUrl appendFormat:@"feature=%@&", [BNCEncodingUtils stringByPercentEncodingStringForQuery:feature]];
     }
 
     if ([stage length]) {
-        [longUrl appendFormat:@"stage=%@&", stage];
+        [longUrl appendFormat:@"stage=%@&", [BNCEncodingUtils stringByPercentEncodingStringForQuery:stage]];
     }
     if (type) {
         [longUrl appendFormat:@"type=%ld&", (long)type];

Branch-SDK/Branch-SDK/BranchActivityItemProvider.m

@@ -107,7 +107,7 @@ - (id)item {
 
     // Because Facebook et al immediately scrape URLs, we add an additional parameter to the
     // existing list, telling the backend to ignore the first click
-    NSArray *scrapers = @[@"Facebook", @"Twitter", @"Slack", @"Apple Notes"];
+    NSArray *scrapers = @[@"Facebook", @"Twitter", @"Slack", @"Apple Notes", @"Skype"];
     for (NSString *scraper in scrapers) {
         if ([channel isEqualToString:scraper]) {
             NSURL *URL = [NSURL URLWithString:[[Branch getInstance]
@@ -188,6 +188,7 @@ + (NSString *)humanReadableChannelWithActivityType:(NSString *)activityString {
         @"WeChat",      @"com.tencent.xin.sharetimeline",
         @"LINE",        @"jp.naver.line.Share",
 		@"Pinterest",   @"pinterest.ShareExtension",
+        @"Skype",       @"com.skype.skype.sharingextension",
 
         //  Keys for older app versions --
 

Branch-SDK/Branch-SDK/BranchLinkProperties.m

@@ -19,9 +19,7 @@ - (NSDictionary *)controlParams {
 }
 
 - (void)addControlParam:(NSString *)controlParam withValue:(NSString *)value {
-    if (!controlParam || !value) {
-        return;
-    }
+    if (!controlParam) return;
     NSMutableDictionary *temp = [self.controlParams mutableCopy];
     temp[controlParam] = value;
     _controlParams = [temp copy];

Branch-SDK/Branch-SDK/BranchShareLink.h

@@ -94,6 +94,10 @@ Presents a UIActivityViewController that shares the Branch link.
 ///This object can be changed later when the `branchShareSheetWillShare:` delegate method is called.
 @property (nonatomic, strong) id _Nullable shareObject;
 
+///Sets an email subject line for the share activity. If the Branch link property already has an
+///email subject, that attribute takes precedence over this field.
+@property (nonatomic, strong) NSString*_Nullable emailSubject;
+
 ///The resulting Branch URL that was shared.
 @property (nonatomic, strong, readonly) NSURL*_Nullable shareURL;