Merge pull request #1235 from BranchMetrics/SDK-1747-maccatalyst-skan-issue

SDK-1747 macCatalyst SKAN issue

Author: echo-branch

BranchSDK/BNCSKAdNetwork.m

@@ -37,7 +37,7 @@ + (BNCSKAdNetwork *)sharedInstance {
 - (instancetype)init {
     self = [super init];
     if (self) {
-        if (@available(iOS 16.1, *)){
+        if (@available(iOS 16.1, macCatalyst 16.1, *)){
             // For SKAN 4.0, its 60 days = 3600.0 * 24.0 * 60 seconds
             self.maxTimeSinceInstall = 3600.0 * 24.0 * 60;
         } else {
@@ -70,7 +70,7 @@ - (BOOL)shouldAttemptSKAdNetworkCallout {
 }
 
 - (void)registerAppForAdNetworkAttribution {
-    if (@available(iOS 14.0, *)) {
+    if (@available(iOS 14.0, macCatalyst 14.0, *)) {
         if ([self shouldAttemptSKAdNetworkCallout]) {
 
             // Equivalent call [SKAdNetwork registerAppForAdNetworkAttribution];
@@ -80,7 +80,7 @@ - (void)registerAppForAdNetworkAttribution {
 }
 
 - (void)updateConversionValue:(NSInteger)conversionValue {
-    if (@available(iOS 14.0, *)) {
+    if (@available(iOS 14.0, macCatalyst 14.0, *)) {
         if ([self shouldAttemptSKAdNetworkCallout]) {
 
             // Equivalent call [SKAdNetwork updateConversionValue:conversionValue];
@@ -91,7 +91,7 @@ - (void)updateConversionValue:(NSInteger)conversionValue {
 
 - (void)updatePostbackConversionValue:(NSInteger)conversionValue
                     completionHandler:(void (^)(NSError *error))completion {
-    if (@available(iOS 15.4, *)) {
+    if (@available(iOS 15.4, macCatalyst 15.4, *)) {
         if ([self shouldAttemptSKAdNetworkCallout]) {
 
             // Equivalent call [SKAdNetwork updatePostbackConversionValue:completionHandler:];
@@ -105,9 +105,10 @@ - (void)updatePostbackConversionValue:(NSInteger)fineValue
                           coarseValue:(NSString *)coarseValue
                            lockWindow:(BOOL)lockWindow
                     completionHandler:(void (^)(NSError *error))completion {
-    if (@available(iOS 16.1, *)) {
+    if (@available(iOS 16.1, macCatalyst 16.1, *)) {
         if ([self shouldAttemptSKAdNetworkCallout]) {
 
+            // Equivalent call [SKAdNetwork updatePostbackConversionValue:coarseValue:lockWindow:completionHandler:];
             ((id (*)(id, SEL, NSInteger, NSString *, BOOL, void (^)(NSError *error)))[self.skAdNetworkClass methodForSelector:self.skAdNetworkUpdatePostbackConversionValueCoarseValueLockWindow])(self.skAdNetworkClass, self.skAdNetworkUpdatePostbackConversionValueCoarseValueLockWindow, fineValue, coarseValue, lockWindow, completion);
         }
     }

BranchSDK/BNCSystemObserver.m

@@ -63,6 +63,7 @@ + (NSString *)appleAttributionToken {
     __block NSString *token = nil;
 
 #if !TARGET_OS_TV
+#if !TARGET_OS_MACCATALYST
     if (@available(iOS 14.3, *)) {
 
         // We are getting reports on iOS 14.5 that this API can hang, adding a short timeout for now.
@@ -83,6 +84,7 @@ + (NSString *)appleAttributionToken {
             BNCLogDebug([NSString stringWithFormat:@"AppleAttributionToken request timed out"]);
         }
     }
+#endif
 #endif
 
     return token;