Merge pull request #13 from adjust/v4113

v4.11.3

CHANGELOG.md

@@ -1,3 +1,17 @@
+### Version 4.11.3 (15th May 2017)
+#### Added
+- **[iOS][AND]** Added check if `sdk_click` package response contains attribution information.
+- **[iOS][AND]** Added sending of attributable parameters with every `sdk_click` package.
+
+#### Changed
+- **[iOS][AND]** Replaced `assert` level logs with `warn` level.
+
+#### Native SDKs
+- **[iOS]** [[email protected]][ios_sdk_v4.11.4]
+- **[AND]** [[email protected]][android_sdk_v4.11.4]
+
+---
+
 ### Version 4.11.2 (24th April 2017)
 #### Added
 - **[iOS]** Added nullability annotations to public headers for Swift 3.0 compatibility.
@@ -80,8 +94,10 @@
 [ios_sdk_v4.10.3]: https://github.com/adjust/ios_sdk/tree/v4.10.3
 [ios_sdk_v4.11.0]: https://github.com/adjust/ios_sdk/tree/v4.11.0
 [ios_sdk_v4.11.3]: https://github.com/adjust/ios_sdk/tree/v4.11.3
+[ios_sdk_v4.11.4]: https://github.com/adjust/ios_sdk/tree/v4.11.4
 
 [android_sdk_v4.10.4]: https://github.com/adjust/android_sdk/tree/v4.10.4
 [android_sdk_v4.11.0]: https://github.com/adjust/android_sdk/tree/v4.11.0
 [android_sdk_v4.11.1]: https://github.com/adjust/android_sdk/tree/v4.11.1
 [android_sdk_v4.11.3]: https://github.com/adjust/android_sdk/tree/v4.11.3
+[android_sdk_v4.11.4]: https://github.com/adjust/android_sdk/tree/v4.11.4

VERSION

@@ -1 +1 @@
-4.11.2
+4.11.3

index.js

@@ -111,7 +111,7 @@ var AdjustConfig = function(appToken, environment) {
     this.appToken = appToken;
     this.environment = environment;
 
-    this.sdkPrefix = "react_native4.11.2";
+    this.sdkPrefix = "react_native4.11.3";
     this.logLevel = null;
 
     this.eventBufferingEnabled = null;

ios/Adjust/ADJActivityHandler.h

@@ -52,6 +52,7 @@ sessionParametersActionsArray:(NSArray*)sessionParametersActionsArray
 - (void)finishedTracking:(ADJResponseData *)responseData;
 - (void)launchEventResponseTasks:(ADJEventResponseData *)eventResponseData;
 - (void)launchSessionResponseTasks:(ADJSessionResponseData *)sessionResponseData;
+- (void)launchSdkClickResponseTasks:(ADJSdkClickResponseData *)sdkClickResponseData;
 - (void)launchAttributionResponseTasks:(ADJAttributionResponseData *)attributionResponseData;
 - (void)setEnabled:(BOOL)enabled;
 - (BOOL)isEnabled;

ios/Adjust/ADJActivityHandler.m

@@ -238,6 +238,12 @@ - (void)finishedTracking:(ADJResponseData *)responseData {
         return;
     }
 
+    // redirect sdk_click responses to attribution handler to check for attribution information
+    if ([responseData isKindOfClass:[ADJSdkClickResponseData class]]) {
+        [self.attributionHandler checkSdkClickResponse:(ADJSdkClickResponseData*)responseData];
+        return;
+    }
+
     // check if it's an event response
     if ([responseData isKindOfClass:[ADJEventResponseData class]]) {
         [self launchEventResponseTasks:(ADJEventResponseData*)responseData];
@@ -261,6 +267,14 @@ - (void)launchSessionResponseTasks:(ADJSessionResponseData *)sessionResponseData
                      }];
 }
 
