Release 3.5.1

Author: nsingh-branch

BranchSDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "BranchSDK"
-  s.version          = "3.5.0"
+  s.version          = "3.5.1"
   s.summary          = "Create an HTTP URL for any piece of content in your app"
   s.description      = <<-DESC
 - Want the highest possible conversions on your sharing feature?

BranchSDK.xcodeproj/project.pbxproj

@@ -1974,7 +1974,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.5.0;
+				MARKETING_VERSION = 3.5.1;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,
@@ -2009,7 +2009,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.5.0;
+				MARKETING_VERSION = 3.5.1;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,
@@ -2215,7 +2215,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACH_O_TYPE = staticlib;
-				MARKETING_VERSION = 3.5.0;
+				MARKETING_VERSION = 3.5.1;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,
@@ -2254,7 +2254,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACH_O_TYPE = staticlib;
-				MARKETING_VERSION = 3.5.0;
+				MARKETING_VERSION = 3.5.1;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,
@@ -2291,7 +2291,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.5.0;
+				MARKETING_VERSION = 3.5.1;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,
@@ -2326,7 +2326,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.5.0;
+				MARKETING_VERSION = 3.5.1;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					LinkPresentation,

ChangeLog.md

@@ -1,5 +1,8 @@
 Branch iOS SDK Change Log
 
+v.3.5.1
+- Minor logging improvement
+
 v.3.5.0
 - Add additional logging
 - Update setRequestMetadata signature to use NSString

Sources/BranchSDK/BNCConfig.m

@@ -8,7 +8,7 @@
 
 #include "BNCConfig.h"
 
-NSString * const BNC_SDK_VERSION  = @"3.5.0";
+NSString * const BNC_SDK_VERSION  = @"3.5.1";
 NSString * const BNC_LINK_URL = @"https://bnc.lt";
 NSString * const BNC_CDN_URL = @"https://cdn.branch.io";
 

Sources/BranchSDK/BNCServerInterface.m

