Merge pull request #405 from adjust/v4200

Version 4.20.0
adjust · Jan 15, 2020 · 1b5d409 · 1b5d409
2 parents c20f299 + 28a0322
commit 1b5d409
Show file tree

Hide file tree

Showing 20 changed files with 53 additions and 18 deletions.
diff --git a/Adjust.podspec b/Adjust.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.19.0"
+  s.version        = "4.20.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" => "[email protected]" }
-  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.19.0" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.20.0" }
   s.ios.deployment_target = '6.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'

diff --git a/Adjust/ADJConfig.h b/Adjust/ADJConfig.h
@@ -95,6 +95,8 @@
  */
 @property (nonatomic, copy, nullable) NSString *defaultTracker;
 
+@property (nonatomic, copy, nullable) NSString *externalDeviceId;
+
 /**
  * @brief Adjust app token.
  */

diff --git a/Adjust/ADJConfig.m b/Adjust/ADJConfig.m
@@ -192,6 +192,7 @@ -(id)copyWithZone:(NSZone *)zone
         copy.sendInBackground = self.sendInBackground;
         copy.delayStart = self.delayStart;
         copy.userAgent = [self.userAgent copyWithZone:zone];
+        copy.externalDeviceId = [self.externalDeviceId copyWithZone:zone];
         copy.isDeviceKnown = self.isDeviceKnown;
         copy->_secretId = [self.secretId copyWithZone:zone];
         copy->_appSecret = [self.appSecret copyWithZone:zone];