+- (void)launchSdkClickResponseTasks:(ADJSdkClickResponseData *)sdkClickResponseData {
+    [ADJUtil launchInQueue:self.internalQueue
+                selfInject:self
+                     block:^(ADJActivityHandler * selfI) {
+                         [selfI launchSdkClickResponseTasksI:selfI sdkClickResponseData:sdkClickResponseData];
+                     }];
+}
+
 - (void)launchAttributionResponseTasks:(ADJAttributionResponseData *)attributionResponseData {
     [ADJUtil launchInQueue:self.internalQueue
                 selfInject:self
@@ -399,27 +413,14 @@ - (void)setDeviceToken:(NSData *)deviceToken {
                      }];
 }
 
-- (void)setIadDate:(NSDate *)iAdImpressionDate withPurchaseDate:(NSDate *)appPurchaseDate {
-    if (iAdImpressionDate == nil) {
-        [self.logger debug:@"iAdImpressionDate not received"];
-        return;
-    }
-
-    [self.logger debug:@"iAdImpressionDate received: %@", iAdImpressionDate];
-
-
-    double now = [NSDate.date timeIntervalSince1970];
-    ADJPackageBuilder *clickBuilder = [[ADJPackageBuilder alloc]
-                                       initWithDeviceInfo:self.deviceInfo
-                                       activityState:self.activityState
-                                       config:self.adjustConfig
-                                       createdAt:now];
-
-    clickBuilder.purchaseTime = appPurchaseDate;
-    clickBuilder.clickTime = iAdImpressionDate;
-
-    ADJActivityPackage *clickPackage = [clickBuilder buildClickPackage:@"iad"];
-    [self.sdkClickHandler sendSdkClick:clickPackage];
+- (void)setIadDate:(NSDate *)iAdImpressionDate
+   withPurchaseDate:(NSDate *)appPurchaseDate
+{
+    [ADJUtil launchInQueue:self.internalQueue
+                selfInject:self
+                     block:^(ADJActivityHandler * selfI) {
+                         [selfI setIadDateI:selfI iAdImpressionDate:iAdImpressionDate withPurchaseDate:appPurchaseDate];
+                     }];
 }
 
 - (void)setAttributionDetails:(NSDictionary *)attributionDetails
@@ -485,6 +486,10 @@ - (void)sendIad3ClickPackage:(ADJActivityHandler *)selfI
           attributionDetails:(NSDictionary *)attributionDetails
  {
      double now = [NSDate.date timeIntervalSince1970];
+     if (selfI.activityState != nil) {
+         double lastInterval = now - selfI.activityState.lastActivity;
+         selfI.activityState.lastInterval = lastInterval;
+     }
      ADJPackageBuilder *clickBuilder = [[ADJPackageBuilder alloc]
                                         initWithDeviceInfo:selfI.deviceInfo
                                         activityState:selfI.activityState
@@ -493,7 +498,7 @@ - (void)sendIad3ClickPackage:(ADJActivityHandler *)selfI
 
      clickBuilder.attributionDetails = attributionDetails;
 
-     ADJActivityPackage *clickPackage = [clickBuilder buildClickPackage:@"iad3"];
+     ADJActivityPackage *clickPackage = [clickBuilder buildClickPackage:@"iad3" sessionParameters:selfI.sessionParameters];
      [selfI.sdkClickHandler sendSdkClick:clickPackage];
 }
 
@@ -716,7 +721,8 @@ - (void)initI:(ADJActivityHandler *)selfI
                                                                         startsSending:[selfI toSendI:selfI
                                                                                  sdkClickHandlerOnly:NO]];
 
-    selfI.sdkClickHandler = [ADJAdjustFactory sdkClickHandlerWithStartsPaused:[selfI toSendI:selfI
+    selfI.sdkClickHandler = [ADJAdjustFactory sdkClickHandlerWithStartsPaused:selfI
+                                                                startsSending:[selfI toSendI:selfI
                                                                         sdkClickHandlerOnly:YES]];
 
     [[UIDevice currentDevice] adjSetIad:selfI triesV3Left:kTryIadV3];
@@ -930,6 +936,21 @@ - (void)launchSessionResponseTasksI:(ADJActivityHandler *)selfI
     self.internalState.sessionResponseProcessed = YES;
 }
 
+- (void)launchSdkClickResponseTasksI:(ADJActivityHandler *)selfI
+                sdkClickResponseData:(ADJSdkClickResponseData *)sdkClickResponseData {
+    [selfI updateAdidI:selfI adid:sdkClickResponseData.adid];
+
+    BOOL toLaunchAttributionDelegate = [selfI updateAttributionI:selfI attribution:sdkClickResponseData.attribution];
+
+    // try to update and launch the attribution changed delegate
+    if (toLaunchAttributionDelegate) {
+        [selfI.logger debug:@"Launching attribution changed delegate"];
+        [ADJUtil launchInMainThread:selfI.adjustDelegate
+                           selector:@selector(adjustAttributionChanged:)
+                         withObject:sdkClickResponseData.attribution];
+    }
+}
+
 - (void)launchAttributionResponseTasksI:(ADJActivityHandler *)selfI
                 attributionResponseData:(ADJAttributionResponseData *)attributionResponseData {
     [selfI updateAdidI:selfI adid:attributionResponseData.adid];
@@ -1034,6 +1055,9 @@ - (void)appWillOpenUrlI:(ADJActivityHandler *)selfI
     }
 
     double now = [NSDate.date timeIntervalSince1970];
+    double lastInterval = now - selfI.activityState.lastActivity;
+    selfI.activityState.lastInterval = lastInterval;
+
     ADJPackageBuilder *clickBuilder = [[ADJPackageBuilder alloc]
                                        initWithDeviceInfo:selfI.deviceInfo
                                        activityState:selfI.activityState
@@ -1044,7 +1068,7 @@ - (void)appWillOpenUrlI:(ADJActivityHandler *)selfI
     clickBuilder.clickTime = [NSDate date];
     clickBuilder.deeplink = [url absoluteString];
 
-    ADJActivityPackage *clickPackage = [clickBuilder buildClickPackage:@"deeplink"];
+    ADJActivityPackage *clickPackage = [clickBuilder buildClickPackage:@"deeplink" sessionParameters:selfI.sessionParameters];
     [selfI.sdkClickHandler sendSdkClick:clickPackage];
 }
 
@@ -1133,6 +1157,37 @@ - (void)setDeviceTokenI:(ADJActivityHandler *)selfI
     [selfI.packageHandler sendFirstPackage];
 }
 
+- (void)setIadDateI:(ADJActivityHandler *)selfI
+  iAdImpressionDate:(NSDate *)iAdImpressionDate
+   withPurchaseDate:(NSDate *)appPurchaseDate
+{
+    if (iAdImpressionDate == nil) {
+        [self.logger debug:@"iAdImpressionDate not received"];
+        return;
+    }
+
+    [self.logger debug:@"iAdImpressionDate received: %@", iAdImpressionDate];
+
+    double now = [NSDate.date timeIntervalSince1970];
+    if (selfI.activityState != nil) {
+        double lastInterval = now - selfI.activityState.lastActivity;
+        selfI.activityState.lastInterval = lastInterval;
+    }
+
+    ADJPackageBuilder *clickBuilder = [[ADJPackageBuilder alloc]
+                                       initWithDeviceInfo:self.deviceInfo
+                                       activityState:self.activityState
+                                       config:self.adjustConfig
+                                       createdAt:now];
+
+    clickBuilder.purchaseTime = appPurchaseDate;
+    clickBuilder.clickTime = iAdImpressionDate;
+
+    ADJActivityPackage *clickPackage = [clickBuilder buildClickPackage:@"iad" sessionParameters:selfI.sessionParameters];
+    [self.sdkClickHandler sendSdkClick:clickPackage];
+}
+
+
 #pragma mark - private
 
 - (BOOL)isEnabledI:(ADJActivityHandler *)selfI {

ios/Adjust/ADJAdjustFactory.h

@@ -24,7 +24,8 @@
 + (id<ADJActivityHandler>)activityHandlerWithConfig:(ADJConfig *)adjustConfig
                      sessionParametersActionsArray:(NSArray*)sessionParametersActionsArray
                                         deviceToken:(NSData*)deviceToken;
-+ (id<ADJSdkClickHandler>)sdkClickHandlerWithStartsPaused:(BOOL)startsSending;
++ (id<ADJSdkClickHandler>)sdkClickHandlerWithStartsPaused:(id<ADJActivityHandler>)activityHandler
+                                            startsSending:(BOOL)startsSending;
 
 + (id<ADJLogger>)logger;
 + (double)sessionInterval;

ios/Adjust/ADJAdjustFactory.m

@@ -122,13 +122,14 @@ + (ADJBackoffStrategy *)sdkClickHandlerBackoffStrategy {
                                                  startsSending:startsSending];
 }
 
-+ (id<ADJSdkClickHandler>)sdkClickHandlerWithStartsPaused:(BOOL)startsSending
++ (id<ADJSdkClickHandler>)sdkClickHandlerWithStartsPaused:(id<ADJActivityHandler>)activityHandler
+                                            startsSending:(BOOL)startsSending
 {
     if (internalSdkClickHandler == nil) {
-        return [ADJSdkClickHandler handlerWithStartsSending:startsSending];
+        return [ADJSdkClickHandler handlerWithActivityHandler:activityHandler startsSending:startsSending];
     }
 
-    return [internalSdkClickHandler initWithStartsSending:startsSending];
+    return [internalSdkClickHandler initWithActivityHandler:activityHandler startsSending:startsSending];
 }
 
 + (BOOL)testing {

ios/Adjust/ADJAttributionHandler.h

@@ -18,6 +18,8 @@
 
 - (void)checkSessionResponse:(ADJSessionResponseData *)sessionResponseData;
 
+- (void)checkSdkClickResponse:(ADJSdkClickResponseData *)sdkClickResponseData;
+
 - (void)checkAttributionResponse:(ADJAttributionResponseData *)attributionResponseData;
 
 - (void)getAttribution;

ios/Adjust/ADJAttributionHandler.m

@@ -74,6 +74,15 @@ - (void)checkSessionResponse:(ADJSessionResponseData *)sessionResponseData {
                      }];
 }
 
