Merge pull request #170 from adjust/v4210

Version 4.21.0

Author: uerceg

Assets/Adjust/Android/AdjustAndroid.cs

@@ -8,7 +8,7 @@ namespace com.adjust.sdk
 #if UNITY_ANDROID
     public class AdjustAndroid
     {
-        private const string sdkPrefix = "unity4.20.1";
+        private const string sdkPrefix = "unity4.21.0";
         private static bool launchDeferredDeeplink = true;
         private static AndroidJavaClass ajcAdjust = new AndroidJavaClass("com.adjust.sdk.Adjust");
         private static AndroidJavaObject ajoCurrentActivity = new AndroidJavaClass("com.unity3d.player.UnityPlayer").GetStatic<AndroidJavaObject>("currentActivity");

Assets/Adjust/Android/Test/Java-WebSocket-1.3.9.jar

@@ -308,6 +308,20 @@ private void Config()
                 adjustConfig.sendInBackground = sendInBackground;
             }
 
+            if (_command.ContainsParameter("allowiAdInfoReading"))
+            {
+                var allowiAdInfoReadingS = _command.GetFirstParameterValue("allowiAdInfoReading");
+                var allowiAdInfoReading = allowiAdInfoReadingS.ToLower() == "true";
+                adjustConfig.allowiAdInfoReading = allowiAdInfoReading;
+            }
+
+            if (_command.ContainsParameter("allowIdfaReading"))
+            {
+                var allowIdfaReadingS = _command.GetFirstParameterValue("allowIdfaReading");
+                var allowIdfaReading = allowIdfaReadingS.ToLower() == "true";
+                adjustConfig.allowIdfaReading = allowIdfaReading;
+            }
+
             if (_command.ContainsParameter("userAgent"))
             {
                 var userAgent = _command.GetFirstParameterValue("userAgent");

Assets/Adjust/Android/Test/Java-WebSocket-1.4.0.jar

@@ -16,11 +16,11 @@ public class TestApp : MonoBehaviour
 #elif UNITY_ANDROID
         private const string PORT = ":8443";
         private const string PROTOCOL = "https://";
-        private const string IP = "192.168.10.137";
+        private const string IP = "192.168.2.101";
 #elif UNITY_IOS
         private const string PORT = ":8080";
         private const string PROTOCOL = "http://";
-        private const string IP = "192.168.10.137";
+        private const string IP = "192.168.2.101";
         private TestLibraryiOS _testLibraryiOS;
 #endif
         private const string BASE_URL = PROTOCOL + IP + PORT;

Assets/Adjust/Android/Test/adjust-test.jar

@@ -34,6 +34,9 @@ public class AdjustConfig
         // Android specific members
         internal bool? readImei;
         internal string processName;
+        // iOS specific members
+        internal bool? allowiAdInfoReading;
+        internal bool? allowIdfaReading;
         // Windows specific members
         internal Action<String> logDelegate;
 
@@ -174,6 +177,17 @@ public void setAppSecret(long secretId, long info1, long info2, long info3, long
             this.info4 = info4;
         }
 
+        // iOS specific methods.
+        public void setAllowiAdInfoReading(bool allowiAdInfoReading)
+        {
+            this.allowiAdInfoReading = allowiAdInfoReading;
+        }
+
+        public void setAllowIdfaReading(bool allowIdfaReading)
+        {
+            this.allowIdfaReading = allowIdfaReading;
+        }
+
         // Android specific methods.
         public void setProcessName(string processName)
         {

Assets/Adjust/Android/Test/gson-2.8.1.jar

@@ -17,7 +17,7 @@ namespace com.adjust.sdk
 {
     public class AdjustWindows
     {
-        private const string sdkPrefix = "unity4.20.1";
+        private const string sdkPrefix = "unity4.21.0";
         private static bool appLaunched = false;
 
         public static void Start(AdjustConfig adjustConfig)

Assets/Adjust/Android/Test/gson-2.8.6.jar

@@ -143,6 +143,16 @@
  */
 @property (nonatomic, assign) BOOL sendInBackground;
 
+/**
+ * @brief Enables/disables reading of iAd framework data needed for ASA tracking.
+ */
+@property (nonatomic, assign) BOOL allowiAdInfoReading;
+
+/**
+ * @brief Enables/disables reading of IDFA parameter.
+ */
+@property (nonatomic, assign) BOOL allowIdfaReading;
+
 /**
  * @brief Enables delayed start of the SDK.
  */

Assets/Adjust/Android/Test/slf4j-api-1.7.30.jar

@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust
 //
-//  V4.20.0
+//  V4.21.0
 //  Created by Christian Wellenbrock (wellle) on 23rd July 2013.
 //  Copyright © 2012-2017 Adjust GmbH. All rights reserved.
 //
@@ -25,6 +25,8 @@
 @property (nonatomic, assign) BOOL deleteState;
 @property (nonatomic, assign) BOOL noBackoffWait;
 @property (nonatomic, assign) BOOL iAdFrameworkEnabled;
+@property (nonatomic, assign) BOOL enableSigning;
+@property (nonatomic, assign) BOOL disableSigning;
 
 @end
 

Assets/Adjust/Android/adjust-android.jar

@@ -90,6 +90,8 @@ void _AdjustLaunchApp(const char* appToken,
                           int isDeviceKnown,
                           int eventBuffering,
                           int sendInBackground,
+                          int allowiAdInfoReading,
+                          int allowIdfaReading,
                           int64_t secretId,
                           int64_t info1,
                           int64_t info2,
@@ -158,6 +160,16 @@ void _AdjustLaunchApp(const char* appToken,
             [adjustConfig setSendInBackground:(BOOL)sendInBackground];
         }
 
+        // Allow iAd info reading.
+        if (allowiAdInfoReading != -1) {
+            [adjustConfig setAllowiAdInfoReading:(BOOL)allowiAdInfoReading];
+        }
+
+        // Allow IDFA reading.
+        if (allowIdfaReading != -1) {
+            [adjustConfig setAllowIdfaReading:(BOOL)allowIdfaReading];
+        }
+
         // Device known.
         if (isDeviceKnown != -1) {
             [adjustConfig setIsDeviceKnown:(BOOL)isDeviceKnown];

Assets/Adjust/Test/CommandExecutor.cs

@@ -8,7 +8,7 @@ namespace com.adjust.sdk
 #if UNITY_IOS
     public class AdjustiOS
     {
-        private const string sdkPrefix = "unity4.20.1";
+        private const string sdkPrefix = "unity4.21.0";
 
         [DllImport("__Internal")]
         private static extern void _AdjustLaunchApp(
@@ -24,6 +24,8 @@ private static extern void _AdjustLaunchApp(
             int isDeviceKnown,
             int eventBuffering,
             int sendInBackground,
+            int allowiAdInfoReading,
+            int allowIdfaReading,
             long secretId,
             long info1,
             long info2,
@@ -148,6 +150,8 @@ public static void Start(AdjustConfig adjustConfig)
             int isDeviceKnown = AdjustUtils.ConvertBool(adjustConfig.isDeviceKnown);
             int sendInBackground = AdjustUtils.ConvertBool(adjustConfig.sendInBackground);
             int eventBufferingEnabled = AdjustUtils.ConvertBool(adjustConfig.eventBufferingEnabled);
+            int allowiAdInfoReading = AdjustUtils.ConvertBool(adjustConfig.allowiAdInfoReading);
+            int allowIdfaReading = AdjustUtils.ConvertBool(adjustConfig.allowIdfaReading);
             int allowSuppressLogLevel = AdjustUtils.ConvertBool(adjustConfig.allowSuppressLogLevel);
             int launchDeferredDeeplink = AdjustUtils.ConvertBool(adjustConfig.launchDeferredDeeplink);
             int isAttributionCallbackImplemented = AdjustUtils.ConvertBool(adjustConfig.getAttributionChangedDelegate() != null);
@@ -170,6 +174,8 @@ public static void Start(AdjustConfig adjustConfig)
                 isDeviceKnown,
                 eventBufferingEnabled,
                 sendInBackground,
+                allowiAdInfoReading,
+                allowIdfaReading,
                 secretId,
                 info1,
                 info2,

Assets/Adjust/Test/TestApp.cs

@@ -1,3 +1,19 @@
+### Version 4.21.0 (31st March 2020)
+#### Added
+- Added support for signature library as a plugin.
+- Added more aggressive sending retry logic for install session package.
+- Added additional parameters to `ad_revenue` package payload.
+
+#### Changed
+- Built this SDK version with `Unity 2017.4.1`.
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.21.0]
+- [[email protected]][android_sdk_v4.21.0]
+- [[email protected]][windows_sdk_v4.17.0]
+
+---
+
 ### Version 4.20.1 (21st February 2020)
 #### Fixed
 - Fixed usage of deprecated `TargetGuidByName` API as of Unity 2019.3.0 (thanks to @epsmarkh).
@@ -666,6 +682,7 @@
 [ios_sdk_v4.18.3]: https://github.com/adjust/ios_sdk/tree/v4.18.3
 [ios_sdk_v4.19.0]: https://github.com/adjust/ios_sdk/tree/v4.19.0
 [ios_sdk_v4.20.0]: https://github.com/adjust/ios_sdk/tree/v4.20.0
+[ios_sdk_v4.21.0]: https://github.com/adjust/ios_sdk/tree/v4.21.0
 
 [android_sdk_v3.5.0]: https://github.com/adjust/android_sdk/tree/v3.5.0
 [android_sdk_v4.1.0]: https://github.com/adjust/android_sdk/tree/v4.1.0
@@ -690,6 +707,7 @@
 [android_sdk_v4.19.0]: https://github.com/adjust/android_sdk/tree/v4.19.0
 [android_sdk_v4.19.1]: https://github.com/adjust/android_sdk/tree/v4.19.1
 [android_sdk_v4.20.0]: https://github.com/adjust/android_sdk/tree/v4.20.0
+[android_sdk_v4.21.0]: https://github.com/adjust/android_sdk/tree/v4.21.0
 
 [windows_sdk_v4.12.0]: https://github.com/adjust/windows_sdk/tree/v4.12.0
 [windows_sdk_v4.13.0]: https://github.com/adjust/windows_sdk/tree/v4.13.0

Assets/Adjust/Unity/AdjustConfig.cs

@@ -6,6 +6,8 @@ This is the Unity SDK of Adjust™. It supports iOS, Android, Windows Store 8.1,
 
 **Note**: As of version **4.19.2**, Adjust Unity SDK is compatible with **Unity 2017.1.1 and newer** versions.
 
+**Note**: As of version **4.21.0**, Adjust Unity SDK is compatible with **Unity 2017.4.1 and newer** versions.
+
 Read this in other languages: [English][en-readme], [中文][zh-readme], [日本語][ja-readme], [한국어][ko-readme].
 
 ## Table of contents

Assets/Adjust/Windows/AdjustWindows.cs

@@ -1 +1 @@
-4.20.1
+4.21.0

Assets/Adjust/iOS/ADJConfig.h

@@ -1,4 +1,4 @@
-## Migrate your Adjust SDK for Unity3d to 4.20.1 from 3.4.4
+## Migrate your Adjust SDK for Unity3d to 4.21.0 from 3.4.4
 
 ### Migration procedure