SDK-1741 Fix iOS 15.4 callback handling when SKAN is enabled.

echo-branch · echo-branch · commit 65dcd12e0107 · 2022-12-16T19:08:29.000-08:00
diff --git a/Branch-SDK/BNCConfig.m b/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.45.1";
+NSString * const BNC_SDK_VERSION     = @"1.45.2";
diff --git a/Branch-SDK/Branch.h b/Branch-SDK/Branch.h
@@ -970,7 +970,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  
  @param action The action string.
  */
-- (void)userCompletedAction:(nullable NSString *)action;
+- (void)userCompletedAction:(nullable NSString *)action __attribute__((deprecated(("Please use BranchEvent to track commerce events. You can refer to https://help.branch.io/developers-hub/docs/tracking-commerce-content-lifecycle-and-custom-events for additional information."))));
 
 /**
  Send a user action to the server with additional state items. Some examples actions could be things like `viewed_personal_welcome`, `purchased_an_item`, etc.
@@ -982,7 +982,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  @param action The action string.
  @param state The additional state items associated with the action.
  */
-- (void)userCompletedAction:(nullable NSString *)action withState:(nullable NSDictionary *)state;
+- (void)userCompletedAction:(nullable NSString *)action withState:(nullable NSDictionary *)state __attribute__((deprecated(("Please use BranchEvent to track commerce events. You can refer to https://help.branch.io/developers-hub/docs/tracking-commerce-content-lifecycle-and-custom-events for additional information."))));
 
 /**
  Send a user action to the server with additional state items. Some examples actions could be things like `viewed_personal_welcome`, `purchased_an_item`, etc.
@@ -997,7 +997,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  
  @deprecated Please use userCompletedAction:action:state instead
  */
-- (void)userCompletedAction:(nullable NSString *)action withState:(nullable NSDictionary *)state withDelegate:(nullable id)branchViewCallback __attribute__((deprecated(("This API is deprecated. Please use userCompletedAction:action:state instead."))));
+- (void)userCompletedAction:(nullable NSString *)action withState:(nullable NSDictionary *)state withDelegate:(nullable id)branchViewCallback __attribute__((deprecated(("Please use BranchEvent to track commerce events. You can refer to https://help.branch.io/developers-hub/docs/tracking-commerce-content-lifecycle-and-custom-events for additional information."))));
 
 /**
  Sends a user commerce event to the server.
@@ -1019,7 +1019,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
  */
 - (void) sendCommerceEvent:(BNCCommerceEvent*)commerceEvent
 				  metadata:(NSDictionary<NSString*,id>*)metadata
-			withCompletion:(void (^) (NSDictionary* _Nullable response, NSError* _Nullable error))completion __attribute__((deprecated(("Please use BranchEvent to track commerce events."))));
+			withCompletion:(void (^) (NSDictionary* _Nullable response, NSError* _Nullable error))completion __attribute__((deprecated(("Please use BranchEvent to track commerce events. You can refer to https://help.branch.io/developers-hub/docs/tracking-commerce-content-lifecycle-and-custom-events for additional information."))));
 
 
 #pragma mark - Query methods
diff --git a/Branch-SDK/Branch.m b/Branch-SDK/Branch.m
@@ -1134,6 +1134,9 @@ - (void)userCompletedAction:(NSString *)action {
 }
 
 - (void)userCompletedAction:(NSString *)action withState:(NSDictionary *)state {
+    
+    NSLog(@"'userCompletedAction' method has been deprecated. Please use BranchEvent for your event tracking use cases. You can refer to https://help.branch.io/developers-hub/docs/tracking-commerce-content-lifecycle-and-custom-events for additional information.");
+    
     if (!action) {
         return;
     }
@@ -1164,6 +1167,7 @@ - (void)sendServerRequestWithoutSession:(BNCServerRequest*)request {
 }
 
 - (void)sendCommerceEvent:(BNCCommerceEvent *)commerceEvent metadata:(NSDictionary*)metadata withCompletion:(void (^)(NSDictionary *, NSError *))completion {
+    NSLog(@"'sendCommerceEvent' method has been deprecated. Please use BranchEvent for your event tracking use cases. You can refer to https://help.branch.io/developers-hub/docs/tracking-commerce-content-lifecycle-and-custom-events for additional information.");
     [self initSafetyCheck];
     dispatch_async(self.isolationQueue, ^(){
         BranchCommerceEventRequest *request = [[BranchCommerceEventRequest alloc] initWithCommerceEvent:commerceEvent metadata:metadata completion:completion];
diff --git a/Branch-SDK/BranchEvent.m b/Branch-SDK/BranchEvent.m
@@ -98,7 +98,6 @@ - (void)processResponse:(BNCServerResponse*)response error:(NSError*)error {
                         } else {
                             BNCLogDebug([NSString stringWithFormat:@"Update conversion value was successful. Conversion Value - %@", conversionValue]);
                         }
-                        return;
                     }];
                 }
                 
@@ -109,9 +108,7 @@ - (void)processResponse:(BNCServerResponse*)response error:(NSError*)error {
                     } else {
                         BNCLogDebug([NSString stringWithFormat:@"Update conversion value was successful. Conversion Value - %@", conversionValue]);
                     }
-                    return;
                 }];