+- (void)checkSdkClickResponse:(ADJSdkClickResponseData *)sdkClickResponseData {
+    [ADJUtil launchInQueue:self.internalQueue
+                selfInject:self
+                     block:^(ADJAttributionHandler* selfI) {
+                         [selfI checkSdkClickResponseI:selfI
+                                  sdkClickResponseData:sdkClickResponseData];
+                     }];
+}
+
 - (void)checkAttributionResponse:(ADJAttributionResponseData *)attributionResponseData {
     [ADJUtil launchInQueue:self.internalQueue
                 selfInject:self
@@ -110,6 +119,13 @@ - (void)checkSessionResponseI:(ADJAttributionHandler*)selfI
     [selfI.activityHandler launchSessionResponseTasks:sessionResponseData];
 }
 
+- (void)checkSdkClickResponseI:(ADJAttributionHandler*)selfI
+          sdkClickResponseData:(ADJSdkClickResponseData *)sdkClickResponseData {
+    [selfI checkAttributionI:selfI responseData:sdkClickResponseData];
+
+    [selfI.activityHandler launchSdkClickResponseTasks:sdkClickResponseData];
+}
+
 - (void)checkAttributionResponseI:(ADJAttributionHandler*)selfI
                   attributionResponseData:(ADJAttributionResponseData *)attributionResponseData {
     [selfI checkAttributionI:selfI responseData:attributionResponseData];

ios/Adjust/ADJConfig.m

@@ -15,7 +15,6 @@
 @interface ADJConfig()
 
 @property (nonatomic, weak) id<ADJLogger> logger;
-@property (nonatomic, assign) BOOL allowSuppressLogLevel;
 
 @end
 
@@ -48,10 +47,13 @@ - (id)initWithAppToken:(NSString *)appToken
     self = [super init];
     if (self == nil) return nil;
 
-    self.allowSuppressLogLevel = allowSuppressLogLevel;
     self.logger = ADJAdjustFactory.logger;
     // default values
-    [self setLogLevel:ADJLogLevelInfo environment:environment];
+    if (allowSuppressLogLevel && [ADJEnvironmentProduction isEqualToString:environment]) {
+        [self setLogLevel:ADJLogLevelSuppress environment:environment];
+    } else {
+        [self setLogLevel:ADJLogLevelInfo environment:environment];
+    }
 
     if (![self checkEnvironment:environment]) return self;
     if (![self checkAppToken:appToken]) return self;
@@ -69,25 +71,12 @@ - (void)setLogLevel:(ADJLogLevel)logLevel {
 }
 
 - (void)setLogLevel:(ADJLogLevel)logLevel
-        environment:(NSString *)environment{
-    if ([environment isEqualToString:ADJEnvironmentProduction]) {
-        if (self.allowSuppressLogLevel) {
-            _logLevel = ADJLogLevelSuppress;
-        } else {
-            _logLevel = ADJLogLevelAssert;
-        }
-    } else {
-        if (!self.allowSuppressLogLevel &&
-            logLevel == ADJLogLevelSuppress) {
-            _logLevel = ADJLogLevelAssert;
-        } else {
-            _logLevel = logLevel;
-        }
-    }
-    [self.logger setLogLevel:self.logLevel];
+        environment:(NSString *)environment
+{
+    [self.logger setLogLevel:logLevel
+     isProductionEnvironment:[ADJEnvironmentProduction isEqualToString:environment]];
 }
 
-
 - (void)setDelegate:(NSObject<AdjustDelegate> *)delegate {
     BOOL hasResponseDelegate = NO;
     BOOL implementsDeeplinkCallback = NO;
@@ -151,10 +140,10 @@ - (BOOL)checkEnvironment:(NSString *)environment
         return NO;
     }
     if ([environment isEqualToString:ADJEnvironmentSandbox]) {
-        [self.logger assert:@"SANDBOX: Adjust is running in Sandbox mode. Use this setting for testing. Don't forget to set the environment to `production` before publishing"];
+        [self.logger warnInProduction:@"SANDBOX: Adjust is running in Sandbox mode. Use this setting for testing. Don't forget to set the environment to `production` before publishing"];
         return YES;
     } else if ([environment isEqualToString:ADJEnvironmentProduction]) {
-        [self.logger assert:@"PRODUCTION: Adjust is running in Production mode. Use this setting only for the build that you want to publish. Set the environment to `sandbox` if you want to test your app!"];
+        [self.logger warnInProduction:@"PRODUCTION: Adjust is running in Production mode. Use this setting only for the build that you want to publish. Set the environment to `sandbox` if you want to test your app!"];
         return YES;
     }
     [self.logger error:@"Unknown environment '%@'", environment];

ios/Adjust/ADJLogger.h

@@ -27,7 +27,7 @@ typedef enum {
  *
  * @param logLevel Level of the logs to be displayed.
  */
-- (void)setLogLevel:(ADJLogLevel)logLevel;
+- (void)setLogLevel:(ADJLogLevel)logLevel isProductionEnvironment:(BOOL)isProductionEnvironment;
 
 /**
  * @brief Prevent log level changes.
@@ -53,6 +53,7 @@ typedef enum {
  * @brief Print warn logs.
  */
 - (void)warn:(nonnull NSString *)message, ...;
+- (void)warnInProduction:(nonnull NSString *)message, ...;
 
 /**
  * @brief Print error logs.