CORE-2463 patch to mitigate a server issue

Author: echo-branch

Branch-SDK/BNCConfig.m

@@ -11,4 +11,4 @@
 NSString * const BNC_API_BASE_URL    = @"https://api2.branch.io";
 NSString * const BNC_API_VERSION     = @"v1";
 NSString * const BNC_LINK_URL        = @"https://bnc.lt";
-NSString * const BNC_SDK_VERSION     = @"1.40.0";
+NSString * const BNC_SDK_VERSION     = @"1.40.1";

Branch-SDK/BranchOpenRequest.m

@@ -163,6 +163,11 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
     }
 
     preferenceHelper.randomizedDeviceToken = data[BRANCH_RESPONSE_KEY_RANDOMIZED_DEVICE_TOKEN];
+    if (!preferenceHelper.randomizedDeviceToken) {
+        // fallback to deprecated name. Fingerprinting was removed long ago, hence the name change.
+        preferenceHelper.randomizedDeviceToken = data[@"device_fingerprint_id"];
+    }
+    
     preferenceHelper.userUrl = data[BRANCH_RESPONSE_KEY_USER_URL];
     preferenceHelper.userIdentity = userIdentity;
     preferenceHelper.sessionID = data[BRANCH_RESPONSE_KEY_SESSION_ID];
@@ -253,9 +258,17 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
     preferenceHelper.referringURL = referringURL;
     preferenceHelper.dropURLOpen = NO;
 
+    
     NSString *string = BNCStringFromWireFormat(data[BRANCH_RESPONSE_KEY_RANDOMIZED_BUNDLE_TOKEN]);
-    if (string) preferenceHelper.randomizedBundleToken = string;
-
+    if (!string) {
+        // fallback to deprecated name. The old name was easily confused with the setIdentity, hence the name change.
+        string = BNCStringFromWireFormat(data[@"identity_id"]);
+    }
+    
+    if (string) {
+        preferenceHelper.randomizedBundleToken = string;
+    }
+    
     [BranchOpenRequest releaseOpenResponseLock];
 
     BranchContentDiscoveryManifest *cdManifest = [BranchContentDiscoveryManifest getInstance];

Branch.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Branch"
-  s.version          = "1.40.0"
+  s.version          = "1.40.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?

ChangeLog.md

@@ -1,5 +1,8 @@
 Branch iOS SDK Change Log
 
+v.1.40.1
+- CORE-2463 workaround server side issue with inconsisent response payload.
+
 v.1.40.0
 
 - CORE-1589 Add support for LPLinkMetadata on share sheets. 
@@ -23,6 +26,8 @@ See https://developer.apple.com/documentation/linkpresentation/lplinkmetadata?la
 
 - CORE-1258 Rename device_fingerprint_id and identity_id to better reflect function. Fingerprinting was removed long ago.
 
+- CORE-2206 Remove credit related methods. The feature has been deprecated and the supporting services will be decommissioned.
+
 v1.39.4
 - CORE-2088 Add support for deferred deeplinks via pasteboard. This is not enabled by default.
 - CORE-1950 Record install referrer

carthage-files/BranchSDK.xcodeproj/project.pbxproj

@@ -1662,7 +1662,7 @@
 				INFOPLIST_FILE = "Branch-tvOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 1.40.0;
+				MARKETING_VERSION = 1.40.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1698,7 +1698,7 @@
 				INFOPLIST_FILE = "Branch-tvOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 1.40.0;
+				MARKETING_VERSION = 1.40.1;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1730,7 +1730,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.40.0;
+				MARKETING_VERSION = 1.40.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1759,7 +1759,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.40.0;
+				MARKETING_VERSION = 1.40.1;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1914,7 +1914,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.40.0;
+				MARKETING_VERSION = 1.40.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1941,7 +1941,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.40.0;
+				MARKETING_VERSION = 1.40.1;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;

carthage-files/checksum

@@ -1,2 +1,2 @@
 #checksum for Branch.zip on Github
-65d188b0f34af7e27fe6e8bf039fa43ccf06e257  Branch.zip
+933cb1aaf5094d1a578d8f4c8b014c1c4742c02b  Branch.zip

carthage-files/checksum_static

@@ -1,2 +1,2 @@
 #checksum for Branch-static.zip on Github
-0b453386520449985bf1c6f464c96902b8721cfa  Branch_static.zip
+8f83c0b51b7c6a64265f86543cd8ffa2fffba7bd  Branch_static.zip

scripts/version.sh

@@ -31,7 +31,7 @@ Options:
 USAGE
 }
 
-version=1.40.0
+version=1.40.1
 
 if (( $# == 0 )); then
     echo $version