Skip to content

Commit 4d4846e

Browse files
NidhiDixit09NidhiDixit09
committed
Release 2.2.1
1 parent 439211c commit 4d4846e

File tree

13 files changed

+65
-19
lines changed

13 files changed

+65
-19
lines changed

‎Branch-TestBed/Branch-SDK-Tests/BNCSKAdNetworkTests.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ - (void)tearDown {
4747

4848
- (void)testDefaultMaxTimeout {
4949
NSTimeInterval days;
50-
if (@available(iOS 16.1, *)) {
50+
if (@available(iOS 16.1, macCatalyst 16.1, *)) {
5151
days = 3600.0 * 24.0 * 60.0; // one day
5252
} else {
5353
days = 3600.0 * 24.0; // one day
@@ -66,7 +66,7 @@ - (void)testShouldAttemptSKAdNetworkCalloutFalse {
6666

6767
- (void)testPostbackCall {
6868

69-
if (@available(iOS 16.1, *)) {
69+
if (@available(iOS 16.1, macCatalyst 16.1, *)) {
7070
self.skAdNetwork.maxTimeSinceInstall = 3600.0 * 24.0 * 60.0;
7171
} else {
7272
self.skAdNetwork.maxTimeSinceInstall = 3600.0 * 24.0; // one day
@@ -94,7 +94,7 @@ - (void)testPostbackCall {
9494

9595
- (void)testSKAN4ParamsDefaultValues {
9696

97-
if (@available(iOS 16.1, *)) {
97+
if (@available(iOS 16.1, macCatalyst 16.1, *)) {
9898
NSString *coarseValue = [[BNCSKAdNetwork sharedInstance] getCoarseConversionValueFromDataResponse:@{}];
9999
XCTAssertTrue([coarseValue isEqualToString:@"low"]);
100100

@@ -108,7 +108,7 @@ - (void)testSKAN4ParamsDefaultValues {
108108

109109
- (void)testSKAN4ParamsValues {
110110

111-
if (@available(iOS 16.1, *)) {
111+
if (@available(iOS 16.1, macCatalyst 16.1, *)) {
112112

113113
NSDictionary *response = @{@"update_conversion_value": @16, @"coarse_key": @"high", @"locked": @YES, @"ascending_only":@NO };
114114
BNCSKAdNetwork *adNetwork = [BNCSKAdNetwork sharedInstance];

‎BranchSDK.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "BranchSDK"
3-
s.version = "2.2.0"
3+
s.version = "2.2.1"
44
s.summary = "Create an HTTP URL for any piece of content in your app"
55
s.description = <<-DESC
66
- Want the highest possible conversions on your sharing feature?

‎BranchSDK.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2069,7 +2069,7 @@
20692069
"@executable_path/Frameworks",
20702070
"@loader_path/Frameworks",
20712071
);
2072-
MARKETING_VERSION = 2.2.0;
2072+
MARKETING_VERSION = 2.2.1;
20732073
PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
20742074
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
20752075
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2100,7 +2100,7 @@
21002100
"@executable_path/Frameworks",
21012101
"@loader_path/Frameworks",
21022102
);
2103-
MARKETING_VERSION = 2.2.0;
2103+
MARKETING_VERSION = 2.2.1;
21042104
PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
21052105
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
21062106
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2302,7 +2302,7 @@
23022302
"@loader_path/Frameworks",
23032303
);
23042304
MACH_O_TYPE = staticlib;
2305-
MARKETING_VERSION = 2.2.0;
2305+
MARKETING_VERSION = 2.2.1;
23062306
PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
23072307
PRODUCT_MODULE_NAME = BranchSDK;
23082308
PRODUCT_NAME = BranchSDK;
@@ -2337,7 +2337,7 @@
23372337
"@loader_path/Frameworks",
23382338
);
23392339
MACH_O_TYPE = staticlib;
2340-
MARKETING_VERSION = 2.2.0;
2340+
MARKETING_VERSION = 2.2.1;
23412341
PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
23422342
PRODUCT_MODULE_NAME = BranchSDK;
23432343
PRODUCT_NAME = BranchSDK;
@@ -2369,7 +2369,7 @@
23692369
"@executable_path/Frameworks",
23702370
"@loader_path/Frameworks",
23712371
);
2372-
MARKETING_VERSION = 2.2.0;
2372+
MARKETING_VERSION = 2.2.1;
23732373
PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
23742374
PRODUCT_NAME = BranchSDK;
23752375
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2399,7 +2399,7 @@
23992399
"@executable_path/Frameworks",
24002400
"@loader_path/Frameworks",
24012401
);
2402-
MARKETING_VERSION = 2.2.0;
2402+
MARKETING_VERSION = 2.2.1;
24032403
PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
24042404
PRODUCT_NAME = BranchSDK;
24052405
PROVISIONING_PROFILE_SPECIFIER = "";

‎BranchSDK/BNCConfig.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
NSString * const BNC_API_BASE_URL = @"https://api2.branch.io";
1212
NSString * const BNC_API_VERSION = @"v1";
1313
NSString * const BNC_LINK_URL = @"https://bnc.lt";
14-
NSString * const BNC_SDK_VERSION = @"2.2.0";
14+
NSString * const BNC_SDK_VERSION = @"2.2.1";
1515
NSString * const BNC_CDN_URL = @"https://cdn.branch.io";

‎BranchSDK/BNCSKAdNetwork.m‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,11 @@ - (BOOL) shouldCallPostbackForDataResponse:(NSDictionary *) dataResponseDictiona
183183
}
184184

185185
int highestConversionValue = (int)[BNCPreferenceHelper sharedInstance].highestConversionValueSent;
186-
if( conversionValue.intValue <= highestConversionValue ){
186+
if((currentWindow == BranchSkanWindowFirst) && (conversionValue.intValue <= highestConversionValue)){
187+
BOOL ascendingOnly = [self getAscendingOnlyFromDataResponse:dataResponseDictionary];
188+
if (!ascendingOnly)
189+
shouldCallUpdatePostback = YES;
190+
} else if ((currentWindow != BranchSkanWindowFirst) && (highestConversionValue != 0) && (conversionValue.intValue <= highestConversionValue)){ // In second and third windows, conversion values can be negative, so added extra check here.
187191
BOOL ascendingOnly = [self getAscendingOnlyFromDataResponse:dataResponseDictionary];
188192
if (!ascendingOnly)
189193
shouldCallUpdatePostback = YES;

‎BranchSDK/BNCServerInterface.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ - (BOOL)installDateIsRecent {
576576
//NSTimeInterval maxTimeSinceInstall = 60.0;
577577
NSTimeInterval maxTimeSinceInstall = 0;
578578

579-
if (@available(iOS 16.1, *)) {
579+
if (@available(iOS 16.1, macCatalyst 16.1, *)) {
580580
maxTimeSinceInstall = 3600.0 * 24.0 * 60; // For SKAN 4.0, The user has 60 days to launch the app.
581581
} else {
582582
maxTimeSinceInstall = 3600.0 * 24.0 * 30;

‎BranchSDK/Branch.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@ - (void)handleATTAuthorizationStatus:(NSUInteger)status {
977977
}
978978

979979
- (void)setSKAdNetworkCalloutMaxTimeSinceInstall:(NSTimeInterval)maxTimeInterval {
980-
if (@available(iOS 16.1, *)) {
980+
if (@available(iOS 16.1, macCatalyst 16.1, *)) {
981981
BNCLogDebug(@"This is no longer supported for iOS 16.1+ - SKAN4.0");
982982
} else {
983983
[BNCSKAdNetwork sharedInstance].maxTimeSinceInstall = maxTimeInterval;

‎BranchSDK/BranchConstants.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,3 +169,8 @@ extern NSString * const BRANCH_REQUEST_KEY_APPLE_ATTRIBUTION_TOKEN;
169169

170170
extern NSString * const BRANCH_CRASHLYTICS_SDK_VERSION_KEY;
171171
extern NSString * const BRANCH_CRASHLYTICS_LOW_MEMORY_KEY;
172+
173+
extern NSString * const BRANCH_REQUEST_KEY_SKAN_POSTBACK_INDEX;
174+
extern NSString * const BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_0;
175+
extern NSString * const BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_1;
176+
extern NSString * const BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_2;

‎BranchSDK/BranchConstants.m‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,3 +167,8 @@
167167
NSString * const BRANCH_CRASHLYTICS_LOW_MEMORY_KEY = @"io.branch.device.lowmemory";
168168

169169
NSString * const BRANCH_REQUEST_KEY_EXTERNAL_INTENT_URI = @"external_intent_uri";
170+
171+
NSString * const BRANCH_REQUEST_KEY_SKAN_POSTBACK_INDEX = @"skan_postback_index";
172+
NSString * const BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_0 = @"postback-sequence-index-0";
173+
NSString * const BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_1 = @"postback-sequence-index-1";
174+
NSString * const BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_2 = @"postback-sequence-index-2";

‎BranchSDK/BranchEvent.m‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ - (void)processResponse:(BNCServerResponse*)response error:(NSError*)error {
8888
NSNumber *conversionValue = (NSNumber *)dictionary[BRANCH_RESPONSE_KEY_UPDATE_CONVERSION_VALUE];
8989
// 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
9090
if (conversionValue && [BNCPreferenceHelper sharedInstance].invokeRegisterApp) {
91-
if (@available(iOS 16.1, *)){
91+
if (@available(iOS 16.1, macCatalyst 16.1, *)){
9292
NSString * coarseConversionValue = [[BNCSKAdNetwork sharedInstance] getCoarseConversionValueFromDataResponse:dictionary] ;
9393
BOOL lockWin = [[BNCSKAdNetwork sharedInstance] getLockedStatusFromDataResponse:dictionary];
9494
BOOL shouldCallUpdatePostback = [[BNCSKAdNetwork sharedInstance] shouldCallPostbackForDataResponse:dictionary];
@@ -351,6 +351,19 @@ - (NSDictionary *)buildEventDictionary {
351351
eventDictionary[BRANCH_REQUEST_KEY_PARTNER_PARAMETERS] = partnerParameters;
352352
}
353353

354+
if (@available(iOS 16.1, macCatalyst 16.1, *)){
355+
if ([BNCPreferenceHelper sharedInstance].invokeRegisterApp) {
356+
int currentWindow = [[BNCSKAdNetwork sharedInstance] calculateSKANWindowForTime:[NSDate date]];
357+
if (currentWindow == BranchSkanWindowFirst){
358+
eventDictionary[BRANCH_REQUEST_KEY_SKAN_POSTBACK_INDEX] = BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_0;
359+
} else if (currentWindow == BranchSkanWindowSecond) {
360+
eventDictionary[BRANCH_REQUEST_KEY_SKAN_POSTBACK_INDEX] = BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_1;
361+
} else if (currentWindow == BranchSkanWindowThird) {
362+
eventDictionary[BRANCH_REQUEST_KEY_SKAN_POSTBACK_INDEX] = BRANCH_REQUEST_KEY_VALUE_POSTBACK_SEQUENCE_INDEX_2;
363+
}
364+
}
365+
}
366+
354367
return eventDictionary;
355368
}
356369

0 commit comments

Comments
 (0)