Merge pull request #29 from adjust/v4122

Version 4.12.2

Author: uerceg

CHANGELOG.md

@@ -1,3 +1,16 @@
+### Version 4.12.2 (8th March 2018)
+#### Native changes
+- https://github.com/adjust/ios_sdk/blob/master/CHANGELOG.md#version-4122-13th-february-2018
+- https://github.com/adjust/ios_sdk/blob/master/CHANGELOG.md#version-4123-23rd-february-2018
+- https://github.com/adjust/android_sdk/blob/master/CHANGELOG.md#version-4122-28th-february-2018
+- https://github.com/adjust/android_sdk/blob/master/CHANGELOG.md#version-4123-7th-march-2018
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.12.3]
+- [[email protected]][android_sdk_v4.12.3]
+
+---
+
 ### Version 4.12.1 (1st February 2018)
 #### Native changes
 - https://github.com/adjust/android_sdk/blob/master/CHANGELOG.md#version-4121-31st-january-2018
@@ -179,6 +192,7 @@
 [ios_sdk_v4.11.4]: https://github.com/adjust/ios_sdk/tree/v4.11.4
 [ios_sdk_v4.11.5]: https://github.com/adjust/ios_sdk/tree/v4.11.5
 [ios_sdk_v4.12.1]: https://github.com/adjust/ios_sdk/tree/v4.12.1
+[ios_sdk_v4.12.3]: https://github.com/adjust/ios_sdk/tree/v4.12.3
 
 [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
@@ -187,3 +201,5 @@
 [android_sdk_v4.11.4]: https://github.com/adjust/android_sdk/tree/v4.11.4
 [android_sdk_v4.12.0]: https://github.com/adjust/android_sdk/tree/v4.12.0
 [android_sdk_v4.12.1]: https://github.com/adjust/android_sdk/tree/v4.12.1
+[android_sdk_v4.12.2]: https://github.com/adjust/android_sdk/tree/v4.12.2
+[android_sdk_v4.12.3]: https://github.com/adjust/android_sdk/tree/v4.12.3

VERSION

@@ -1 +1 @@
-4.12.1
+4.12.2

android/libs/adjust-android.jar

@@ -148,7 +148,7 @@ var AdjustConfig = function(appToken, environment) {
     this.appToken = appToken;
     this.environment = environment;
 
-    this.sdkPrefix = "react_native4.12.1";
+    this.sdkPrefix = "react_native4.12.2";
     this.logLevel = null;
 
     this.eventBufferingEnabled = null;

ext/Android/sdk

@@ -41,6 +41,7 @@
 @property (nonatomic, copy) NSData *deviceTokenData;
 @property (nonatomic, copy) NSNumber *enabled;
 @property (nonatomic, assign) BOOL offline;
+@property (nonatomic, copy) NSString *basePath;
 
 - (id)init;
 
@@ -89,8 +90,10 @@
 - (void)removeSessionPartnerParameter:(NSString *)key;
 - (void)resetSessionCallbackParameters;
 - (void)resetSessionPartnerParameters;
+- (NSString *)getBasePath;
 
-- (void)teardown:(BOOL)deleteState;
+- (void)teardown;
++ (void)deleteState;
 @end
 
 @interface ADJActivityHandler : NSObject <ADJActivityHandler>

ext/iOS/sdk

@@ -101,6 +101,7 @@ @interface ADJActivityHandler()
 // copy for objects shared with the user
 @property (nonatomic, copy) ADJConfig *adjustConfig;
 @property (nonatomic, copy) NSData* deviceTokenData;
+@property (nonatomic, copy) NSString* basePath;
 
 @end
 
@@ -188,14 +189,19 @@ - (id)initWithConfig:(ADJConfig *)adjustConfig
     // does not have the session response by default
     self.internalState.sessionResponseProcessed = NO;
 
+    if (savedPreLaunch.basePath != nil) {
+        self.basePath = savedPreLaunch.basePath;
+    }
+
     self.internalQueue = dispatch_queue_create(kInternalQueueName, DISPATCH_QUEUE_SERIAL);
     [ADJUtil launchInQueue:self.internalQueue
                 selfInject:self
                      block:^(ADJActivityHandler * selfI) {
                          [selfI initI:selfI
-        preLaunchActionsArray:savedPreLaunch.preLaunchActionsArray];
+                preLaunchActionsArray:savedPreLaunch.preLaunchActionsArray];
                      }];
 
+
     // self.deviceTokenData = savedPreLaunch.deviceTokenData;
     if (self.activityState != nil) {
         [self setDeviceToken:[ADJUserDefaults getPushToken]];
@@ -522,7 +528,11 @@ - (void)resetSessionPartnerParameters {
                      }];
 }
 