-                return;
             } else {
                 [[BNCSKAdNetwork sharedInstance] updateConversionValue:conversionValue.integerValue];
             }
diff --git a/Branch-SDK/BranchOpenRequest.m b/Branch-SDK/BranchOpenRequest.m
@@ -336,7 +336,6 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
                 
                 if(shouldCallUpdatePostback){
                     [[BNCSKAdNetwork sharedInstance] updatePostbackConversionValue: conversionValue.longValue coarseValue:coarseConversionValue lockWindow:lockWin completionHandler:^(NSError * _Nullable error) {
-                        
                         if (error) {
                             BNCLogError([NSString stringWithFormat:@"Update conversion value failed with error - %@", [error description]]);
                         } else {
@@ -346,15 +345,12 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
                 }
             } else if (@available(iOS 15.4, *)) {
                 [[BNCSKAdNetwork sharedInstance] updatePostbackConversionValue:conversionValue.intValue completionHandler: ^(NSError *error){
-                    
                     if (error) {
                         BNCLogError([NSString stringWithFormat:@"Update conversion value failed with error - %@", [error description]]);
                     } else {
                         BNCLogDebug([NSString stringWithFormat:@"Update conversion value was successful. Conversion Value - %@", conversionValue]);
                     }
-                    return;
                 }];
-                return;
             } else {
                 [[BNCSKAdNetwork sharedInstance] updateConversionValue:conversionValue.integerValue];
             }
diff --git a/Branch-TestBed/Branch-TestBed.xcodeproj/Branch-TestBed.xctestplan b/Branch-TestBed/Branch-TestBed.xcodeproj/Branch-TestBed.xctestplan
@@ -30,8 +30,7 @@
         "resolvedPath" : "..\/Simulate-FirstRun.xcappdata"
       },
       "skippedTests" : [
-        "BNCAppleAdClientTests",
-        "BNCAppleSearchAdsTests"
+        "BNCServerInterfaceTests"
       ],
       "target" : {
         "containerPath" : "container:Branch-TestBed.xcodeproj",
diff --git a/Branch-TestBed/Framework-Info.plist b/Branch-TestBed/Framework-Info.plist
diff --git a/Branch-TestBed/Podfile.lock b/Branch-TestBed/Podfile.lock
@@ -29,4 +29,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 829cf437db3e2065c6c17ddea2f24b51cb0aecc0
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3
diff --git a/Branch.podspec b/Branch.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Branch"
-  s.version          = "1.45.1"
+  s.version          = "1.45.2"
   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?
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,8 @@
 Branch iOS SDK Change Log
 
+v.1.45.2
+- SDK-1741 Fix SKAN error handling on iOS 15.4
+
 v.1.45.1
 - SDK-1724 Branch SDK returns an error "SKANErrorDomain Code=10" in initSession function - Fix
 
diff --git a/carthage-files/BranchSDK.xcodeproj/project.pbxproj b/carthage-files/BranchSDK.xcodeproj/project.pbxproj
@@ -1723,7 +1723,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.45.1;
+				MARKETING_VERSION = 1.45.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1760,7 +1760,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.45.1;
+				MARKETING_VERSION = 1.45.2;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1792,7 +1792,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.45.1;
+				MARKETING_VERSION = 1.45.2;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1821,7 +1821,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = staticlib;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.45.1;
+				MARKETING_VERSION = 1.45.2;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1976,7 +1976,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.45.1;
+				MARKETING_VERSION = 1.45.2;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -2003,7 +2003,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.45.1;
+				MARKETING_VERSION = 1.45.2;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
diff --git a/carthage-files/checksum.txt b/carthage-files/checksum.txt
@@ -1,2 +1,2 @@
 #checksum for Branch on Github
-e70c48a4db12cf3ee332dc843f5be2f7ae0f2802  Branch.zip
+b7bf71023649022418abad9bd0f0eef35b41cb90  Branch.zip
diff --git a/carthage-files/checksum_noidfa.txt b/carthage-files/checksum_noidfa.txt
@@ -1,2 +1,2 @@
 #checksum for Branch on Github
-50db8dd781102e1c47a77c228aeb036258abe439  Branch_noidfa.zip
+8306d3a9224234bd0380026d9828844eecb32a6e  Branch_noidfa.zip
diff --git a/carthage-files/checksum_static.txt b/carthage-files/checksum_static.txt
@@ -1,2 +1,2 @@
 #checksum for Branch on Github
-56eafc2324d20232ccc4bfe95d290af95cb22b69  Branch_static.zip
+9a32433146b817c35836e2c52052307ee6d0dab6  Branch_static.zip
diff --git a/carthage-files/checksum_static_noidfa.txt b/carthage-files/checksum_static_noidfa.txt
@@ -1,2 +1,2 @@
 #checksum for Branch on Github
-6ab0b052fb795ece88cbf8f0024cb6f0a13cfa83  Branch_static_noidfa.zip
+116eab46645bdc1ef58d8d7d5a82bba502d75d94  Branch_static_noidfa.zip
diff --git a/scripts/version.sh b/scripts/version.sh
@@ -31,7 +31,7 @@ Options:
 USAGE
 }
 
-version=1.45.1
+version=1.45.2
 
 if (( $# == 0 )); then
     echo $version

Original file line number	Diff line number	Diff line change
`@@ -1134,6 +1134,9 @@ - (void)userCompletedAction:(NSString *)action {`
`1134`	`1134`	`}`
`1135`	`1135`
`1136`	`1136`	`- (void)userCompletedAction:(NSString )action withState:(NSDictionary )state {`
	`1137`	`+`
	`1138`	`+ NSLog(@"'userCompletedAction' method has been deprecated. Please use BranchEvent for your event tracking use cases. You can refer to https://help.branch.io/developers-hub/docs/tracking-commerce-content-lifecycle-and-custom-events for additional information.");`
	`1139`	`+`
`1137`	`1140`	`if (!action) {`
`1138`	`1141`	`return;`
`1139`	`1142`	`}`
`@@ -1164,6 +1167,7 @@ - (void)sendServerRequestWithoutSession:(BNCServerRequest*)request {`
`1164`	`1167`	`}`
`1165`	`1168`
`1166`	`1169`	`- (void)sendCommerceEvent:(BNCCommerceEvent )commerceEvent metadata:(NSDictionary)metadata withCompletion:(void (^)(NSDictionary , NSError ))completion {`
	`1170`	`+ NSLog(@"'sendCommerceEvent' method has been deprecated. Please use BranchEvent for your event tracking use cases. You can refer to https://help.branch.io/developers-hub/docs/tracking-commerce-content-lifecycle-and-custom-events for additional information.");`
`1167`	`1171`	`[self initSafetyCheck];`
`1168`	`1172`	`dispatch_async(self.isolationQueue, ^(){`
`1169`	`1173`	`BranchCommerceEventRequest *request = [[BranchCommerceEventRequest alloc] initWithCommerceEvent:commerceEvent metadata:metadata completion:completion];`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ - (void)processResponse:(BNCServerResponse)response error:(NSError)error {`
`98`	`98`	`} else {`
`99`	`99`	`BNCLogDebug([NSString stringWithFormat:@"Update conversion value was successful. Conversion Value - %@", conversionValue]);`
`100`	`100`	`}`
`101`		`- return;`
`102`	`101`	`}];`
`103`	`102`	`}`
`104`	`103`
`@@ -109,9 +108,7 @@ - (void)processResponse:(BNCServerResponse)response error:(NSError)error {`
`109`	`108`	`} else {`
`110`	`109`	`BNCLogDebug([NSString stringWithFormat:@"Update conversion value was successful. Conversion Value - %@", conversionValue]);`
`111`	`110`	`}`
`112`		`- return;`
`113`	`111`	`}];`
`114`		`- return;`
`115`	`112`	`} else {`
`116`	`113`	`[[BNCSKAdNetwork sharedInstance] updateConversionValue:conversionValue.integerValue];`
`117`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,4 @@ SPEC CHECKSUMS:`
`29`	`29`
`30`	`30`	`PODFILE CHECKSUM: 829cf437db3e2065c6c17ddea2f24b51cb0aecc0`
`31`	`31`
`32`		`-COCOAPODS: 1.11.2`
	`32`	`+COCOAPODS: 1.11.3`