Merge pull request #1288 from BranchMetrics/SDK-1982-SKAN-Simplification-DB-Updates

NidhiDixit09 · web-flow · commit ef3b8263636c · 2023-09-14T12:45:41.000-07:00
SDK-1982 SKAN Simplification DB Updates
diff --git a/.github/workflows/pre-release-qa.yml b/.github/workflows/pre-release-qa.yml
@@ -10,6 +10,7 @@ jobs:
         uses: actions/checkout@v3
       - name: Install pod, build project and run tests
         run: |
+            echo "branch=${{ github.ref }}" >> $GITHUB_OUTPUT
             ./scripts/getSimulator
             DESTINATION="platform=iOS Simulator,name=$(cat ./iphoneSim),OS=latest"
             cd  SDKIntegrationTestApps/iOSReleaseTest-Cocoapods/
diff --git a/BranchSDK.podspec b/BranchSDK.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "BranchSDK"
-  s.version          = "2.2.0"
+  s.version          = "2.2.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?
diff --git a/BranchSDK.xcodeproj/project.pbxproj b/BranchSDK.xcodeproj/project.pbxproj
@@ -1993,7 +1993,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2024,7 +2024,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2226,7 +2226,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACH_O_TYPE = staticlib;
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
 				PRODUCT_MODULE_NAME = BranchSDK;
 				PRODUCT_NAME = BranchSDK;
@@ -2261,7 +2261,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACH_O_TYPE = staticlib;
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
 				PRODUCT_MODULE_NAME = BranchSDK;
 				PRODUCT_NAME = BranchSDK;
@@ -2293,7 +2293,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
 				PRODUCT_NAME = BranchSDK;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2323,7 +2323,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
 				PRODUCT_NAME = BranchSDK;
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/BranchSDK/BNCConfig.m b/BranchSDK/BNCConfig.m
@@ -11,7 +11,7 @@
 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     = @"2.2.0";
+NSString * const BNC_SDK_VERSION     = @"2.2.1";
 NSString * const BNC_CDN_URL         = @"https://cdn.branch.io";
 
 NSString*  const BNC_API_URL                = @"https://api3.branch.io";
diff --git a/BranchSDK/BNCSKAdNetwork.m b/BranchSDK/BNCSKAdNetwork.m
@@ -183,7 +183,11 @@ - (BOOL) shouldCallPostbackForDataResponse:(NSDictionary *) dataResponseDictiona
     }
     
     int highestConversionValue = (int)[BNCPreferenceHelper sharedInstance].highestConversionValueSent;