diff --git a/Adjust/ADJPackageBuilder.m b/Adjust/ADJPackageBuilder.m
@@ -183,6 +183,7 @@ - (NSMutableDictionary *)getSessionParameters:(BOOL)isInDelay {
     [ADJPackageBuilder parameters:parameters setString:self.deviceInfo.deviceType forKey:@"device_type"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
+    [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:self.deviceInfo.fbAnonymousId forKey:@"fb_anon_id"];
     [ADJPackageBuilder parameters:parameters setString:self.deviceInfo.machineModel forKey:@"hardware_name"];
     [ADJPackageBuilder parameters:parameters setString:UIDevice.currentDevice.adjIdForAdvertisers forKey:@"idfa"];
@@ -249,6 +250,7 @@ - (NSMutableDictionary *)getEventParameters:(BOOL)isInDelay forEventPackage:(ADJ
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
     [ADJPackageBuilder parameters:parameters setString:event.callbackId forKey:@"event_callback_id"];
     [ADJPackageBuilder parameters:parameters setString:event.eventToken forKey:@"event_token"];
+    [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:self.deviceInfo.fbAnonymousId forKey:@"fb_anon_id"];
     [ADJPackageBuilder parameters:parameters setString:self.deviceInfo.machineModel forKey:@"hardware_name"];
     [ADJPackageBuilder parameters:parameters setString:UIDevice.currentDevice.adjIdForAdvertisers forKey:@"idfa"];
@@ -321,6 +323,7 @@ - (NSMutableDictionary *)getInfoParameters:(NSString *)source {
     [ADJPackageBuilder parameters:parameters setDate1970:self.createdAt forKey:@"created_at"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
+    [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:UIDevice.currentDevice.adjIdForAdvertisers forKey:@"idfa"];
     [ADJPackageBuilder parameters:parameters setString:self.deviceInfo.vendorId forKey:@"idfv"];
     [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"];
@@ -352,6 +355,7 @@ - (NSMutableDictionary *)getAdRevenueParameters:(NSString *)source payload:(NSDa
     [ADJPackageBuilder parameters:parameters setDate1970:self.createdAt forKey:@"created_at"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
+    [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:UIDevice.currentDevice.adjIdForAdvertisers forKey:@"idfa"];
     [ADJPackageBuilder parameters:parameters setString:self.deviceInfo.vendorId forKey:@"idfv"];
     [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"];
@@ -399,6 +403,7 @@ - (NSMutableDictionary *)getClickParameters:(NSString *)source {
     [ADJPackageBuilder parameters:parameters setString:self.deviceInfo.deviceType forKey:@"device_type"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
+    [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:self.deviceInfo.fbAnonymousId forKey:@"fb_anon_id"];
     [ADJPackageBuilder parameters:parameters setString:self.deviceInfo.machineModel forKey:@"hardware_name"];
     [ADJPackageBuilder parameters:parameters setString:UIDevice.currentDevice.adjIdForAdvertisers forKey:@"idfa"];
@@ -465,6 +470,7 @@ - (NSMutableDictionary *)getAttributionParameters:(NSString *)initiatedBy {
     [ADJPackageBuilder parameters:parameters setString:self.deviceInfo.deviceType forKey:@"device_type"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
+    [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:UIDevice.currentDevice.adjIdForAdvertisers forKey:@"idfa"];
     [ADJPackageBuilder parameters:parameters setString:self.deviceInfo.vendorId forKey:@"idfv"];
     [ADJPackageBuilder parameters:parameters setString:initiatedBy forKey:@"initiated_by"];
@@ -503,6 +509,7 @@ - (NSMutableDictionary *)getGdprParameters {
     [ADJPackageBuilder parameters:parameters setString:self.deviceInfo.deviceType forKey:@"device_type"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
+    [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:UIDevice.currentDevice.adjIdForAdvertisers forKey:@"idfa"];
     [ADJPackageBuilder parameters:parameters setString:self.deviceInfo.vendorId forKey:@"idfv"];
     [ADJPackageBuilder parameters:parameters setBool:YES forKey:@"needs_response_details"];
@@ -549,6 +556,7 @@ - (NSMutableDictionary *)getDisableThirdPartySharingParameters {
     [ADJPackageBuilder parameters:parameters setString:self.deviceInfo.deviceType forKey:@"device_type"];
     [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
     [ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
+    [ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
     [ADJPackageBuilder parameters:parameters setString:self.deviceInfo.fbAnonymousId forKey:@"fb_anon_id"];
     [ADJPackageBuilder parameters:parameters setString:self.deviceInfo.machineModel forKey:@"hardware_name"];
     [ADJPackageBuilder parameters:parameters setString:UIDevice.currentDevice.adjIdForAdvertisers forKey:@"idfa"];

diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m
@@ -40,7 +40,7 @@
 static CTTelephonyNetworkInfo *networkInfo = nil;
 #endif
 
-static NSString * const kClientSdk                  = @"ios4.19.0";
+static NSString * const kClientSdk                  = @"ios4.20.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.19.0
+//  V4.20.0
 //  Created by Christian Wellenbrock (wellle) on 23rd July 2013.
 //  Copyright © 2012-2017 Adjust GmbH. All rights reserved.
 //

diff --git a/AdjustBridge/AdjustBridge.m b/AdjustBridge/AdjustBridge.m
@@ -184,6 +184,7 @@ - (void)loadWKWebViewBridge:(WKWebView *)wkWebView
         NSString *allowSuppressLogLevel = [data objectForKey:@"allowSuppressLogLevel"];
         NSString *sdkPrefix = [data objectForKey:@"sdkPrefix"];
         NSString *defaultTracker = [data objectForKey:@"defaultTracker"];
+        NSString *externalDeviceId = [data objectForKey:@"externalDeviceId"];
         NSString *logLevel = [data objectForKey:@"logLevel"];
         NSNumber *eventBufferingEnabled = [data objectForKey:@"eventBufferingEnabled"];
         NSNumber *sendInBackground = [data objectForKey:@"sendInBackground"];
@@ -223,6 +224,9 @@ - (void)loadWKWebViewBridge:(WKWebView *)wkWebView
         if ([self isFieldValid:defaultTracker]) {
             [adjustConfig setDefaultTracker:defaultTracker];
         }
+        if ([self isFieldValid:externalDeviceId]) {
+            [adjustConfig setExternalDeviceId:externalDeviceId];
+        }
         if ([self isFieldValid:logLevel]) {
             [adjustConfig setLogLevel:[ADJLogger logLevelFromString:[logLevel lowercaseString]]];
         }

diff --git a/AdjustBridge/AdjustBridgeRegister.m b/AdjustBridge/AdjustBridgeRegister.m
@@ -221,7 +221,7 @@ + (NSString *)adjust_js {
                 if (this.sdkPrefix) {
                     return this.sdkPrefix;
                 } else {
-                    return 'web-bridge4.19.0';
+                    return 'web-bridge4.20.0';
                 }
             },
             setTestOptions: function(testOptions) {
@@ -283,6 +283,7 @@ + (NSString *)adjust_js {
 
             this.sdkPrefix = null;
             this.defaultTracker = null;
+            this.externalDeviceId = null;
             this.logLevel = null;
             this.eventBufferingEnabled = null;
             this.sendInBackground = null;
@@ -342,6 +343,9 @@ + (NSString *)adjust_js {
         AdjustConfig.prototype.setDefaultTracker = function(defaultTracker) {
             this.defaultTracker = defaultTracker;
         };
+        AdjustConfig.prototype.setExternalDeviceId = function(externalDeviceId) {
+            this.externalDeviceId = externalDeviceId;
+        };
         AdjustConfig.prototype.setLogLevel = function(logLevel) {
             this.logLevel = logLevel;
         };

diff --git a/AdjustTests/AdjustTestApp/AdjustTestApp/ATAAdjustCommandExecutor.m b/AdjustTests/AdjustTestApp/AdjustTestApp/ATAAdjustCommandExecutor.m
@@ -279,6 +279,11 @@ - (void)config:(NSDictionary *)parameters {
         [adjustConfig setUserAgent:userAgent];
     }
 
+    if ([parameters objectForKey:@"externalDeviceId"]) {
+        NSString *externalDeviceId = [parameters objectForKey:@"externalDeviceId"][0];
+        [adjustConfig setExternalDeviceId:externalDeviceId];
+    }
+
     if ([parameters objectForKey:@"attributionCallbackSendAll"]) {
         NSLog(@"attributionCallbackSendAll detected");
         self.adjustDelegate = [[ATAAdjustDelegateAttribution alloc] initWithTestLibrary:self.testLibrary

diff --git a/AdjustTests/AdjustUnitTests/ADJPackageFields.m b/AdjustTests/AdjustUnitTests/ADJPackageFields.m
@@ -16,7 +16,7 @@ - (id) init {
 
     // default values
     self.appToken = @"qwerty123456";
-    self.clientSdk = @"ios4.19.0";
+    self.clientSdk = @"ios4.20.0";
     self.suffix = @"";
     self.environment = @"sandbox";
 

diff --git a/AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp/TestLibraryBridge.js b/AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp/TestLibraryBridge.js
@@ -199,6 +199,11 @@ AdjustCommandExecutor.prototype.config = function(params) {
         var defaultTracker = getFirstValue(params, 'defaultTracker');
         adjustConfig.setDefaultTracker(defaultTracker);
     }
+
+    if ('externalDeviceId' in params) {
+        var defaultTracker = getFirstValue(params, 'externalDeviceId');
+        adjustConfig.setExternalDeviceId(externalDeviceId);
+    }
 
     if ('appSecret' in params) {
         var appSecretArray = getValues(params, 'appSecret');

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### Version 4.20.0 (15th January 2020)
+#### Added
+- Added external device ID support.
+
+---
+
 ### Version 4.19.0 (9th December 2019)
 #### Added
 - Added `disableThirdPartySharing` method to `Adjust` interface to allow disabling of data sharing with third parties outside of Adjust ecosystem.

diff --git a/README.md b/README.md
@@ -74,13 +74,13 @@ We will describe the steps to integrate the Adjust SDK into your iOS project. We
 If you're using [CocoaPods][cocoapods], you can add the following line to your `Podfile` and continue from [this step](#sdk-integrate):
 
 ```ruby
-pod 'Adjust', '~> 4.19.0'
+pod 'Adjust', '~> 4.20.0'
 ```
 
 or:
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.19.0'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.20.0'
 ```
 
 ---

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.19.0
+4.20.0
diff --git a/doc/chinese/README.md b/doc/chinese/README.md
@@ -73,13 +73,13 @@ Read this in other languages: [English][en-readme], [中文][zh-readme], [日本
 如果您正在使用[CocoaPods][cocoapods],您可以将以下代码行添加至 `Podfile`，然后继续进行[此步骤](#sdk-integrate):
 
 ```ruby
-pod 'Adjust', '~> 4.19.0'
+pod 'Adjust', '~> 4.20.0'
 ```
 
 或:
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.19.0'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.20.0'
 ```
 
 ---

diff --git a/doc/english/migrate.md b/doc/english/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your adjust SDK for iOS to v4.19.0 from v3.4.0
+## Migrate your adjust SDK for iOS to v4.20.0 from v3.4.0
 
 ### Initial setup
 

diff --git a/doc/english/web_views.md b/doc/english/web_views.md
@@ -64,7 +64,7 @@ We will describe the steps to integrate the Adjust SDK into your iOS project. We
 If you're using [CocoaPods][cocoapods], you can add the following line to your `Podfile` and continue from [this step](#sdk-integrate):
 
 ```ruby
-pod 'Adjust/WebBridge', '~> 4.19.0'
+pod 'Adjust/WebBridge', '~> 4.20.0'
 ```
 
 ---

diff --git a/doc/japanese/README.md b/doc/japanese/README.md
@@ -25,13 +25,13 @@ adjust SDKをiOSプロジェクトに連携する手順を説明します。
 [こちらの手順](#sdk-integrate)に進んでください。
 
 ```ruby
-pod 'Adjust', '~> 4.19.0'
+pod 'Adjust', '~> 4.20.0'
 ```
 
 または
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.19.0'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.20.0'
 ```
 
 ---

diff --git a/doc/korean/README.md b/doc/korean/README.md
@@ -73,13 +73,13 @@ iOS 개발용 Xcode를 사용한다는 가정하에 iOS 프로젝트에 Adjust S
 [CocoaPods][cocoapods]를 사용하는 경우, 다음 내용을 `Podfile`에 추가한 후 [해당 단계](#sdk-integrate)를 완료하세요.
 
 ```ruby
-pod 'Adjust', '~> 4.19.0'
+pod 'Adjust', '~> 4.20.0'
 ```
 
 또는:
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.19.0'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.20.0'
 ```
 
 ---

diff --git a/doc/migrate.md b/doc/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your Adjust SDK for iOS to v4.19.0 from v3.4.0
+## Migrate your Adjust SDK for iOS to v4.20.0 from v3.4.0
 
 ### Initial setup
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,6 +95,8 @@ @@
      */
     @property (nonatomic, copy, nullable) NSString *defaultTracker;
+    @property (nonatomic, copy, nullable) NSString *externalDeviceId;
     /**
      * @brief Adjust app token.
      */
@@ Expand Down @@