GH-Issue-1212 Fix - Removed calls to callback from completion handler of updatePostbackConversionValue.

Author: NidhiDixit09

Branch-SDK/BranchEvent.m

@@ -80,8 +80,6 @@ - (void)processResponse:(BNCServerResponse*)response error:(NSError*)error {
 	NSDictionary *dictionary = ([response.data isKindOfClass:[NSDictionary class]])
 		? (NSDictionary*) response.data : nil;
 
-    BOOL callCompletionHandler = YES;
-    
     if (dictionary && [dictionary[BRANCH_RESPONSE_KEY_UPDATE_CONVERSION_VALUE] isKindOfClass:NSNumber.class]) {
         NSNumber *conversionValue = (NSNumber *)dictionary[BRANCH_RESPONSE_KEY_UPDATE_CONVERSION_VALUE];
         // Regardless of SKAN opted-in in dashboard, we always get conversionValue, so adding check to find out if install/open response had "invoke_register_app" true
@@ -94,11 +92,7 @@ - (void)processResponse:(BNCServerResponse*)response error:(NSError*)error {
                 BNCLogDebug([NSString stringWithFormat:@"SKAN 4.0 params - conversionValue:%@ coarseValue:%@, locked:%d, shouldCallPostback:%d, currentWindow:%d, firstAppLaunchTime: %@", conversionValue, coarseConversionValue, lockWin, shouldCallUpdatePostback, (int)[BNCPreferenceHelper sharedInstance].skanCurrentWindow, [BNCPreferenceHelper sharedInstance].firstAppLaunchTime]);
 
                 if(shouldCallUpdatePostback){
-                    callCompletionHandler = NO;
                     [[BNCSKAdNetwork sharedInstance] updatePostbackConversionValue: conversionValue.longValue coarseValue:coarseConversionValue lockWindow:lockWin completionHandler:^(NSError * _Nullable error) {
-                        if (self.completion) {
-                            self.completion(dictionary, error);
-                        }
                         if (error) {
                             BNCLogError([NSString stringWithFormat:@"Update conversion value failed with error - %@", [error description]]);
                         } else {
@@ -109,11 +103,7 @@ - (void)processResponse:(BNCServerResponse*)response error:(NSError*)error {
                 }
 
             } else if (@available(iOS 15.4, *)) {
-                callCompletionHandler = NO;
                 [[BNCSKAdNetwork sharedInstance] updatePostbackConversionValue:conversionValue.intValue completionHandler: ^(NSError *error){
-                    if (self.completion) {
-                        self.completion(dictionary, error);
-                    }
                     if (error) {
                         BNCLogError([NSString stringWithFormat:@"Update conversion value failed with error - %@", [error description]]);
                     } else {
@@ -128,7 +118,7 @@ - (void)processResponse:(BNCServerResponse*)response error:(NSError*)error {
         }
     }
 
-    if (self.completion && callCompletionHandler) {
+    if (self.completion) {
 		self.completion(dictionary, error);
     }
 }

Branch-SDK/BranchOpenRequest.m

@@ -291,35 +291,22 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
         [[BNCAppGroupsData shared] saveAppClipData];
     }
 
-    BOOL callCalback = YES;
-    
     if ([data[BRANCH_RESPONSE_KEY_INVOKE_REGISTER_APP] isKindOfClass:NSNumber.class]) {
         NSNumber *invokeRegister = (NSNumber *)data[BRANCH_RESPONSE_KEY_INVOKE_REGISTER_APP];
         preferenceHelper.invokeRegisterApp = invokeRegister.boolValue;
         if (invokeRegister.boolValue && self.isInstall) {
             if (@available(iOS 16.1, *)){
-                callCalback = NO;
                 NSString *defaultCoarseConValue = [[BNCSKAdNetwork sharedInstance] getCoarseConversionValueFromDataResponse:@{}];
                 [[BNCSKAdNetwork sharedInstance] updatePostbackConversionValue:0 coarseValue:defaultCoarseConValue
                     lockWindow:NO completionHandler:^(NSError * _Nullable error) {
-                    
-                    if(self.callback){
-                        self.callback(YES, error);
-                    }
-                    
                     if (error) {
                         BNCLogError([NSString stringWithFormat:@"Update conversion value failed with error - %@", [error description]]);
                     } else {
                         BNCLogDebug([NSString stringWithFormat:@"Update conversion value was successful for INSTALL Event"]);
                     }
                 }];
             } else if (@available(iOS 15.4, *)){
-                callCalback = NO;
                 [[BNCSKAdNetwork sharedInstance] updatePostbackConversionValue:0 completionHandler:^(NSError * _Nullable error) {
-                    if(self.callback){
-                        self.callback(YES, error);
-                    }
-                    
                     if (error) {
                         BNCLogError([NSString stringWithFormat:@"Update conversion value failed with error - %@", [error description]]);
                     } else {
@@ -348,13 +335,8 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
                 BNCLogDebug([NSString stringWithFormat:@"SKAN 4.0 params - conversionValue:%@ coarseValue:%@, locked:%d, shouldCallPostback:%d, currentWindow:%d, firstAppLaunchTime: %@", conversionValue, coarseConversionValue, lockWin, shouldCallUpdatePostback, (int)preferenceHelper.skanCurrentWindow, preferenceHelper.firstAppLaunchTime]);
 
                 if(shouldCallUpdatePostback){
-                    callCalback = NO;
                     [[BNCSKAdNetwork sharedInstance] updatePostbackConversionValue: conversionValue.longValue coarseValue:coarseConversionValue lockWindow:lockWin completionHandler:^(NSError * _Nullable error) {
 
-                        if(self.callback){
-                            self.callback(YES, error);
-                        }
-                        
                         if (error) {
                             BNCLogError([NSString stringWithFormat:@"Update conversion value failed with error - %@", [error description]]);
                         } else {
@@ -363,13 +345,8 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
                     }];
                 }
             } else if (@available(iOS 15.4, *)) {
-                callCalback = NO;
                 [[BNCSKAdNetwork sharedInstance] updatePostbackConversionValue:conversionValue.intValue completionHandler: ^(NSError *error){
 
-                    if(self.callback){
-                        self.callback(YES, error);
-                    }
-                    
                     if (error) {
                         BNCLogError([NSString stringWithFormat:@"Update conversion value failed with error - %@", [error description]]);
                     } else {
@@ -385,7 +362,7 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
     }
 
 
-    if (self.callback && callCalback) {
+    if (self.callback) {
         self.callback(YES, nil);
     }
 }