Response delegate

Adjust.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.5.4"
+  s.version        = "4.6.0"
   s.summary        = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
   s.homepage       = "http://adjust.com"
   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.5.4" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.6.0" }
   s.ios.deployment_target = '6.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'

Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdk.xcscheme

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

Adjust/ADJActivityHandler.h

@@ -7,7 +7,7 @@
 //
 
 #import "Adjust.h"
-#import "ADJAttribution.h"
+#import "ADJResponseData.h"
 
 @protocol ADJActivityHandler <NSObject>
 
@@ -18,24 +18,25 @@
 
 - (void)trackEvent:(ADJEvent *)event;
 
-- (void)finishedTracking:(NSDictionary *)jsonDict;
+- (void)finishedTracking:(ADJResponseData *)responseData;
+- (void)launchEventResponseTasks:(ADJEventResponseData *)eventResponseData;
+- (void)launchSessionResponseTasks:(ADJSessionResponseData *)sessionResponseData;
+- (void)launchAttributionResponseTasks:(ADJAttributionResponseData *)attributionResponseData;
 - (void)setEnabled:(BOOL)enabled;
 - (BOOL)isEnabled;
 - (void)appWillOpenUrl:(NSURL*)url;
 - (void)setDeviceToken:(NSData *)deviceToken;
 
 - (ADJAttribution*) attribution;
-- (void) setAttribution:(ADJAttribution*)attribution;
-- (void) setAskingAttribution:(BOOL)askingAttribution;
+- (void)setAttribution:(ADJAttribution*)attribution;
+- (void)setAskingAttribution:(BOOL)askingAttribution;
 
-- (BOOL) updateAttribution:(ADJAttribution*) attribution;
-- (void) setIadDate:(NSDate*)iAdImpressionDate withPurchaseDate:(NSDate*)appPurchaseDate;
+- (BOOL)updateAttribution:(ADJAttribution *)attribution;
+- (void)setIadDate:(NSDate*)iAdImpressionDate withPurchaseDate:(NSDate*)appPurchaseDate;
 - (void)setIadDetails:(NSDictionary *)attributionDetails
                 error:(NSError *)error
           retriesLeft:(int)retriesLeft;
 
-- (void) launchAttributionDelegate;
-
 - (void) setOfflineMode:(BOOL)offline;
 
 @end

Adjust/ADJActivityHandler.m

@@ -36,7 +36,7 @@ @interface ADJActivityHandler()
 @property (nonatomic, retain) ADJActivityState *activityState;
 @property (nonatomic, retain) ADJTimerCycle *timer;
 @property (nonatomic, retain) id<ADJLogger> logger;
-@property (nonatomic, weak) NSObject<AdjustDelegate> *delegate;
+@property (nonatomic, weak) NSObject<AdjustDelegate> *adjustDelegate;
 @property (nonatomic, copy) ADJAttribution *attribution;
 @property (nonatomic, copy) ADJConfig *adjustConfig;
 
@@ -76,7 +76,7 @@ - (id)initWithConfig:(ADJConfig *)adjustConfig {
     }
 
     self.adjustConfig = adjustConfig;
-    self.delegate = adjustConfig.delegate;
+    self.adjustDelegate = adjustConfig.delegate;
 
     self.logger = ADJAdjustFactory.logger;
     [self addNotificationObserver];
@@ -109,23 +109,43 @@ - (void)trackEvent:(ADJEvent *)event
     });
 }
 
