adjust · uerceg · Jun 8, 2018 · May 21, 2018 · May 30, 2018 · May 30, 2018
diff --git a/Adjust.podspec b/Adjust.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.13.0"
+  s.version        = "4.14.0"
   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.13.0" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.14.0" }
   s.ios.deployment_target = '6.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'

diff --git a/Adjust.xcodeproj/project.pbxproj b/Adjust.xcodeproj/project.pbxproj
@@ -1476,7 +1476,7 @@
 		9679920518BBAE2800394606 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = "adjust GmbH";
 				TargetAttributes = {
 					9615158E1CD2CB2C0022D336 = {
@@ -1993,12 +1993,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -2044,12 +2046,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

diff --git a/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdk.xcscheme b/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdk.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -37,7 +36,6 @@
       buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkTv.xcscheme b/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkTv.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -37,7 +36,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Adjust/ADJActivityHandler.h b/Adjust/ADJActivityHandler.h
@@ -70,7 +70,7 @@
 - (BOOL)isEnabled;
 - (BOOL)isGdprForgotten;
 
-- (void)appWillOpenUrl:(NSURL*)url;
+- (void)appWillOpenUrl:(NSURL*)url withClickTime:(NSDate *)clickTime;
 - (void)setDeviceToken:(NSData *)deviceToken;
 - (void)setGdprForgetMe;
 - (void)setTrackingStateOptedOut;

diff --git a/Adjust/ADJActivityHandler.m b/Adjust/ADJActivityHandler.m
@@ -346,11 +346,11 @@ - (NSString *)adid {
     return self.activityState.adid;
 }
 
-- (void)appWillOpenUrl:(NSURL*)url {
+- (void)appWillOpenUrl:(NSURL *)url withClickTime:(NSDate *)clickTime {
     [ADJUtil launchInQueue:self.internalQueue
                 selfInject:self
                      block:^(ADJActivityHandler * selfI) {
-                         [selfI appWillOpenUrlI:selfI url:url];
+                         [selfI appWillOpenUrlI:selfI url:url clickTime:clickTime];
                      }];
 }
 
@@ -758,6 +758,8 @@ - (void)startI:(ADJActivityHandler *)selfI {
     [selfI processSessionI:selfI];
 
     [selfI checkAttributionStateI:selfI];
+
+    [selfI processCachedDeeplinkI:selfI];
 }
 
 - (void)processSessionI:(ADJActivityHandler *)selfI {
@@ -865,6 +867,22 @@ - (void)checkAttributionStateI:(ADJActivityHandler *)selfI {
     [selfI.attributionHandler getAttribution];
 }
 
+- (void)processCachedDeeplinkI:(ADJActivityHandler *)selfI {
+    if (![selfI checkActivityStateI:selfI]) return;
+
+    NSURL *cachedDeeplinkUrl = [ADJUserDefaults getDeeplinkUrl];
+    if (cachedDeeplinkUrl == nil) {
+        return;
+    }
+    NSDate *cachedDeeplinkClickTime = [ADJUserDefaults getDeeplinkClickTime];
+    if (cachedDeeplinkClickTime == nil) {
+        return;
+    }
+
+    [selfI appWillOpenUrlI:selfI url:cachedDeeplinkUrl clickTime:cachedDeeplinkClickTime];
+    [ADJUserDefaults removeDeeplink];
+}
+
 - (void)endI:(ADJActivityHandler *)selfI {
     // pause sending if it's not allowed to send
     if (![selfI toSendI:selfI]) {
@@ -1214,7 +1232,8 @@ - (void)checkStatusI:(ADJActivityHandler *)selfI
 }
 
 - (void)appWillOpenUrlI:(ADJActivityHandler *)selfI
-                    url:(NSURL *)url {
+                    url:(NSURL *)url
+              clickTime:(NSDate *)clickTime {
     if ([ADJUtil isNull:url]) {
         return;
     }
@@ -1251,7 +1270,7 @@ - (void)appWillOpenUrlI:(ADJActivityHandler *)selfI
                                        createdAt:now];
     clickBuilder.deeplinkParameters = adjustDeepLinks;
     clickBuilder.attribution = deeplinkAttribution;
-    clickBuilder.clickTime = [NSDate date];
+    clickBuilder.clickTime = clickTime;
     clickBuilder.deeplink = [url absoluteString];
 
     ADJActivityPackage *clickPackage = [clickBuilder buildClickPackage:@"deeplink"];

diff --git a/Adjust/ADJUserDefaults.h b/Adjust/ADJUserDefaults.h
@@ -14,8 +14,6 @@
 
 + (NSData *)getPushToken;
 
-+ (void)clearAdjustStuff;
-
 + (void)removePushToken;
 
 + (void)setInstallTracked;
@@ -28,4 +26,15 @@
 
 + (void)removeGdprForgetMe;
 
++ (void)saveDeeplinkUrl:(NSURL *)deeplink
+           andClickTime:(NSDate *)clickTime;
+
++ (NSURL *)getDeeplinkUrl;
+
++ (NSDate *)getDeeplinkClickTime;
+
++ (void)removeDeeplink;
+
++ (void)clearAdjustStuff;
+
 @end
diff --git a/Adjust/ADJUserDefaults.m b/Adjust/ADJUserDefaults.m
@@ -11,6 +11,8 @@
 static NSString * const PREFS_KEY_PUSH_TOKEN = @"adj_push_token";
 static NSString * const PREFS_KEY_GDPR_FORGET_ME = @"adj_gdpr_forget_me";
 static NSString * const PREFS_KEY_INSTALL_TRACKED = @"adj_install_tracked";
+static NSString * const PREFS_KEY_DEEPLINK_URL = @"adj_deeplink_url";
+static NSString * const PREFS_KEY_DEEPLINK_CLICK_TIME = @"adj_deeplink_click_time";
 
 @implementation ADJUserDefaults
 
@@ -53,10 +55,32 @@ + (void)removeGdprForgetMe {
     [[NSUserDefaults standardUserDefaults] synchronize];
 }
 
++ (void)saveDeeplinkUrl:(NSURL *)deeplink andClickTime:(NSDate *)clickTime {
+    [[NSUserDefaults standardUserDefaults] setURL:deeplink forKey:PREFS_KEY_DEEPLINK_URL];
+    [[NSUserDefaults standardUserDefaults] setObject:clickTime forKey:PREFS_KEY_DEEPLINK_CLICK_TIME];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
++ (NSURL *)getDeeplinkUrl {
+    return [[NSUserDefaults standardUserDefaults] URLForKey:PREFS_KEY_DEEPLINK_URL];
+}
+
++ (NSDate *)getDeeplinkClickTime {
+    return [[NSUserDefaults standardUserDefaults] objectForKey:PREFS_KEY_DEEPLINK_CLICK_TIME];
+}
+
++ (void)removeDeeplink {
+    [[NSUserDefaults standardUserDefaults] removeObjectForKey:PREFS_KEY_DEEPLINK_URL];
+    [[NSUserDefaults standardUserDefaults] removeObjectForKey:PREFS_KEY_DEEPLINK_CLICK_TIME];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
 + (void)clearAdjustStuff {
     [[NSUserDefaults standardUserDefaults] removeObjectForKey:PREFS_KEY_PUSH_TOKEN];
     [[NSUserDefaults standardUserDefaults] removeObjectForKey:PREFS_KEY_INSTALL_TRACKED];
     [[NSUserDefaults standardUserDefaults] removeObjectForKey:PREFS_KEY_GDPR_FORGET_ME];
+    [[NSUserDefaults standardUserDefaults] removeObjectForKey:PREFS_KEY_DEEPLINK_URL];
+    [[NSUserDefaults standardUserDefaults] removeObjectForKey:PREFS_KEY_DEEPLINK_CLICK_TIME];
     [[NSUserDefaults standardUserDefaults] synchronize];
 }
 

diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m
@@ -41,7 +41,7 @@
 
 static NSString *userAgent = nil;
 
-static NSString * const kClientSdk                  = @"ios4.13.0";
+static NSString * const kClientSdk                  = @"ios4.14.0";
 static NSString * const kDeeplinkParam              = @"deep_link=";
 static NSString * const kSchemeDelimiter            = @"://";
 static NSString * const kDefaultScheme              = @"AdjustUniversalScheme";

diff --git a/Adjust/Adjust.h b/Adjust/Adjust.h
@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust
 //
-//  V4.13.0
+//  V4.14.0
 //  Created by Christian Wellenbrock (wellle) on 23rd July 2013.
 //  Copyright © 2012-2017 Adjust GmbH. All rights reserved.
 //
@@ -23,6 +23,7 @@
 @property (nonatomic, copy, nullable) NSNumber *subsessionIntervalInMilliseconds;
 @property (nonatomic, assign) BOOL teardown;
 @property (nonatomic, assign) BOOL deleteState;
+@property (nonatomic, assign) BOOL noBackoffWait;
 
 @end
 

diff --git a/Adjust/Adjust.m b/Adjust/Adjust.m
@@ -223,11 +223,13 @@ - (BOOL)isEnabled {
 }
 
 - (void)appWillOpenUrl:(NSURL *)url {
+    NSDate *clickTime = [NSDate date];
     if (![self checkActivityHandler]) {
+        [ADJUserDefaults saveDeeplinkUrl:url andClickTime:clickTime];
         return;
     }
 
-    [self.activityHandler appWillOpenUrl:url];
+    [self.activityHandler appWillOpenUrl:url withClickTime:clickTime];
 }
 
 - (void)setDeviceToken:(NSData *)deviceToken {
@@ -421,6 +423,10 @@ - (void)setTestOptions:(AdjustTestOptions *)testOptions {
         NSTimeInterval subsessionIntervalInSeconds = [testOptions.subsessionIntervalInMilliseconds intValue] / 1000.0;
         [ADJAdjustFactory setSubsessionInterval:subsessionIntervalInSeconds];
     }
+    if (testOptions.noBackoffWait) {
+        [ADJAdjustFactory setSdkClickHandlerBackoffStrategy:[ADJBackoffStrategy backoffStrategyWithType:ADJNoWait]];
+        [ADJAdjustFactory setPackageHandlerBackoffStrategy:[ADJBackoffStrategy backoffStrategyWithType:ADJNoWait]];
+    }
 }
 
 #pragma mark - Private & helper methods

diff --git a/AdjustTests/AdjustTestApp/AdjustTestApp.xcodeproj/project.pbxproj b/AdjustTests/AdjustTestApp/AdjustTestApp.xcodeproj/project.pbxproj
@@ -366,7 +366,7 @@
 		6F08421F2007769F00568A31 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = adjust;
 				TargetAttributes = {
 					6F0842262007769F00568A31 = {
@@ -500,13 +500,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -555,13 +557,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

diff --git a/AdjustTests/AdjustTestApp/AdjustTestApp/ATAAdjustCommandExecutor.m b/AdjustTests/AdjustTestApp/AdjustTestApp/ATAAdjustCommandExecutor.m
@@ -116,6 +116,13 @@ - (void)testOptions:(NSDictionary *)parameters {
         NSString *subsessionIntervalMilliS = [parameters objectForKey:@"subsessionInterval"][0];
         testOptions.subsessionIntervalInMilliseconds = [ATAAdjustCommandExecutor convertMilliStringToNumber:subsessionIntervalMilliS];
     }
+    if ([parameters objectForKey:@"noBackoffWait"]) {
+        NSString *noBackoffWaitStr = [parameters objectForKey:@"noBackoffWait"][0];
+        testOptions.noBackoffWait = NO;
+        if ([noBackoffWaitStr isEqualToString:@"true"]) {
+            testOptions.noBackoffWait = YES;
+        }
+    }
     if ([parameters objectForKey:@"teardown"]) {
         NSArray *teardownOptions = [parameters objectForKey:@"teardown"];
         for (int i = 0; i < teardownOptions.count; i = i + 1) {

diff --git a/AdjustTests/AdjustTestApp/AdjustTestApp/ViewController.m b/AdjustTests/AdjustTestApp/AdjustTestApp/ViewController.m
@@ -36,7 +36,7 @@ - (void)viewDidLoad {
 }
 
 - (void)startTestSession {
-    [self.testLibrary startTestSession:@"ios4.13.0"];
+    [self.testLibrary startTestSession:@"ios4.14.0"];
 }
 
 - (void)didReceiveMemoryWarning {

diff --git a/AdjustTests/AdjustTestLibrary/AdjustTestLibrary.xcodeproj/project.pbxproj b/AdjustTests/AdjustTestLibrary/AdjustTestLibrary.xcodeproj/project.pbxproj
@@ -168,7 +168,7 @@
 		6F0842042007766700568A31 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = adjust;
 				TargetAttributes = {
 					20E71745203B162B0073AC91 = {
@@ -291,13 +291,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -346,13 +348,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;