-    if( conversionValue.intValue <= highestConversionValue ){
+    if((currentWindow == BranchSkanWindowFirst) && (conversionValue.intValue <= highestConversionValue)){
+        BOOL ascendingOnly = [self getAscendingOnlyFromDataResponse:dataResponseDictionary];
+        if (!ascendingOnly)
+            shouldCallUpdatePostback = YES;
+    } else if ((currentWindow != BranchSkanWindowFirst) && (highestConversionValue != 0) && (conversionValue.intValue <= highestConversionValue)){  // In second and third windows, conversion values can be negative, so added extra check here.
         BOOL ascendingOnly = [self getAscendingOnlyFromDataResponse:dataResponseDictionary];
         if (!ascendingOnly)
             shouldCallUpdatePostback = YES;
diff --git a/BranchSDK/BranchConstants.h b/BranchSDK/BranchConstants.h
@@ -161,3 +161,8 @@ extern NSString * const BRANCH_REQUEST_KEY_APPLE_ATTRIBUTION_TOKEN;
 
 extern NSString * const BRANCH_CRASHLYTICS_SDK_VERSION_KEY;
 extern NSString * const BRANCH_CRASHLYTICS_LOW_MEMORY_KEY;
+
+extern NSString * const BRANCH_REQUEST_KEY_SKAN_POSTBACK_INDEX;
+extern NSString * const BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_0;
+extern NSString * const BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_1;
+extern NSString * const BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_2;
diff --git a/BranchSDK/BranchConstants.m b/BranchSDK/BranchConstants.m
@@ -159,3 +159,8 @@
 NSString * const BRANCH_CRASHLYTICS_LOW_MEMORY_KEY = @"io.branch.device.lowmemory";
 
 NSString * const BRANCH_REQUEST_KEY_EXTERNAL_INTENT_URI = @"external_intent_uri";
+
+NSString * const BRANCH_REQUEST_KEY_SKAN_POSTBACK_INDEX = @"skan_postback_index";
+NSString * const BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_0 = @"postback-sequence-index-0";
+NSString * const BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_1 = @"postback-sequence-index-1";
+NSString * const BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_2 = @"postback-sequence-index-2";
diff --git a/BranchSDK/BranchEvent.m b/BranchSDK/BranchEvent.m
@@ -351,6 +351,19 @@ - (NSDictionary *)buildEventDictionary {
         eventDictionary[BRANCH_REQUEST_KEY_PARTNER_PARAMETERS] = partnerParameters;
     }
     
+    if (@available(iOS 16.1, macCatalyst 16.1, *)){
+        if ([BNCPreferenceHelper sharedInstance].invokeRegisterApp) {
+            int currentWindow = [[BNCSKAdNetwork sharedInstance] calculateSKANWindowForTime:[NSDate date]];
+            if (currentWindow == BranchSkanWindowFirst){
+                eventDictionary[BRANCH_REQUEST_KEY_SKAN_POSTBACK_INDEX] = BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_0;
+            } else if (currentWindow == BranchSkanWindowSecond) {
+                eventDictionary[BRANCH_REQUEST_KEY_SKAN_POSTBACK_INDEX] = BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_1;
+            } else if (currentWindow == BranchSkanWindowThird) {
+                eventDictionary[BRANCH_REQUEST_KEY_SKAN_POSTBACK_INDEX] = BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_2;
+            }
+        }
+    }
+    
     return eventDictionary;
 }
 
diff --git a/BranchSDK/BranchOpenRequest.m b/BranchSDK/BranchOpenRequest.m
@@ -110,6 +110,19 @@ - (void)makeRequest:(BNCServerInterface *)serverInterface key:(NSString *)key ca
     params[@"first_install_time"] = BNCWireFormatFromDate(application.firstInstallDate);
     params[@"update"] = [self.class appUpdateState];
 
+    if (@available(iOS 16.1, macCatalyst 16.1, *)){
+        if ([BNCPreferenceHelper sharedInstance].invokeRegisterApp) {
+            int currentWindow = [[BNCSKAdNetwork sharedInstance] calculateSKANWindowForTime:[NSDate date]];
+            if (currentWindow == BranchSkanWindowFirst){
+                params[BRANCH_REQUEST_KEY_SKAN_POSTBACK_INDEX] = BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_0;
+            } else if (currentWindow == BranchSkanWindowSecond) {
+                params[BRANCH_REQUEST_KEY_SKAN_POSTBACK_INDEX] = BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_1;
+            } else if (currentWindow == BranchSkanWindowThird) {
+                params[BRANCH_REQUEST_KEY_SKAN_POSTBACK_INDEX] = BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_2;
+            }
+        }
+    }
+    
     [serverInterface postRequest:params
         url:[preferenceHelper
         getAPIURL:BRANCH_REQUEST_ENDPOINT_OPEN]
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,11 @@
 Branch iOS SDK Change Log
 
+V.2.2.1
+ 
+Branch iOS SDK 2.2.1 adds parameter for current SKAN 4.0 Window in /v1/open and /v2/event requests.
+
+- SDK-1982 - SKAN Simplification DB updates
+
 V.2.2.0
  
 Branch iOS SDK 2.2.0 adds the ability to include developer ID in installs and a new method to change the Branch API base URL.
diff --git a/scripts/version.sh b/scripts/version.sh
@@ -30,7 +30,7 @@ Options:
 USAGE
 }
 
-version=2.2.0
+version=2.2.1
 prev_version="$version"
 
 if (( $# == 0 )); then
