Merge pull request #756 from adjust/v530

Version 5.3.0

Author: uerceg

Adjust.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name                    = "Adjust"
   s.module_name             = "AdjustSdk"
-  s.version                 = "5.2.0"
+  s.version                 = "5.3.0"
   s.summary                 = "This is the iOS SDK of Adjust. You can read more about it at https://adjust.com."
   s.homepage                = "https://github.com/adjust/ios_sdk"
   s.license                 = { :type => 'MIT', :file => 'LICENSE' }

Adjust/ADJConfig.h

@@ -187,13 +187,17 @@ typedef NS_ENUM(NSUInteger, ADJLogLevel);
 /**
  * @brief Indicator of whether SDK should start in COPPA compliant mode or not.
  */
-@property (nonatomic, readonly) BOOL isCoppaComplianceEnabled;
+@property (nonatomic) BOOL isCoppaComplianceEnabled;
 
 /**
- * @brief Indicator of whether SDK should use AppTrackingTransparency framework
+ * @brief Indicator of whether SDK should use AppTrackingTransparency framework or not.
  */
 @property (nonatomic, readonly) BOOL isAppTrackingTransparencyUsageEnabled;
 
+/**
+ * @brief Indicator of whether SDK is in first session delay mode or not.
+ */
+@property (nonatomic, readonly) BOOL isFirstSessionDelayEnabled;
 
 #pragma mark - AdjustConfig assignable properties
 
@@ -344,6 +348,10 @@ typedef NS_ENUM(NSUInteger, ADJLogLevel);
  */
 - (void)enableCoppaCompliance;
 
+/**
+ * @brief A method to enable SDK delay during the first session.
+ */
+- (void)enableFirstSessionDelay;
 /**
  * @brief A method to configure SDK avoid any call to AppTrackingTransparency framework.
  */

Adjust/ADJConfig.m

@@ -118,6 +118,10 @@ - (void)disableAppTrackingTransparencyUsage {
     _isAppTrackingTransparencyUsageEnabled = NO;
 }
 
+- (void)enableFirstSessionDelay {
+    _isFirstSessionDelayEnabled = YES;
+}
+
 - (void)setUrlStrategy:(nullable NSArray *)urlStrategyDomains
          useSubdomains:(BOOL)useSubdomains
        isDataResidency:(BOOL)isDataResidency {
@@ -241,6 +245,7 @@ - (id)copyWithZone:(NSZone *)zone {
         copy->_isDeviceIdsReadingOnceEnabled = self.isDeviceIdsReadingOnceEnabled;
         copy.eventDeduplicationIdsMaxSize = self.eventDeduplicationIdsMaxSize;
         copy->_isAppTrackingTransparencyUsageEnabled = self.isAppTrackingTransparencyUsageEnabled;
+        copy->_isFirstSessionDelayEnabled = self.isFirstSessionDelayEnabled;
         // AdjustDelegate not copied
     }
 

Adjust/Adjust.h

@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust SDK
 //
-//  V5.2.0
+//  V5.3.0
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
 //  Copyright (c) 2012-Present Adjust GmbH. All rights reserved.
 //
@@ -285,6 +285,23 @@ extern NSString * __nonnull const ADJEnvironmentProduction;
  */
 + (void)lastDeeplinkWithCompletionHandler:(nonnull ADJLastDeeplinkGetterBlock)completion;
 
+/**
+ * @brief Enable COPPA (Children's Online Privacy Protection Act) compliant for the application when is in first session delay
+ */
++ (void)enableCoppaComplianceInDelay;
+
+/**
+ * @brief Disable COPPA (Children's Online Privacy Protection Act) compliant for the application when is in first session delay
+ */
++ (void)disableCoppaComplianceInDelay;
+
+/**
+ * @brief Custom defined unique device ID (optional) when is in first session delay.
+ *
+ * @note Make sure to have a UNIQUE external ID for each user / device.
+ */
++ (void)setExternalDeviceIdInDelay:(nullable NSString *)externalDeviceId;
+
 /**
  * @brief Verify in-app-purchase.
  *
@@ -303,6 +320,11 @@ extern NSString * __nonnull const ADJEnvironmentProduction;
 + (void)verifyAndTrackAppStorePurchase:(nonnull ADJEvent *)event
                  withCompletionHandler:(nonnull ADJVerificationResultBlock)completion;
 
+/**
+ * @brief End the first session delay that can be configured on ADJConfig instance.
+ */
++ (void)endFirstSessionDelay;
+
 /**
  * Obtain singleton Adjust object.
  */

Adjust/Adjust.m

@@ -288,6 +288,24 @@ + (void)verifyAppStorePurchase:(nonnull ADJAppStorePurchase *)purchase
     }
 }
 
