[release] 1.39.0

Author: branch-sdkteam

Branch-SDK/BNCAppGroupsData.m

@@ -89,9 +89,6 @@ - (void)saveAppClipData {
         [self saveObject:url forKey:@"BranchAppClipURL"];
         [self saveObject:token forKey:@"BranchAppClipToken"];
         [self saveObject:bundleToken forKey:@"BranchAppClipBundleToken"];
-        
-        NSString *logMessage = [NSString stringWithFormat:@"Saving App Clip Data: %@, %@, %@, %@, %@", bundleId, installDate, url, token, bundleToken];
-        BNCLogDebug(logMessage);
     }
 }
 
@@ -106,9 +103,6 @@ - (BOOL)loadAppClipData {
         self.bundleToken = [self getStringForKey:@"BranchAppClipBundleToken"];
 
         if (self.bundleID && self.installDate && self.url && self.branchToken && self.bundleToken) {
-            NSString *logMessage = [NSString stringWithFormat:@"Loading App Clip Data: %@, %@, %@, %@, %@", self.bundleID, self.installDate, self.url, self.branchToken, self.bundleToken];
-            BNCLogDebug(logMessage);
-            
             return YES;
         } else {
             return NO;

Branch-SDK/BNCConfig.m

@@ -11,4 +11,4 @@
 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     = @"1.38.0";
+NSString * const BNC_SDK_VERSION     = @"1.39.0";

Branch-SDK/BNCDeviceInfo.h

@@ -34,6 +34,7 @@
 
 @property (nonatomic, copy, readwrite) NSString *advertiserId;
 @property (nonatomic, copy, readwrite) NSString *vendorId;
+@property (nonatomic, copy, readwrite) NSString *optedInStatus;
 @property (nonatomic, assign, readwrite) BOOL isAdTrackingEnabled;
 @property (nonatomic, assign, readwrite) BOOL unidentifiedDevice;
 - (NSString *)localIPAddress;

Branch-SDK/BNCDeviceInfo.m

@@ -146,6 +146,7 @@ - (NSString *)userAgentString {
 
 // IDFA should never be cached
 - (void)checkAdvertisingIdentifier {
+    self.optedInStatus = [BNCSystemObserver attOptedInStatus];
     self.isAdTrackingEnabled = [BNCSystemObserver adTrackingSafe];
     self.advertiserId = [BNCSystemObserver getAdId];
     BOOL ignoreIdfa = [BNCPreferenceHelper preferenceHelper].isDebug;
@@ -185,6 +186,7 @@ - (NSDictionary *)v2dictionary {
         }
         [dictionary bnc_safeSetObject:[self localIPAddress] forKey:@"local_ip"];
 
+        [dictionary bnc_safeSetObject:[self optedInStatus] forKey:@"opted_in_status"];
         if (!self.isAdTrackingEnabled) {
             dictionary[@"limit_ad_tracking"] = @(YES);
         }

Branch-SDK/BNCPreferenceHelper.h

@@ -35,6 +35,7 @@ NSURL* /* _Nonnull */ BNCURLForBranchDirectory(void);
 @property (assign, nonatomic) BOOL isDebug;
 @property (assign, nonatomic) BOOL checkedFacebookAppLinks;
 @property (assign, nonatomic) BOOL checkedAppleSearchAdAttribution;
+@property (nonatomic, assign, readwrite) BOOL appleAttributionTokenChecked;
 @property (assign, nonatomic) NSInteger retryCount;
 @property (assign, nonatomic) NSTimeInterval retryInterval;
 @property (assign, nonatomic) NSTimeInterval timeout;

Branch-SDK/BNCPreferenceHelper.m

@@ -57,6 +57,7 @@ @interface BNCPreferenceHelper () {
 @property (strong, nonatomic) NSMutableDictionary *creditsDictionary;
 @property (strong, nonatomic) NSMutableDictionary *requestMetadataDictionary;
 @property (strong, nonatomic) NSMutableDictionary *instrumentationDictionary;
+
 @end
 
 @implementation BNCPreferenceHelper
@@ -383,6 +384,14 @@ - (BOOL) appleSearchAdNeedsSend {
     return [self readBoolFromDefaults:@"_appleSearchAdNeedsSend"];
 }
 
+- (void)setAppleAttributionTokenChecked:(BOOL)appleAttributionTokenChecked {
+    [self writeBoolToDefaults:@"_appleAttributionTokenChecked" value:appleAttributionTokenChecked];
+}
+
+- (BOOL)appleAttributionTokenChecked {
+    return [self readBoolFromDefaults:@"_appleAttributionTokenChecked"];
+}
+
 - (NSString*) lastSystemBuildVersion {
     if (!_lastSystemBuildVersion) {
         _lastSystemBuildVersion = [self readStringFromDefaults:@"_lastSystemBuildVersion"];

Branch-SDK/BNCSKAdNetwork.m

@@ -33,8 +33,8 @@ + (BNCSKAdNetwork *)sharedInstance {
 - (instancetype)init {
     self = [super init];
     if (self) {
-        // by default, we send updates to SKAdNetwork for up to 3 days after install
-        self.maxTimeSinceInstall = 3600.0 * 24.0 * 3.0;
+        // by default, we send updates to SKAdNetwork for up a day after install
+        self.maxTimeSinceInstall = 3600.0 * 24.0;
         self.installDate = [BNCApplication currentApplication].currentInstallDate;
 
         self.skAdNetworkClass = NSClassFromString(@"SKAdNetwork");

Branch-SDK/BNCServerInterface.m

@@ -527,6 +527,7 @@ - (void)updateDeviceInfoToMutableDictionary:(NSMutableDictionary *)dict {
         [self safeSetValue:[deviceInfo connectionType] forKey:@"connection_type" onDict:dict];
         [self safeSetValue:[deviceInfo userAgentString] forKey:@"user_agent" onDict:dict];
 
+        [self safeSetValue:[deviceInfo optedInStatus] forKey:BRANCH_REQUEST_KEY_OPTED_IN_STATUS onDict:dict];
         [self safeSetValue:@(deviceInfo.isAdTrackingEnabled) forKey:BRANCH_REQUEST_KEY_AD_TRACKING_ENABLED onDict:dict];
 
         [self safeSetValue:deviceInfo.applicationVersion forKey:@"app_version" onDict:dict];

Branch-SDK/BNCSystemObserver.h

@@ -29,6 +29,8 @@
 + (NSNumber *)getScreenHeight;
 + (BOOL)isSimulator;
 + (BOOL)adTrackingSafe;
-+ (NSString*) getAdId;
++ (NSString *)getAdId;
++ (NSString *)attOptedInStatus;
++ (NSString *)appleAttributionToken;
 
 @end

Branch-SDK/BNCSystemObserver.m

@@ -19,6 +19,14 @@
 #import <sys/utsname.h>
 #endif
 
+#if !TARGET_OS_TV
+#if __has_feature(modules)
+@import AdServices;
+#else
+#import <AdServices/AdServices.h>
+#endif
+#endif
+
 @implementation BNCSystemObserver
 
 + (NSString *)getUniqueHardwareId:(BOOL *)isReal
@@ -46,10 +54,20 @@ + (NSString *)getUniqueHardwareId:(BOOL *)isReal
     return uid;
 }
 
-+ (NSString*) getAdId {
-    
-    // This macro is unnecessary since this code only runs if AdSupport.framework is included
-    // However, some clients feel more comfortable with no IDFA code at all.
++ (NSString *)appleAttributionToken {
+#if !TARGET_OS_TV
+    if (@available(iOS 14.3, *)) {
+        NSError *error;
+        NSString *appleAttributionToken = [AAAttribution attributionTokenWithError:&error];
+        if (!error) {
+            return appleAttributionToken;
+        }
+    }
+#endif
+    return nil;
+}
+
++ (NSString *)getAdId {
     #ifdef BRANCH_EXCLUDE_IDFA_CODE
     return nil;
 
@@ -75,10 +93,43 @@ + (NSString*) getAdId {
     #endif
 }
 
-+ (BOOL)adTrackingSafe {
+// Returns AppTrackingTransparency status. It does not trigger the prompt.
++ (NSString *)attOptedInStatus {
+    NSString *statusString = @"unavailable";
+
+    #ifdef BRANCH_EXCLUDE_ATT_STATUS_CODE
+    #else
+
+    Class ATTrackingManagerClass = NSClassFromString(@"ATTrackingManager");
+    if (ATTrackingManagerClass) {
+        SEL trackingAuthorizationStatusSelector = NSSelectorFromString(@"trackingAuthorizationStatus");
+        unsigned long status = ((unsigned long (*)(id, SEL))[ATTrackingManagerClass methodForSelector:trackingAuthorizationStatusSelector])(ATTrackingManagerClass, trackingAuthorizationStatusSelector);
+        
+        // map ATT status to string values
+        switch (status) {
+            case 0:
+                statusString = @"not_determined";
+                break;
+            case 1:
+                statusString = @"restricted";
+                break;
+            case 2:
+                statusString = @"denied";
+                break;
+            case 3:
+                statusString = @"authorized";
+                break;
+            default:
+                break;
+        }
+    }
 
-    // This macro is unnecessary since this code only runs if AdSupport.framework is included
-    // However, some clients feel more comfortable with no IDFA code at all.
+    #endif
+    return statusString;
+}
+
+// on iOS 14+ this value is always NO
++ (BOOL)adTrackingSafe {
     #ifdef BRANCH_EXCLUDE_IDFA_CODE
     return NO;