-- (void)teardown:(BOOL)deleteState
+- (NSString *)getBasePath {
+    return _basePath;
+}
+
+- (void)teardown
 {
     [ADJAdjustFactory.logger verbose:@"ADJActivityHandler teardown"];
     [self removeNotificationObserver];
@@ -539,18 +549,14 @@ - (void)teardown:(BOOL)deleteState
         [self.attributionHandler teardown];
     }
     if (self.packageHandler != nil) {
-        [self.packageHandler teardown:deleteState];
+        [self.packageHandler teardown];
     }
     if (self.sdkClickHandler != nil) {
         [self.sdkClickHandler teardown];
     }
-    [self teardownActivityStateS:deleteState];
-    [self teardownAttributionS:deleteState];
-    [self teardownAllSessionParametersS:deleteState];
-
-    if (deleteState) {
-        [ADJUserDefaults clearAdjustStuff];
-    }
+    [self teardownActivityStateS];
+    [self teardownAttributionS];
+    [self teardownAllSessionParametersS];
 
     [ADJUtil teardown];
 
@@ -568,6 +574,32 @@ - (void)teardown:(BOOL)deleteState
     self.logger = nil;
 }
 
++ (void)deleteState
+{
+    [ADJActivityHandler deleteActivityState];
+    [ADJActivityHandler deleteAttribution];
+    [ADJActivityHandler deleteSessionCallbackParameter];
+    [ADJActivityHandler deleteSessionPartnerParameter];
+
+    [ADJUserDefaults clearAdjustStuff];
+}
+
++ (void)deleteActivityState {
+    [ADJUtil deleteFileWithName:kActivityStateFilename];
+}
+
++ (void)deleteAttribution {
+    [ADJUtil deleteFileWithName:kAttributionFilename];
+}
+
++ (void)deleteSessionCallbackParameter {
+    [ADJUtil deleteFileWithName:kSessionCallbackParametersFilename];
+}
+
++ (void)deleteSessionPartnerParameter {
+    [ADJUtil deleteFileWithName:kSessionPartnerParametersFilename];
+}
+
 #pragma mark - internal
 - (void)initI:(ADJActivityHandler *)selfI
 preLaunchActionsArray:(NSArray*)preLaunchActionsArray
@@ -666,7 +698,17 @@ - (void)initI:(ADJActivityHandler *)selfI
 
     [selfI preLaunchActionsI:selfI preLaunchActionsArray:preLaunchActionsArray];
 
-    [selfI startI:selfI];
+    [ADJUtil launchInMainThreadWithInactive:^(BOOL isInactive) {
+        [ADJUtil launchInQueue:self.internalQueue selfInject:self block:^(ADJActivityHandler * selfI) {
+            if (!isInactive) {
+                [selfI.logger debug:@"Start sdk, since the app is already in the foreground"];
+                selfI.internalState.background = NO;
+                [selfI startI:selfI];
+            } else {
+                [selfI.logger debug:@"Wait for the app to go to the foreground to start the sdk"];
+            }
+        }];
+    }];
 }
 
 - (void)startI:(ADJActivityHandler *)selfI {
@@ -1221,6 +1263,9 @@ - (void)setDeviceTokenI:(ADJActivityHandler *)selfI
     if (![selfI isEnabledI:selfI]) {
         return;
     }
+    if (!selfI.activityState) {
+        return;
+    }
 
     NSString *deviceTokenString = [ADJUtil convertDeviceToken:deviceToken];
 
@@ -1309,15 +1354,12 @@ - (void)writeActivityStateI:(ADJActivityHandler *)selfI
     }
 }
 