+ + (void)enableCoppaComplianceInDelay {
+     @synchronized (self) {
+         [[Adjust getInstance] enableCoppaComplianceInDelay];
+     }
+ }
+
+ + (void)disableCoppaComplianceInDelay {
+     @synchronized (self) {
+         [[Adjust getInstance] disableCoppaComplianceInDelay];
+     }
+ }
+
++ (void)setExternalDeviceIdInDelay:(nullable NSString *)externalDeviceId {
+    @synchronized (self) {
+        [[Adjust getInstance] setExternalDeviceIdInDelay:externalDeviceId];
+    }
+}
+
 + (void)verifyAndTrackAppStorePurchase:(nonnull ADJEvent *)event
                  withCompletionHandler:(void (^_Nonnull)(ADJPurchaseVerificationResult * _Nonnull verificationResult))completion {
     @synchronized (self) {
@@ -296,6 +314,13 @@ + (void)verifyAndTrackAppStorePurchase:(nonnull ADJEvent *)event
     }
 }
 
++ (void)endFirstSessionDelay {
+    @synchronized (self) {
+        [[Adjust getInstance] endFirstSessionDelay];
+    }
+}
+
+
 + (void)setTestOptions:(NSDictionary *)testOptions {
     @synchronized (self) {
         if ([testOptions[@"teardown"] boolValue]) {
@@ -534,7 +559,6 @@ - (void)removeGlobalPartnerParameterForKey:(nonnull NSString *)key {
 }
 
 - (void)removeGlobalCallbackParameters {
-
     if ([self checkActivityHandler:@"removing all global callback parameters"]) {
         [self.activityHandler removeGlobalCallbackParameters];
         return;
@@ -570,19 +594,26 @@ - (void)gdprForgetMe {
 
 - (void)trackThirdPartySharing:(nonnull ADJThirdPartySharing *)thirdPartySharing {
     if (![self checkActivityHandler:@"track third party sharing"]) {
-        if (self.savedPreLaunch.preLaunchAdjustThirdPartySharingArray == nil) {
-            self.savedPreLaunch.preLaunchAdjustThirdPartySharingArray =
-                [[NSMutableArray alloc] init];
+        if (self.savedPreLaunch.preLaunchActionsArray == nil) {
+            self.savedPreLaunch.preLaunchActionsArray = [[NSMutableArray alloc] init];
         }
-        [self.savedPreLaunch.preLaunchAdjustThirdPartySharingArray addObject:thirdPartySharing];
+        [self.savedPreLaunch.preLaunchActionsArray addObject:^(ADJActivityHandler *activityHandler) {
+            [activityHandler tryTrackThirdPartySharingI:thirdPartySharing];
+        }];
         return;
     }
     [self.activityHandler trackThirdPartySharing:thirdPartySharing];
 }
 
 - (void)trackMeasurementConsent:(BOOL)enabled {
     if (![self checkActivityHandler:@"track measurement consent"]) {
-        self.savedPreLaunch.lastMeasurementConsentTracked = [NSNumber numberWithBool:enabled];
+        if (self.savedPreLaunch.preLaunchActionsArray == nil) {
+            self.savedPreLaunch.preLaunchActionsArray =
+                [[NSMutableArray alloc] init];
+        }
+        [self.savedPreLaunch.preLaunchActionsArray addObject:^(ADJActivityHandler *activityHandler) {
+            [activityHandler tryTrackMeasurementConsentI:enabled];
+        }];
         return;
     }
     [self.activityHandler trackMeasurementConsent:enabled];
@@ -619,7 +650,8 @@ - (void)updateSkanConversionValue:(NSInteger)conversionValue
                                             coarseValue:coarseValue
                                              lockWindow:lockWindow
                                                  source:ADJSkanSourceClient
-                                  withCompletionHandler:^(NSDictionary * _Nonnull result) {
+                                  withCompletionHandler:^(NSDictionary * _Nonnull result)
+     {
         if ([self checkActivityHandler]) {
             [self.activityHandler invokeClientSkanUpdateCallbackWithResult:result];
         }
@@ -712,6 +744,30 @@ - (void)verifyAppStorePurchase:(nonnull ADJAppStorePurchase *)purchase
                            withCompletionHandler:completion];
 }
 
+- (void)enableCoppaComplianceInDelay {
+    if (![self checkActivityHandler:@"enable coppa compliance in delay"]) {
+        return;
+    }
+
+    [self.activityHandler setCoppaComplianceInDelay:YES];
+}
+
+- (void)disableCoppaComplianceInDelay {
+    if (![self checkActivityHandler:@"disable coppa compliance in delay"]) {
+        return;
+    }
+
+    [self.activityHandler setCoppaComplianceInDelay:NO];
+}
+
+- (void)setExternalDeviceIdInDelay:(nullable NSString *)externalDeviceId {
+    if (![self checkActivityHandler:@"set external device id in delay"]) {
+        return;
+    }
+
+    [self.activityHandler setExternalDeviceIdInDelay:externalDeviceId];
+}
+
 - (void)verifyAndTrackAppStorePurchase:(nonnull ADJEvent *)event
                  withCompletionHandler:(void (^_Nonnull)(ADJPurchaseVerificationResult * _Nonnull verificationResult))completion {
     if (![self checkActivityHandler]) {
@@ -727,6 +783,14 @@ - (void)verifyAndTrackAppStorePurchase:(nonnull ADJEvent *)event
     [self.activityHandler verifyAndTrackAppStorePurchase:event withCompletionHandler:completion];
 }
 
+- (void)endFirstSessionDelay {
+    if (![self checkActivityHandler]) {
+        return;
+    }
+
+    [self.activityHandler endFirstSessionDelay];
+}
+
 - (void)teardown {
     if (self.activityHandler == nil) {
         [self.logger error:@"Adjust already down or not initialized"];

Adjust/Internal/ADJActivityHandler.h

@@ -41,11 +41,10 @@
 @property (nonatomic, strong) NSMutableArray * _Nullable preLaunchActionsArray;
 @property (nonatomic, strong) NSMutableArray * _Nullable cachedAttributionReadCallbacksArray;
 @property (nonatomic, strong) NSMutableArray * _Nullable cachedAdidReadCallbacksArray;
+
 @property (nonatomic, copy) NSNumber *_Nullable enabled;
 @property (nonatomic, assign) BOOL offline;
 @property (nonatomic, copy) NSString *_Nullable extraPath;
-@property (nonatomic, strong) NSMutableArray *_Nullable preLaunchAdjustThirdPartySharingArray;
-@property (nonatomic, copy) NSNumber *_Nullable lastMeasurementConsentTracked;
 
 - (nonnull id)init;
 
@@ -109,10 +108,14 @@
          withCompletionHandler:(nonnull ADJVerificationResultBlock)completion;
 - (void)attributionWithCompletionHandler:(nonnull ADJAttributionGetterBlock)completion;
 - (void)adidWithCompletionHandler:(nonnull ADJAdidGetterBlock)completion;
+- (void)setCoppaComplianceInDelay:(BOOL)isCoppaComplianceEnabled;
+- (void)setExternalDeviceIdInDelay:(nullable NSString *)externalDeviceId;
 - (void)verifyAndTrackAppStorePurchase:(nonnull ADJEvent *)event
                  withCompletionHandler:(nonnull ADJVerificationResultBlock)completion;
 - (void)invokeClientSkanUpdateCallbackWithResult:(NSDictionary * _Nonnull)result;
 
+- (void)endFirstSessionDelay;
+
 - (ADJPackageParams * _Nullable)packageParams;
 - (ADJActivityState * _Nullable)activityState;
 - (ADJConfig * _Nullable)adjustConfig;
@@ -140,6 +143,28 @@
                                forKey:(NSString *_Nonnull)key;
 - (void)removeGlobalCallbackParametersI:(ADJActivityHandler *_Nonnull)selfI;
 - (void)removeGlobalPartnerParametersI:(ADJActivityHandler *_Nonnull)selfI;
+
+- (void)tryTrackThirdPartySharingI:(nonnull ADJThirdPartySharing *)thirdPartySharing;
+- (void)tryTrackMeasurementConsentI:(BOOL)enabled;
+@end
+
+
+@interface ADJFirstSessionDelayManager : NSObject
+
+- (nonnull instancetype)initWithActivityHandler:(ADJActivityHandler * _Nonnull)activityHandler;
+
+- (void)delayOrInitWithBlock:(void (^_Nonnull)(ADJActivityHandler *_Nonnull selfI, BOOL isInactive))initBlock;
+- (void)endFirstSessionDelay;
+- (void)setCoppaComplianceInDelay:(BOOL)isCoppaComplianceEnabled;
+- (void)setExternalDeviceIdInDelay:(NSString * _Nullable)externalDeviceId;
+- (void)processApiAction:(NSString * _Nonnull)actionName
+             isPreLaunch:(BOOL)isPreLaunch
+               withBlock:(void (^_Nonnull)(_Nonnull id))selfInjectedBlock;
+
+
+
+- (BOOL)wasSet;
+
 @end
 
 @interface ADJTrackingStatusManager : NSObject