@@ -125,9 +125,11 @@ - (void)genericHTTPRequest:(NSURLRequest *)request retryNumber:(NSInteger)retryN
             } else {
                 if (status != 200) {
                     if ([NSError branchDNSBlockingError:underlyingError]) {
-                        [[BranchLogger shared] logWarning:[NSString stringWithFormat:@"Possible DNS Ad Blocker. Giving up on request with HTTP status code %ld", (long)status] error:underlyingError];
+                        NSError *error = [NSError branchErrorWithCode:BNCDNSAdBlockerError];
+                        [[BranchLogger shared] logError:[NSString stringWithFormat:@"Possible DNS Ad Blocker. Giving up on request with HTTP status code %ld. Underlying error: %@", (long)status, underlyingError] error:error];
                     } else if ([NSError branchVPNBlockingError:underlyingError]) {
-                        [[BranchLogger shared] logWarning:[NSString stringWithFormat:@"Possible VPN Ad Blocker. Giving up on request with HTTP status code %ld", (long)status] error:underlyingError];
+                        NSError *error = [NSError branchErrorWithCode:BNCVPNAdBlockerError];
+                        [[BranchLogger shared] logError:[NSString stringWithFormat:@"Possible VPN Ad Blocker. Giving up on request with HTTP status code %ld. Underlying error: %@", (long)status, underlyingError] error:error];
                     } else {
                         [[BranchLogger shared] logWarning: [NSString stringWithFormat:@"Giving up on request with HTTP status code %ld", (long)status] error:underlyingError];
                     }

Sources/BranchSDK/BNCURLFilter.m

@@ -130,11 +130,13 @@ - (BOOL)foundUpdatedURLList:(id<BNCNetworkOperationProtocol>)operation {
     if (statusCode == 404) {
         [[BranchLogger shared] logDebug:@"No update for URL ignore list found." error:nil];
         return NO;
-    } else if (statusCode != 200 || error != nil || jsonString == nil) {
+    } else if (statusCode != 200 || error != nil || jsonString == nil) {   
         if ([NSError branchDNSBlockingError:error]) {
-            [[BranchLogger shared] logWarning:@"Possible DNS Ad Blocker" error:error];
+            NSError *dnsError = [NSError branchErrorWithCode:BNCDNSAdBlockerError];
+            [[BranchLogger shared] logError:[NSString stringWithFormat:@"Possible DNS Ad Blocker. Giving up on request with HTTP status code %ld. Underlying error: %@", (long)statusCode, error] error:dnsError];
         } else if ([NSError branchVPNBlockingError:error]) {
-            [[BranchLogger shared] logWarning:@"Possible VPN Ad Blocker" error:error];
+            NSError *vpnError = [NSError branchErrorWithCode:BNCVPNAdBlockerError];
+            [[BranchLogger shared] logError:[NSString stringWithFormat:@"Possible VPN Ad Blocker. Giving up on request with HTTP status code %ld. Underlying error: %@", (long)statusCode, error] error:vpnError];
         } else {
             [[BranchLogger shared] logWarning:@"Failed to update URL ignore list" error:operation.error];
         }

Sources/BranchSDK/BranchQRCode.m

@@ -144,9 +144,11 @@ - (void)callQRCodeAPI:(nullable NSDictionary *)params
 
         if (error) {
             if ([NSError branchDNSBlockingError:error]) {
-                [[BranchLogger shared] logWarning:@"Possible DNS Ad Blocker" error:error];
+                NSError *dnsError = [NSError branchErrorWithCode:BNCDNSAdBlockerError];
+                [[BranchLogger shared] logError:[NSString stringWithFormat:@"Possible DNS Ad Blocker. Giving up on QR code request. Underlying error: %@", error] error:dnsError];
             } else if ([NSError branchVPNBlockingError:error]) {
-                [[BranchLogger shared] logWarning:@"Possible VPN Ad Blocker" error:error];
+                NSError *vpnError = [NSError branchErrorWithCode:BNCVPNAdBlockerError];
+                [[BranchLogger shared] logError:[NSString stringWithFormat:@"Possible VPN Ad Blocker. Giving up on QR code request. Underlying error: %@", error] error:vpnError];
             } else {
                 [[BranchLogger shared] logError:@"QR Code request failed" error:error];
                 completion(nil, error);

Sources/BranchSDK/NSError+Branch.m

@@ -40,6 +40,8 @@ + (NSString *)messageForCode:(BNCErrorCode)code {
         [messages setObject:@"The Spotlight identifier is required to remove indexing from spotlight." forKey:@(BNCSpotlightIdentifierError)];
         [messages setObject:@"Spotlight cannot remove publicly indexed content." forKey:@(BNCSpotlightPublicIndexError)];
         [messages setObject:@"User tracking is disabled and the request is not allowed" forKey:@(BNCTrackingDisabledError)];
+        [messages setObject:@"Possible DNS Ad Blocker. Giving up on request." forKey:@(BNCDNSAdBlockerError)];
+        [messages setObject:@"Possible VPN Ad Blocker. Giving up on request." forKey:@(BNCVPNAdBlockerError)];
     });
 
     NSString *errorMessage = [messages objectForKey:@(code)];

Sources/BranchSDK/Private/NSError+Branch.h

@@ -32,6 +32,8 @@ typedef NS_ENUM(NSInteger, BNCErrorCode) {
     BNCSpotlightPublicIndexError    = 1014,
     BNCTrackingDisabledError        = 1015,
     BNCGeneralError                 = 1016, // General Branch SDK Error
+    BNCDNSAdBlockerError                 = 1017,
+    BNCVPNAdBlockerError                 = 1018,
     BNCHighestError
 };
 

scripts/version.sh

@@ -30,7 +30,7 @@ Options:
 USAGE
 }
 
-version=3.5.0
+version=3.5.1
 prev_version="$version"
 
 if (( $# == 0 )); then