Added check for maccatalyst

Author: NidhiDixit09

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

@@ -47,7 +47,7 @@ - (void)tearDown {
 
 - (void)testDefaultMaxTimeout {
     NSTimeInterval days;
-    if (@available(iOS 16.1, *)) {
+    if (@available(iOS 16.1, macCatalyst 16.1, *)) {
         days = 3600.0 * 24.0 * 60.0; // one day
     } else {
         days = 3600.0 * 24.0; // one day
@@ -66,7 +66,7 @@ - (void)testShouldAttemptSKAdNetworkCalloutFalse {
 
 - (void)testPostbackCall {
 
-    if (@available(iOS 16.1, *)) {
+    if (@available(iOS 16.1, macCatalyst 16.1, *)) {
         self.skAdNetwork.maxTimeSinceInstall = 3600.0 * 24.0 * 60.0; 
     } else {
         self.skAdNetwork.maxTimeSinceInstall = 3600.0 * 24.0; // one day
@@ -94,7 +94,7 @@ - (void)testPostbackCall {
 
 - (void)testSKAN4ParamsDefaultValues {
 
-    if (@available(iOS 16.1, *)) {
+    if (@available(iOS 16.1, macCatalyst 16.1, *)) {
         NSString *coarseValue = [[BNCSKAdNetwork sharedInstance] getCoarseConversionValueFromDataResponse:@{}];
         XCTAssertTrue([coarseValue isEqualToString:@"low"]);
 
@@ -108,7 +108,7 @@ - (void)testSKAN4ParamsDefaultValues {
 
 - (void)testSKAN4ParamsValues {
 
-    if (@available(iOS 16.1, *)) {
+    if (@available(iOS 16.1, macCatalyst 16.1, *)) {
 
         NSDictionary *response = @{@"update_conversion_value": @16, @"coarse_key": @"high", @"locked": @YES, @"ascending_only":@NO };
         BNCSKAdNetwork *adNetwork = [BNCSKAdNetwork sharedInstance];

BranchSDK/BNCServerInterface.m

@@ -576,7 +576,7 @@ - (BOOL)installDateIsRecent {
     //NSTimeInterval maxTimeSinceInstall = 60.0;
     NSTimeInterval maxTimeSinceInstall = 0;
 
-    if (@available(iOS 16.1, *)) {
+    if (@available(iOS 16.1, macCatalyst 16.1, *)) {
         maxTimeSinceInstall = 3600.0 * 24.0 * 60; // For SKAN 4.0, The user has 60 days to launch the app.
     } else {
         maxTimeSinceInstall = 3600.0 * 24.0 * 30;

BranchSDK/Branch.m

@@ -977,7 +977,7 @@ - (void)handleATTAuthorizationStatus:(NSUInteger)status {
 }
 
 - (void)setSKAdNetworkCalloutMaxTimeSinceInstall:(NSTimeInterval)maxTimeInterval {
-    if (@available(iOS 16.1, *)) {
+    if (@available(iOS 16.1, macCatalyst 16.1, *)) {
         BNCLogDebug(@"This is no longer supported for iOS 16.1+ - SKAN4.0");
     } else {
         [BNCSKAdNetwork sharedInstance].maxTimeSinceInstall = maxTimeInterval;

BranchSDK/BranchEvent.m

@@ -88,7 +88,7 @@ - (void)processResponse:(BNCServerResponse*)response error:(NSError*)error {
         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
         if (conversionValue && [BNCPreferenceHelper sharedInstance].invokeRegisterApp) {
-            if (@available(iOS 16.1, *)){
+            if (@available(iOS 16.1, macCatalyst 16.1, *)){
                 NSString * coarseConversionValue = [[BNCSKAdNetwork sharedInstance] getCoarseConversionValueFromDataResponse:dictionary] ;
                 BOOL lockWin = [[BNCSKAdNetwork sharedInstance] getLockedStatusFromDataResponse:dictionary];
                 BOOL shouldCallUpdatePostback = [[BNCSKAdNetwork sharedInstance] shouldCallPostbackForDataResponse:dictionary];
@@ -351,7 +351,7 @@ - (NSDictionary *)buildEventDictionary {
         eventDictionary[BRANCH_REQUEST_KEY_PARTNER_PARAMETERS] = partnerParameters;
     }
 
-    if (@available(iOS 16.1, *)){
+    if (@available(iOS 16.1, macCatalyst 16.1, *)){
         if ([BNCPreferenceHelper sharedInstance].invokeRegisterApp) {
             int currentWindow = [[BNCSKAdNetwork sharedInstance] calculateSKANWindowForTime:[NSDate date]];
             if (currentWindow == BranchSkanWindowFirst){

BranchSDK/BranchOpenRequest.m

@@ -113,7 +113,7 @@ - (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, *)){
+    if (@available(iOS 16.1, macCatalyst 16.1, *)){
         if ([BNCPreferenceHelper sharedInstance].invokeRegisterApp) {
             int currentWindow = [[BNCSKAdNetwork sharedInstance] calculateSKANWindowForTime:[NSDate date]];
             if (currentWindow == BranchSkanWindowFirst){
@@ -303,7 +303,7 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
         NSNumber *invokeRegister = (NSNumber *)data[BRANCH_RESPONSE_KEY_INVOKE_REGISTER_APP];
         preferenceHelper.invokeRegisterApp = invokeRegister.boolValue;
         if (invokeRegister.boolValue && self.isInstall) {
-            if (@available(iOS 16.1, *)){
+            if (@available(iOS 16.1, macCatalyst 16.1, *)){
                 NSString *defaultCoarseConValue = [[BNCSKAdNetwork sharedInstance] getCoarseConversionValueFromDataResponse:@{}];
                 [[BNCSKAdNetwork sharedInstance] updatePostbackConversionValue:0 coarseValue:defaultCoarseConValue
                     lockWindow:NO completionHandler:^(NSError * _Nullable error) {
@@ -335,7 +335,7 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
         NSNumber *conversionValue = (NSNumber *)data[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
         if (conversionValue && preferenceHelper.invokeRegisterApp ) {
-            if (@available(iOS 16.1, *)){
+            if (@available(iOS 16.1, macCatalyst 16.1, *)){
                 NSString* coarseConversionValue = [[BNCSKAdNetwork sharedInstance] getCoarseConversionValueFromDataResponse:data] ;
                 BOOL lockWin = [[BNCSKAdNetwork sharedInstance] getLockedStatusFromDataResponse:data];
                 BOOL shouldCallUpdatePostback = [[BNCSKAdNetwork sharedInstance] shouldCallPostbackForDataResponse:data];