Merge pull request #278 from adjust/v4350

uerceg · web-flow · commit 0ba9d15e8609 · 2023-09-27T08:40:40.000-04:00
Version 4.35.0
diff --git a/Assets/Adjust/Android/AdjustAndroid.cs b/Assets/Adjust/Android/AdjustAndroid.cs
@@ -8,7 +8,7 @@ namespace com.adjust.sdk
 #if UNITY_ANDROID
     public class AdjustAndroid
     {
-        private const string sdkPrefix = "unity4.34.1";
+        private const string sdkPrefix = "unity4.35.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");
@@ -87,6 +87,12 @@ public static void Start(AdjustConfig adjustConfig)
                 ajoAdjustConfig.Call("setCoppaCompliantEnabled", adjustConfig.coppaCompliantEnabled.Value);
             }
 
+            // Check final Android attribution setting.
+            if (adjustConfig.finalAndroidAttributionEnabled != null)
+            {
+                ajoAdjustConfig.Call("setFinalAttributionEnabled", adjustConfig.finalAndroidAttributionEnabled.Value);
+            }
+
             // Check Play Store Kids Apps setting.
             if (adjustConfig.playStoreKidsAppEnabled != null)
             {
diff --git a/Assets/Adjust/Android/adjust-android.jar b/Assets/Adjust/Android/adjust-android.jar
diff --git a/Assets/Adjust/Test/CommandExecutor.cs b/Assets/Adjust/Test/CommandExecutor.cs
@@ -336,6 +336,13 @@ private void Config()
                 adjustConfig.setPlayStoreKidsAppEnabled(playStoreKids);
             }
 
+            if (_command.ContainsParameter("finalAttributionEnabled"))
+            {
+                var finalAndroidAttributionEnabledS = _command.GetFirstParameterValue("finalAttributionEnabled");
+                var finalAndroidAttributionEnabled = finalAndroidAttributionEnabledS.ToLower() == "true";
+                adjustConfig.setFinalAndroidAttributionEnabled(finalAndroidAttributionEnabled);
+            }
+
             if (_command.ContainsParameter("sendInBackground"))
             {
                 var sendInBackgroundS = _command.GetFirstParameterValue("sendInBackground");
diff --git a/Assets/Adjust/Unity/AdjustConfig.cs b/Assets/Adjust/Unity/AdjustConfig.cs
@@ -41,6 +41,7 @@ public class AdjustConfig
         internal bool? allowSuppressLogLevel;
         internal bool? needsCost;
         internal bool launchDeferredDeeplink;
+        internal bool? finalAndroidAttributionEnabled;
         internal AdjustLogLevel? logLevel;
         internal AdjustEnvironment environment;
         internal Action<string> deferredDeeplinkDelegate;
@@ -298,6 +299,11 @@ public void setPlayStoreKidsAppEnabled(bool playStoreKidsAppEnabled)
             this.playStoreKidsAppEnabled = playStoreKidsAppEnabled;
         }
 
