Version 4.21.1

Adjust.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.21.0"
+  s.version        = "4.21.1"
   s.summary        = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
   s.homepage       = "https://github.com/adjust/ios_sdk"
   s.license        = { :type => 'MIT', :file => 'MIT-LICENSE' }
   s.author         = { "Christian Wellenbrock" => "welle@adjust.com" }
-  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.21.0" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.21.1" }
   s.ios.deployment_target = '6.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'

Adjust.xcodeproj/project.pbxproj

@@ -2197,7 +2197,7 @@
 		9679920518BBAE2800394606 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1140;
 				ORGANIZATIONNAME = "adjust GmbH";
 				TargetAttributes = {
 					9615158E1CD2CB2C0022D336 = {

Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdk.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkIm.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkTv.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkWebBridge.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Adjust/ADJActivityHandler.h

@@ -82,8 +82,7 @@
 
 - (BOOL)updateAttributionI:(id<ADJActivityHandler>)selfI attribution:(ADJAttribution *)attribution;
 - (void)setAttributionDetails:(NSDictionary *)attributionDetails
-                        error:(NSError *)error
-                  retriesLeft:(int)retriesLeft;
+                        error:(NSError *)error;
 
 - (void)setOfflineMode:(BOOL)offline;
 - (void)sendFirstPackages;

Adjust/ADJActivityHandler.m

@@ -38,10 +38,7 @@
 static NSTimeInterval kBackgroundTimerInterval;
 static double kSessionInterval;
 static double kSubSessionInterval;
-
-// number of tries
-static const int kTryIadV3             = 2;
-static const uint64_t kDelayRetryIad   =  2 * NSEC_PER_SEC; // 1 second
+static const int kiAdRetriesCount = 3;
 
 @implementation ADJInternalState
 
@@ -89,6 +86,8 @@ @interface ADJActivityHandler()
 @property (nonatomic, strong) ADJActivityState *activityState;
 @property (nonatomic, strong) ADJTimerCycle *foregroundTimer;
 @property (nonatomic, strong) ADJTimerOnce *backgroundTimer;
+@property (nonatomic, strong) ADJTimerOnce *iAdTimeoutTimer;
+@property (nonatomic, assign) NSInteger iAdRetriesLeft;
 @property (nonatomic, strong) ADJInternalState *internalState;
 @property (nonatomic, strong) ADJDeviceInfo *deviceInfo;
 @property (nonatomic, strong) ADJTimerOnce *delayStartTimer;
@@ -108,6 +107,9 @@ @interface ADJActivityHandler()
 typedef NS_ENUM(NSInteger, AdjADClientError) {
     AdjADClientErrorUnknown = 0,
     AdjADClientErrorLimitAdTracking = 1,
+    AdjADClientErrorMissingData = 2,
+    AdjADClientErrorCorruptResponse = 3,
+    AdjCustomErrorTimeout = 100,
 };
 
 #pragma mark -
@@ -202,6 +204,8 @@ - (id)initWithConfig:(ADJConfig *)adjustConfig
         self.gdprPath = savedPreLaunch.gdprPath;
     }
 
+    self.iAdRetriesLeft = kiAdRetriesCount;
+
     self.internalQueue = dispatch_queue_create(kInternalQueueName, DISPATCH_QUEUE_SERIAL);
     [ADJUtil launchInQueue:self.internalQueue
                 selfInject:self
@@ -394,23 +398,52 @@ - (void)setTrackingStateOptedOut {
 
 - (void)setAttributionDetails:(NSDictionary *)attributionDetails
                         error:(NSError *)error
-                  retriesLeft:(int)retriesLeft
 {
+    [self.iAdTimeoutTimer cancel];
+
     if (![ADJUtil isNull:error]) {
         [self.logger warn:@"Unable to read iAd details"];
 
-        if (retriesLeft < 0) {
-            [self.logger warn:@"Limit number of retry for iAd v3 surpassed"];
+        if (self.iAdRetriesLeft  < 0) {
+            [self.logger warn:@"Number of retries to get iAd information surpassed"];
             return;
         }
 
-        if (error.code == AdjADClientErrorUnknown) {
-            dispatch_time_t retryTime = dispatch_time(DISPATCH_TIME_NOW, kDelayRetryIad);
-            dispatch_after(retryTime, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-                [[UIDevice currentDevice] adjSetIad:self triesV3Left:retriesLeft];
-            });
+        // if first request was unsuccessful and ended up with one of the following error codes:
+        //      - AdjADClientErrorUnknown
+        //      - AdjADClientErrorMissingData
+        //      - AdjADClientErrorCorruptResponse
+        //      - AdjCustomErrorTimeout
+        // apply following retry logic:
+        //      - 1st retry after 5 seconds
+        //      - 2nd retry after 2 seconds
+        //      - 3rd retry after 2 seconds
+        switch (error.code) {
+            case AdjADClientErrorUnknown:
+            case AdjADClientErrorMissingData:
+            case AdjADClientErrorCorruptResponse:
+            case AdjCustomErrorTimeout: {
+                int64_t iAdRetryDelay = 0;
+                switch (self.iAdRetriesLeft) {
+                    case 2:
+                        iAdRetryDelay = 5 * NSEC_PER_SEC;
+                        break;
+                    default:
+                        iAdRetryDelay = 2 * NSEC_PER_SEC;
+                        break;
+                }
+                self.iAdRetriesLeft = self.iAdRetriesLeft - 1;
+                dispatch_time_t retryTime = dispatch_time(DISPATCH_TIME_NOW, iAdRetryDelay);
+                dispatch_after(retryTime, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+                    [self checkForIad];
+                });
+                return;
+            }
+            case AdjADClientErrorLimitAdTracking:
+                return;
+            default:
+                return;
         }
-        return;
     }
 
     // check if it's a valid attribution details
@@ -603,6 +636,9 @@ - (void)teardown
     if (self.backgroundTimer != nil) {
         [self.backgroundTimer cancel];
     }
+    if (self.iAdTimeoutTimer != nil) {
+        [self.iAdTimeoutTimer cancel];
+    }
     if (self.foregroundTimer != nil) {
         [self.foregroundTimer cancel];
     }
@@ -630,6 +666,7 @@ - (void)teardown
     self.sdkClickHandler = nil;
     self.foregroundTimer = nil;
     self.backgroundTimer = nil;
+    self.iAdTimeoutTimer = nil;
     self.adjustDelegate = nil;
     self.adjustConfig = nil;
     self.internalState = nil;
@@ -757,7 +794,7 @@ - (void)initI:(ADJActivityHandler *)selfI
                                                                            sdkClickHandlerOnly:YES]];
 
     if (self.adjustConfig.allowiAdInfoReading == YES) {
-        [[UIDevice currentDevice] adjSetIad:selfI triesV3Left:kTryIadV3];
+        [self checkForIad];
     }
 
     [selfI preLaunchActionsI:selfI preLaunchActionsArray:preLaunchActionsArray];
@@ -1261,7 +1298,7 @@ - (void)setEnabledI:(ADJActivityHandler *)selfI enabled:(BOOL)enabled {
             [selfI disableThirdPartySharing];
         }
         if (self.adjustConfig.allowiAdInfoReading == YES) {
-            [[UIDevice currentDevice] adjSetIad:selfI triesV3Left:kTryIadV3];
+            [self checkForIad];
         }
     }
 
@@ -1272,6 +1309,25 @@ - (void)setEnabledI:(ADJActivityHandler *)selfI enabled:(BOOL)enabled {
         unPausingMessage:@"Resuming handlers due to SDK being enabled"];
 }
 