-- (void)finishedTracking:(NSDictionary *)jsonDict{
-    if ([ADJUtil isNull:jsonDict]) return;
+- (void)finishedTracking:(ADJResponseData *)responseData {
+    // redirect session responses to attribution handler to check for attribution information
+    if ([responseData isKindOfClass:[ADJSessionResponseData class]]) {
+        [self.attributionHandler checkSessionResponse:(ADJSessionResponseData*)responseData];
+        return;
+    }
+
+    // check if it's an event response
+    if ([responseData isKindOfClass:[ADJEventResponseData class]]) {
+        [self launchEventResponseTasks:(ADJEventResponseData*)responseData];
+        return;
+    }
+}
 
-    [self launchDeepLink:jsonDict];
-    [self.attributionHandler checkAttribution:jsonDict];
+- (void)launchEventResponseTasks:(ADJEventResponseData *)eventResponseData {
+    dispatch_async(self.internalQueue, ^{
+        [self launchEventResponseTasksInternal:eventResponseData];
+    });
+}
+
+- (void)launchSessionResponseTasks:(ADJSessionResponseData *)sessionResponseData {
+    dispatch_async(self.internalQueue, ^{
+        [self launchSessionResponseTasksInternal:sessionResponseData];
+    });
 }
 
-- (void)launchDeepLink:(NSDictionary *)jsonDict{
-    if ([ADJUtil isNull:jsonDict]) return;
+- (void)launchAttributionResponseTasks:(ADJAttributionResponseData *)attributionResponseData {
+    dispatch_async(self.internalQueue, ^{
+        [self launchAttributionResponseTasksInternal:attributionResponseData];
+    });
+}
 
-    NSString *deepLink = [jsonDict objectForKey:@"deeplink"];
+- (void)launchDeepLink:(NSString *)deepLink{
     if (deepLink == nil) return;
 
     NSURL* deepLinkUrl = [NSURL URLWithString:deepLink];
 
-    [self.logger info:@"Open deep link (%@)", deepLink];
-
     BOOL success = [[UIApplication sharedApplication] openURL:deepLinkUrl];
 
     if (!success) {
@@ -230,11 +250,11 @@ - (void)setDeviceToken:(NSData *)deviceToken {
 
 - (void)setIadDate:(NSDate *)iAdImpressionDate withPurchaseDate:(NSDate *)appPurchaseDate {
     if (iAdImpressionDate == nil) {
-        [self.logger verbose:@"iAdImpressionDate not received"];
+        [self.logger debug:@"iAdImpressionDate not received"];
         return;
     }
 
-    [self.logger verbose:@"iAdImpressionDate received: %@", iAdImpressionDate];
+    [self.logger debug:@"iAdImpressionDate received: %@", iAdImpressionDate];
 
 
     double now = [NSDate.date timeIntervalSince1970];
@@ -249,6 +269,7 @@ - (void)setIadDate:(NSDate *)iAdImpressionDate withPurchaseDate:(NSDate *)appPur
 
     ADJActivityPackage *clickPackage = [clickBuilder buildClickPackage:@"iad"];
     [self.packageHandler addPackage:clickPackage];
+    [self.packageHandler sendFirstPackage];
 }
 
 - (void)setIadDetails:(NSDictionary *)attributionDetails
@@ -259,14 +280,10 @@ - (void)setIadDetails:(NSDictionary *)attributionDetails
         [self.logger warn:@"Unable to read iAd details"];
 
         if (retriesLeft < 0) {
-            [self.logger error:@"Reached limit number of retry for iAd"];
+            [self.logger warn:@"Limit number of retry for iAd v3 surpassed"];
             return;
         }
 
-        if (retriesLeft == 0) {
-            [self.logger error:@"Reached limit number of retry for iAd, trying iAd v2"];
-        }
-
         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), ^{
@@ -291,32 +308,7 @@ - (void)setIadDetails:(NSDictionary *)attributionDetails
 
     ADJActivityPackage *clickPackage = [clickBuilder buildClickPackage:@"iad3"];
     [self.packageHandler addPackage:clickPackage];
-}
-
-- (BOOL)updateAttribution:(ADJAttribution *)attribution {
-    if (attribution == nil) {
-        return NO;
-    }
-    if ([attribution isEqual:self.attribution]) {
-        return NO;
-    }
-    self.attribution = attribution;
-    [self writeAttribution];
-
-    [self launchAttributionDelegate];
-
-    return YES;
-}
-
-- (void)launchAttributionDelegate{
-    if (self.delegate == nil) {
-        return;
-    }
-    if (![self.delegate respondsToSelector:@selector(adjustAttributionChanged:)]) {
-        return;
-    }
-    [self.delegate performSelectorOnMainThread:@selector(adjustAttributionChanged:)
-                                    withObject:self.attribution waitUntilDone:NO];
+    [self.packageHandler sendFirstPackage];
 }
 
 - (void)setAskingAttribution:(BOOL)askingAttribution {
@@ -364,7 +356,7 @@ - (void)initInternal {
     self.attributionHandler = [ADJAdjustFactory attributionHandlerForActivityHandler:self
                                                               withAttributionPackage:attributionPackage
                                                                          startPaused:[self paused]
-                                                                         hasDelegate:(self.delegate != nil)];
+                                                                         hasAttributionChangedDelegate:self.adjustConfig.hasAttributionChangedDelegate];
 
     self.timer = [ADJTimerCycle timerWithBlock:^{ [self timerFiredInternal]; }
                                     queue:self.internalQueue
@@ -489,6 +481,108 @@ - (void)eventInternal:(ADJEvent *)event
     [self writeActivityState];
 }
 
+- (void) launchEventResponseTasksInternal:(ADJEventResponseData *)eventResponseData {
+    // event success callback
+    if (eventResponseData.success
+        && [self.adjustDelegate respondsToSelector:@selector(adjustEventTrackingSucceeded:)])
+    {
+        [self.logger debug:@"Launching success event tracking delegate"];
+        [self.adjustDelegate performSelectorOnMainThread:@selector(adjustEventTrackingSucceeded:)
+                                              withObject:[eventResponseData successResponseData]
+                                           waitUntilDone:NO]; // non-blocking
+        return;
+    }
+    // event failure callback
+    if (!eventResponseData.success
+        && [self.adjustDelegate respondsToSelector:@selector(adjustEventTrackingFailed:)])
+    {
+        [self.logger debug:@"Launching failed event tracking delegate"];
+        [self.adjustDelegate performSelectorOnMainThread:@selector(adjustEventTrackingFailed:)
+                                              withObject:[eventResponseData failureResponseData]
+                                           waitUntilDone:NO]; // non-blocking
+        return;
+    }
+}
+
+- (void) launchSessionResponseTasksInternal:(ADJSessionResponseData *)sessionResponseData {
+    BOOL toLaunchAttributionDelegate = [self updateAttribution:sessionResponseData.attribution];
+
+    // session success callback
+    if (sessionResponseData.success
+        && [self.adjustDelegate respondsToSelector:@selector(adjustSessionTrackingSucceeded:)])
+    {
+        [self.logger debug:@"Launching success session tracking delegate"];
+        [self.adjustDelegate performSelectorOnMainThread:@selector(adjustSessionTrackingSucceeded:)
+                                              withObject:[sessionResponseData successResponseData]
+                                           waitUntilDone:NO]; // non-blocking
+    }
+    // session failure callback
+    if (!sessionResponseData.success
+        && [self.adjustDelegate respondsToSelector:@selector(adjustSessionTrackingFailed:)])
+    {
+        [self.logger debug:@"Launching failed session tracking delegate"];
+        [self.adjustDelegate performSelectorOnMainThread:@selector(adjustSessionTrackingFailed:)
+                                              withObject:[sessionResponseData failureResponseData]
+                                           waitUntilDone:NO]; // non-blocking
+    }
+
+    // try to update and launch the attribution changed delegate blocking
+    if (toLaunchAttributionDelegate) {
+        [self.logger debug:@"Launching attribution changed delegate"];
+        [self.adjustDelegate performSelectorOnMainThread:@selector(adjustAttributionChanged:)
+                                              withObject:sessionResponseData.attribution
+                                           waitUntilDone:NO]; // non-blocking
+    }
+
+    if ([ADJUtil isNull:sessionResponseData.jsonResponse]) {
+        return;
+    }
+
+    NSString *deepLink = [sessionResponseData.jsonResponse objectForKey:@"deeplink"];
+    if (deepLink == nil) {
+        return;
+    }
+
+    [self.logger info:@"Trying to open deep link (%@)", deepLink];
+
+    [self performSelectorOnMainThread:@selector(launchDeepLink:)
+                           withObject:deepLink
+                        waitUntilDone:NO]; // non-blocking
+}
+
+- (void) launchAttributionResponseTasksInternal:(ADJAttributionResponseData *)attributionResponseData {
+    BOOL toLaunchAttributionDelegate = [self updateAttribution:attributionResponseData.attribution];
+
+    // try to update and launch the attribution changed delegate non-blocking
+    if (toLaunchAttributionDelegate) {
+        [self.logger debug:@"Launching attribution changed delegate"];
+        [self.adjustDelegate performSelectorOnMainThread:@selector(adjustAttributionChanged:)
+                                              withObject:attributionResponseData.attribution
+                                           waitUntilDone:NO]; // non-blocking
+    }
+}
+
+- (BOOL)updateAttribution:(ADJAttribution *)attribution {
+    if (attribution == nil) {
+        return NO;
+    }
+    if ([attribution isEqual:self.attribution]) {
+        return NO;
+    }
+    self.attribution = attribution;
+    [self writeAttribution];
+
+    if (self.adjustDelegate == nil) {
+        return NO;
+    }
+
+    if (![self.adjustDelegate respondsToSelector:@selector(adjustAttributionChanged:)]) {
+        return NO;
+    }
+
+    return YES;
+}
+
 - (void) appWillOpenUrlInternal:(NSURL *)url {
     if ([ADJUtil isNull:url]) {
         return;
@@ -525,6 +619,7 @@ - (void) appWillOpenUrlInternal:(NSURL *)url {
 
     ADJActivityPackage *clickPackage = [clickBuilder buildClickPackage:@"deeplink"];
     [self.packageHandler addPackage:clickPackage];
+    [self.packageHandler sendFirstPackage];
 }
 
 - (BOOL) readDeeplinkQueryString:(NSString *)queryString

Adjust/ADJAdditions/UIDevice+ADJAdditions.m

@@ -170,6 +170,7 @@ - (void) adjSetIad:(ADJActivityHandler *) activityHandler
 
     // if no tries for iad v3 left -> iad v2
     if (triesV3Left == 0) {
+        [logger warn:@"Reached limit number of retry for iAd v3. Trying iAd v2"];
         [self adjSetIadWithDates:activityHandler ADClientSharedClientInstance:ADClientSharedClientInstance];
         return;
     }
@@ -178,8 +179,9 @@ - (void) adjSetIad:(ADJActivityHandler *) activityHandler
                      ADClientSharedClientInstance:ADClientSharedClientInstance
                                       retriesLeft:(triesV3Left - 1)];
 
-    // if no tries for iad v3 left -> iad v2
+    // if iad v3 not available -> iad v2
     if (!isIadV3Avaliable) {
+        [logger warn:@"iAd v3 not available. Trying iAd v2"];
         [self adjSetIadWithDates:activityHandler ADClientSharedClientInstance:ADClientSharedClientInstance];
     }
 #pragma clang diagnostic pop

Adjust/ADJAdjustFactory.h

@@ -28,7 +28,7 @@
 + (id<ADJAttributionHandler>)attributionHandlerForActivityHandler:(id<ADJActivityHandler>)activityHandler
                                            withAttributionPackage:(ADJActivityPackage *) attributionPackage
                                                       startPaused:(BOOL)startPaused
-                                                      hasDelegate:(BOOL)hasDelegate;
+                                    hasAttributionChangedDelegate:(BOOL)hasAttributionChangedDelegate;
 
 + (void)setPackageHandler:(id<ADJPackageHandler>)packageHandler;
 + (void)setRequestHandler:(id<ADJRequestHandler>)requestHandler;

Adjust/ADJAdjustFactory.m

@@ -84,19 +84,19 @@ + (NSTimeInterval)timerStart {
 + (id<ADJAttributionHandler>)attributionHandlerForActivityHandler:(id<ADJActivityHandler>)activityHandler
                                            withAttributionPackage:(ADJActivityPackage *) attributionPackage
                                                       startPaused:(BOOL)startPaused
-                                                      hasDelegate:(BOOL)hasDelegate
+                                    hasAttributionChangedDelegate:(BOOL)hasAttributionChangedDelegate
 {
     if (internalAttributionHandler == nil) {
         return [ADJAttributionHandler handlerWithActivityHandler:activityHandler
                                           withAttributionPackage:attributionPackage
                                                      startPaused:startPaused
-                                                     hasDelegate:hasDelegate];
+                                                     hasAttributionChangedDelegate:hasAttributionChangedDelegate];
     }
 
     return [internalAttributionHandler initWithActivityHandler:activityHandler
                                         withAttributionPackage:attributionPackage
                                                    startPaused:startPaused
-                                                   hasDelegate:hasDelegate];
+                                 hasAttributionChangedDelegate:hasAttributionChangedDelegate];
 }
 
 + (void)setPackageHandler:(id<ADJPackageHandler>)packageHandler {