+        public void setFinalAndroidAttributionEnabled(bool finalAndroidAttributionEnabled)
+        {
+            this.finalAndroidAttributionEnabled = finalAndroidAttributionEnabled;
+        }
+
         // Windows specific methods.
         public void setLogDelegate(Action<String> logDelegate)
         {
diff --git a/Assets/Adjust/Windows/AdjustWindows.cs b/Assets/Adjust/Windows/AdjustWindows.cs
@@ -17,7 +17,7 @@ namespace com.adjust.sdk
 {
     public class AdjustWindows
     {
-        private const string sdkPrefix = "unity4.34.1";
+        private const string sdkPrefix = "unity4.35.0";
         private static bool appLaunched = false;
 
         public static void Start(AdjustConfig adjustConfig)
diff --git a/Assets/Adjust/iOS/Adjust.h b/Assets/Adjust/iOS/Adjust.h
@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust SDK
 //
-//  V4.34.2
+//  V4.35.0
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
 //  Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
 //
diff --git a/Assets/Adjust/iOS/AdjustSdk.a b/Assets/Adjust/iOS/AdjustSdk.a
diff --git a/Assets/Adjust/iOS/AdjustiOS.cs b/Assets/Adjust/iOS/AdjustiOS.cs
@@ -8,7 +8,7 @@ namespace com.adjust.sdk
 #if UNITY_IOS
     public class AdjustiOS
     {
-        private const string sdkPrefix = "unity4.34.1";
+        private const string sdkPrefix = "unity4.35.0";
 
         [DllImport("__Internal")]
         private static extern void _AdjustLaunchApp(
diff --git a/Assets/Adjust/iOS/Test/AdjustTestLibrary.a b/Assets/Adjust/iOS/Test/AdjustTestLibrary.a
diff --git a/Assets/AdjustOaid/Android/adjust-android-oaid.jar b/Assets/AdjustOaid/Android/adjust-android-oaid.jar
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+### Version 4.35.0 (27th September 2023)
+#### Added
+- Added support for SigV3 library. Update authorization header building logic to use `adj_signing_id`.
+- Added `setAndroidFinalAttributionEnabled` method to `AdjustConfig` to indicate if only final Android attribution is needed in attribution callback (by default attribution callback return intermediate attribution as well before final attribution if not enabled with this setter method).
+
+#### Native SDKs
+- [iOS@v4.35.0][ios_sdk_v4.35.0]
+- [Android@v4.35.0][android_sdk_v4.35.0]
+- [Windows@v4.17.0][windows_sdk_v4.17.0]
+
+---
+
 ### Version 4.34.1 (6th September 2023)
 #### Added
 - Added more logging around ATT delay timer feature to indicate that it's activated.
@@ -1134,6 +1146,7 @@ Kudos to [Ivan](https://github.com/MatkovIvan) and [Evgeny](https://github.com/e
 [ios_sdk_v4.33.4]: https://github.com/adjust/ios_sdk/tree/v4.33.4
 [ios_sdk_v4.34.1]: https://github.com/adjust/ios_sdk/tree/v4.34.1
 [ios_sdk_v4.34.2]: https://github.com/adjust/ios_sdk/tree/v4.34.2
+[ios_sdk_v4.35.0]: https://github.com/adjust/ios_sdk/tree/v4.35.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
@@ -1179,6 +1192,7 @@ Kudos to [Ivan](https://github.com/MatkovIvan) and [Evgeny](https://github.com/e
 [android_sdk_v4.33.2]: https://github.com/adjust/android_sdk/tree/v4.33.2
 [android_sdk_v4.33.5]: https://github.com/adjust/android_sdk/tree/v4.33.5
 [android_sdk_v4.34.0]: https://github.com/adjust/android_sdk/tree/v4.34.0
+[android_sdk_v4.35.0]: https://github.com/adjust/android_sdk/tree/v4.35.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
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.34.1
+4.35.0
diff --git a/doc/english/migration/migrate.md b/doc/english/migration/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your Adjust SDK for Unity3d to 4.34.1 from 3.4.4
+## Migrate your Adjust SDK for Unity3d to 4.35.0 from 3.4.4
 
 ### Migration procedure
 
diff --git a/ext/android/sdk b/ext/android/sdk
@@ -1 +1 @@
-Subproject commit fa125356d93f6797ff7a36a0eb4b8d01b573bc1a
+Subproject commit edfe32775dcfdfc218b7d851bae24aec809c9ae1
diff --git a/ext/ios/sdk b/ext/ios/sdk
@@ -1 +1 @@
-Subproject commit 3a19868552e27655249bd67dc4016faa41dbe48e
+Subproject commit f90ae6cfb229f4e8c6e5f7153b68031742a04499

Original file line number	Diff line number	Diff line change
`@@ -336,6 +336,13 @@ private void Config()`
`336`	`336`	`adjustConfig.setPlayStoreKidsAppEnabled(playStoreKids);`
`337`	`337`	`}`
`338`	`338`
	`339`	`+ if (_command.ContainsParameter("finalAttributionEnabled"))`
	`340`	`+ {`
	`341`	`+ var finalAndroidAttributionEnabledS = _command.GetFirstParameterValue("finalAttributionEnabled");`
	`342`	`+ var finalAndroidAttributionEnabled = finalAndroidAttributionEnabledS.ToLower() == "true";`
	`343`	`+ adjustConfig.setFinalAndroidAttributionEnabled(finalAndroidAttributionEnabled);`
	`344`	`+ }`
	`345`	`+`
`339`	`346`	`if (_command.ContainsParameter("sendInBackground"))`
`340`	`347`	`{`
`341`	`348`	`var sendInBackgroundS = _command.GetFirstParameterValue("sendInBackground");`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace com.adjust.sdk`
`17`	`17`	`{`
`18`	`18`	`public class AdjustWindows`
`19`	`19`	`{`
`20`		`- private const string sdkPrefix = "unity4.34.1";`
	`20`	`+ private const string sdkPrefix = "unity4.35.0";`
`21`	`21`	`private static bool appLaunched = false;`
`22`	`22`
`23`	`23`	`public static void Start(AdjustConfig adjustConfig)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace com.adjust.sdk`
`8`	`8`	`#if UNITY_IOS`
`9`	`9`	`public class AdjustiOS`
`10`	`10`	`{`
`11`		`- private const string sdkPrefix = "unity4.34.1";`
	`11`	`+ private const string sdkPrefix = "unity4.35.0";`
`12`	`12`
`13`	`13`	`[DllImport("__Internal")]`
`14`	`14`	`private static extern void _AdjustLaunchApp(`