-- (void)teardownActivityStateS:(BOOL)deleteState
+- (void)teardownActivityStateS
 {
     @synchronized ([ADJActivityState class]) {
         if (self.activityState == nil) {
             return;
         }
-        if (deleteState) {
-            [ADJUtil deleteFileWithName:kActivityStateFilename];
-        }
         self.activityState = nil;
     }
 }
@@ -1331,15 +1373,12 @@ - (void)writeAttributionI:(ADJActivityHandler *)selfI {
     }
 }
 
-- (void)teardownAttributionS:(BOOL)deleteState
+- (void)teardownAttributionS
 {
     @synchronized ([ADJAttribution class]) {
         if (self.attribution == nil) {
             return;
         }
-        if (deleteState) {
-            [ADJUtil deleteFileWithName:kAttributionFilename];
-        }
         self.attribution = nil;
     }
 }
@@ -1379,15 +1418,11 @@ - (void)writeSessionPartnerParametersI:(ADJActivityHandler *)selfI {
     }
 }
 
-- (void)teardownAllSessionParametersS:(BOOL)deleteState {
+- (void)teardownAllSessionParametersS {
     @synchronized ([ADJSessionParameters class]) {
         if (self.sessionParameters == nil) {
             return;
         }
-        if (deleteState) {
-            [ADJUtil deleteFileWithName:kSessionCallbackParametersFilename];
-            [ADJUtil deleteFileWithName:kSessionPartnerParametersFilename];
-        }
         [self.sessionParameters.callbackParameters removeAllObjects];
         [self.sessionParameters.partnerParameters removeAllObjects];
         self.sessionParameters = nil;

index.js

@@ -2,9 +2,10 @@
 //  UIDevice+ADJAdditions.h
 //  Adjust
 //
-//  Created by Christian Wellenbrock on 23.07.12.
-//  Copyright (c) 2012-2014 adjust GmbH. All rights reserved.
+//  Created by Christian Wellenbrock (@wellle) on 23rd July 2012.
+//  Copyright © 2012-2018 Adjust GmbH. All rights reserved.
 //
+
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import "ADJActivityHandler.h"

ios/Adjust/ADJActivityHandler.h

@@ -2,8 +2,8 @@
 //  UIDevice+ADJAdditions.m
 //  Adjust
 //
-//  Created by Christian Wellenbrock on 23.07.12.
-//  Copyright (c) 2012-2014 adjust GmbH. All rights reserved.
+//  Created by Christian Wellenbrock (@wellle) on 23rd July 2012.
+//  Copyright © 2012-2018 Adjust GmbH. All rights reserved.
 //
 
 #import "UIDevice+ADJAdditions.h"
@@ -27,17 +27,14 @@ - (BOOL)adjTrackingEnabled {
 #if ADJUST_NO_IDFA
     return NO;
 #else
-
     // return [[ASIdentifierManager sharedManager] isAdvertisingTrackingEnabled];
     NSString *className = [NSString adjJoin:@"A", @"S", @"identifier", @"manager", nil];
     Class class = NSClassFromString(className);
     if (class == nil) {
         return NO;
     }
-
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-
     NSString *keyManager = [NSString adjJoin:@"shared", @"manager", nil];
     SEL selManager = NSSelectorFromString(keyManager);
     if (![class respondsToSelector:selManager]) {
@@ -52,7 +49,6 @@ - (BOOL)adjTrackingEnabled {
     }
     BOOL enabled = (BOOL)[manager performSelector:selEnabled];
     return enabled;
-
 #pragma clang diagnostic pop
 #endif
 }
@@ -61,14 +57,12 @@ - (NSString *)adjIdForAdvertisers {
 #if ADJUST_NO_IDFA
     return @"";
 #else
-
     // return [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString];
     NSString *className = [NSString adjJoin:@"A", @"S", @"identifier", @"manager", nil];
     Class class = NSClassFromString(className);
     if (class == nil) {
         return @"";
     }
-
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
 
@@ -109,9 +103,7 @@ - (NSString *)adjFbAttributionId {
             result = @"";
         }
     };
-    [NSThread isMainThread] ?
-    resultRetrievalBlock() :
-    dispatch_sync(dispatch_get_main_queue(), resultRetrievalBlock);
+    [NSThread isMainThread] ? resultRetrievalBlock() : dispatch_sync(dispatch_get_main_queue(), resultRetrievalBlock);
     return result;
 #endif
 }
@@ -148,10 +140,8 @@ - (NSString *)adjVendorId {
 }
 
 - (void)adjSetIad:(ADJActivityHandler *)activityHandler
-       triesV3Left:(int)triesV3Left
-{
+      triesV3Left:(int)triesV3Left {
     id<ADJLogger> logger = [ADJAdjustFactory logger];
-    [logger debug:@"iAd with %d tries to read v3", triesV3Left];
 
 #if ADJUST_NO_IAD || TARGET_OS_TV
     [logger debug:@"ADJUST_NO_IAD or TARGET_OS_TV set"];
@@ -162,29 +152,34 @@ - (void)adjSetIad:(ADJActivityHandler *)activityHandler
     // [[ADClient sharedClient] ...]
     Class ADClientClass = NSClassFromString(@"ADClient");
     if (ADClientClass == nil) {
+        [logger warn:@"iAd framework not found in user's app (ADClientClass not found)"];
         return;
     }
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
     SEL sharedClientSelector = NSSelectorFromString(@"sharedClient");
     if (![ADClientClass respondsToSelector:sharedClientSelector]) {
+        [logger warn:@"iAd framework not found in user's app (sharedClient method not found)"];
         return;
     }
     id ADClientSharedClientInstance = [ADClientClass performSelector:sharedClientSelector];
-
     if (ADClientSharedClientInstance == nil) {
+        [logger warn:@"iAd framework not found in user's app (ADClientSharedClientInstance is nil)"];
         return;
     }
 
+    [logger debug:@"iAd framework successfully found in user's app"];
+    [logger debug:@"iAd with %d tries to read v3", triesV3Left];
+
     // if no tries for iad v3 left, stop trying
     if (triesV3Left == 0) {
         [logger warn:@"Reached limit number of retry for iAd v3"];
         return;
     }
 
     BOOL isIadV3Avaliable = [self adjSetIadWithDetails:activityHandler
-                     ADClientSharedClientInstance:ADClientSharedClientInstance
-                                      retriesLeft:(triesV3Left - 1)];
+                          ADClientSharedClientInstance:ADClientSharedClientInstance
+                                           retriesLeft:(triesV3Left - 1)];
 
     // if iad v3 not available
     if (!isIadV3Avaliable) {
@@ -197,10 +192,8 @@ - (void)adjSetIad:(ADJActivityHandler *)activityHandler
 
 - (BOOL)adjSetIadWithDetails:(ADJActivityHandler *)activityHandler
 ADClientSharedClientInstance:(id)ADClientSharedClientInstance
-                 retriesLeft:(int)retriesLeft
-{
+                 retriesLeft:(int)retriesLeft {
     SEL iadDetailsSelector = NSSelectorFromString(@"requestAttributionDetailsWithBlock:");
-
     if (![ADClientSharedClientInstance respondsToSelector:iadDetailsSelector]) {
         return NO;
     }