+- (void)checkForIad {
+    if (self.iAdTimeoutTimer == nil) {
+        self.iAdTimeoutTimer =
+            [ADJTimerOnce
+                timerWithBlock:^{
+                [self
+                    setAttributionDetails:nil
+                    error:[NSError errorWithDomain:@"com.adjust.sdk.iAd"
+                                              code:100
+                                          userInfo:@{@"Error reason": @"iAd request timed out"}]];
+
+            }
+             queue:self.internalQueue
+             name:@"iAdTimeoutTimer"];
+    }
+
+    [[UIDevice currentDevice] adjCheckForiAd:self iAdTimeoutTimer:self.iAdTimeoutTimer];
+}
+
 - (void)setOfflineModeI:(ADJActivityHandler *)selfI
                 offline:(BOOL)offline {
     // compare with the internal state

Adjust/ADJActivityPackage.h

@@ -16,8 +16,6 @@
 
 @property (nonatomic, copy) NSString *clientSdk;
 
-@property (nonatomic, assign) NSInteger retries;
-
 @property (nonatomic, strong) NSMutableDictionary *parameters;
 
 @property (nonatomic, strong) NSDictionary *partnerParameters;
@@ -36,8 +34,4 @@
 
 - (NSString *)failureMessage;
 
-- (NSInteger)getRetries;
-
-- (NSInteger)increaseRetries;
-
 @end

Adjust/ADJActivityPackage.m

@@ -15,7 +15,7 @@ @implementation ADJActivityPackage
 
 - (NSString *)extendedString {
     NSMutableString *builder = [NSMutableString string];
-    NSArray *excludedKeys = @[@"secret_id", @"app_secret", @"event_callback_id"];
+    NSArray *excludedKeys = @[@"secret_id", @"app_secret", @"signature", @"headers_id", @"native_version", @"event_callback_id"];
 
     [builder appendFormat:@"Path:      %@\n", self.path];
     [builder appendFormat:@"ClientSdk: %@\n", self.clientSdk];
@@ -42,16 +42,6 @@ - (NSString *)extendedString {
     return builder;
 }
 
-- (NSInteger)getRetries {
-    return self.retries;
-}
-
-- (NSInteger)increaseRetries {
-    self.retries = self.retries + 1;
-
-    return self.retries;
-}
-
 - (NSString *)description {
     return [NSString stringWithFormat:@"%@%@", [ADJActivityKindUtil activityKindToString:self.activityKind], self.suffix];
 }

Adjust/ADJAdditions/UIDevice+ADJAdditions.h

@@ -9,6 +9,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import "ADJActivityHandler.h"
+#import "ADJTimerOnce.h"
 
 @interface UIDevice(ADJAdditions)
 
@@ -19,6 +20,6 @@
 - (NSString *)adjDeviceName;
 - (NSString *)adjCreateUuid;
 - (NSString *)adjVendorId;
-- (void)adjSetIad:(ADJActivityHandler *)activityHandler
-      triesV3Left:(int)triesV3Left;
+- (void)adjCheckForiAd:(ADJActivityHandler *)activityHandler
+       iAdTimeoutTimer:(ADJTimerOnce *)iAdTimeoutTimer;
 @end