Merge pull request #282 from adjust/v4360

Version 4.36.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.35.2";
+        private const string sdkPrefix = "unity4.36.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");
@@ -93,6 +93,12 @@ public static void Start(AdjustConfig adjustConfig)
                 ajoAdjustConfig.Call("setFinalAttributionEnabled", adjustConfig.finalAndroidAttributionEnabled.Value);
             }
 
+            // Check read Android IDs only once.
+            if (adjustConfig.readDeviceInfoOnceEnabled != null)
+            {
+                ajoAdjustConfig.Call("setReadDeviceInfoOnceEnabled", adjustConfig.readDeviceInfoOnceEnabled.Value);
+            }
+
             // Check Play Store Kids Apps setting.
             if (adjustConfig.playStoreKidsAppEnabled != null)
             {
@@ -123,6 +129,12 @@ public static void Start(AdjustConfig adjustConfig)
                 ajoAdjustConfig.Call("setPreinstallFilePath", adjustConfig.preinstallFilePath);
             }
 
+            // Check if FB app ID has been set.
+            if (adjustConfig.fbAppId != null)
+            {
+                ajoAdjustConfig.Call("setFbAppId", adjustConfig.fbAppId);
+            }
+
             // Check if user has set user agent value.
             if (adjustConfig.userAgent != null)
             {
@@ -165,6 +177,11 @@ public static void Start(AdjustConfig adjustConfig)
                     AndroidJavaObject ajoUrlStrategyCn = new AndroidJavaClass("com.adjust.sdk.AdjustConfig").GetStatic<AndroidJavaObject>("URL_STRATEGY_CN");
                     ajoAdjustConfig.Call("setUrlStrategy", ajoUrlStrategyCn);
                 }
+                else if (adjustConfig.urlStrategy == AdjustConfig.AdjustUrlStrategyCnOnly)
+                {
+                    AndroidJavaObject ajoUrlStrategyCnOnly = new AndroidJavaClass("com.adjust.sdk.AdjustConfig").GetStatic<AndroidJavaObject>("URL_STRATEGY_CN_ONLY");
+                    ajoAdjustConfig.Call("setUrlStrategy", ajoUrlStrategyCnOnly);
+                }
                 else if (adjustConfig.urlStrategy == AdjustConfig.AdjustDataResidencyEU)
                 {
                     AndroidJavaObject ajoDataResidencyEU = new AndroidJavaClass("com.adjust.sdk.AdjustConfig").GetStatic<AndroidJavaObject>("DATA_RESIDENCY_EU");

Assets/Adjust/Android/AdjustAndroidManifest.xml

@@ -19,6 +19,13 @@
     <uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE" />
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
 
+    <queries>
+        <package android:name="com.facebook.katana" />
+    </queries>
+    <queries>
+        <package android:name="com.instagram.android" />
+    </queries>
+
     <application
         android:theme="@style/UnityThemeSelector"
         android:icon="@drawable/app_icon"

Assets/Adjust/Android/adjust-android.jar

@@ -779,6 +779,27 @@ public static string getIdfa()
 #endif
         }
 
+        public static string getIdfv()
+        {
+            if (IsEditor())
+            {
+                return string.Empty;
+            }
+
+#if UNITY_IOS
+            return AdjustiOS.GetIdfv();
+#elif UNITY_ANDROID
+            Debug.Log("[Adjust]: Error! IDFV is not available on Android platform.");
+            return string.Empty;
+#elif (UNITY_WSA || UNITY_WP8)
+            Debug.Log("[Adjust]: Error! IDFV is not available on Windows platform.");
+            return string.Empty;
+#else
+            Debug.Log(errorMsgPlatform);
+            return string.Empty;
+#endif
+        }
+
         public static string getSdkVersion()
         {
             if (IsEditor())

Assets/Adjust/Unity/Adjust.cs

@@ -7,6 +7,7 @@ public class AdjustConfig
         public const string AdjustUrlStrategyChina = "china";
         public const string AdjustUrlStrategyIndia = "india";
         public const string AdjustUrlStrategyCn = "cn";
+        public const string AdjustUrlStrategyCnOnly = "cn-only";
 
         public const string AdjustDataResidencyEU = "data-residency-eu";
         public const string AdjustDataResidencyTR = "data-residency-tr";
@@ -20,6 +21,8 @@ public class AdjustConfig
         public const string AdjustAdRevenueSourceUnity = "unity_sdk";
         public const string AdjustAdRevenueSourceHeliumChartboost = "helium_chartboost_sdk";
         public const string AdjustAdRevenueSourcePublisher = "publisher_sdk";
+        public const string AdjustAdRevenueSourceTopOn = "topon_sdk";
+        public const string AdjustAdRevenueSourceAdx = "adx_sdk";
 
         internal string appToken;
         internal string sceneName;
@@ -41,7 +44,6 @@ 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;
@@ -58,6 +60,9 @@ public class AdjustConfig
         internal bool? readImei;
         internal bool? preinstallTrackingEnabled;
         internal string preinstallFilePath;
+        internal bool? finalAndroidAttributionEnabled;
+        internal string fbAppId;
+        internal bool? readDeviceInfoOnceEnabled;
         // iOS specific members
         internal bool? allowAdServicesInfoReading;
         internal bool? allowIdfaReading;
@@ -304,6 +309,16 @@ public void setFinalAndroidAttributionEnabled(bool finalAndroidAttributionEnable
             this.finalAndroidAttributionEnabled = finalAndroidAttributionEnabled;
         }
 
+        public void setFbAppId(string fbAppId)
+        {
+            this.fbAppId = fbAppId;
+        }
+
+        public void setReadDeviceInfoOnceEnabled(bool readDeviceInfoOnceEnabled)
+        {
+            this.readDeviceInfoOnceEnabled = readDeviceInfoOnceEnabled;
+        }
+
         // Windows specific methods.
         public void setLogDelegate(Action<String> logDelegate)
         {

Assets/Adjust/Unity/AdjustConfig.cs

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

Assets/Adjust/Windows/AdjustWindows.cs

@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust SDK
 //
-//  V4.35.2
+//  V4.36.0
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
 //  Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
 //
@@ -54,13 +54,16 @@ extern NSString * __nonnull const ADJAdRevenueSourceAdMost;
 extern NSString * __nonnull const ADJAdRevenueSourceUnity;
 extern NSString * __nonnull const ADJAdRevenueSourceHeliumChartboost;
 extern NSString * __nonnull const ADJAdRevenueSourcePublisher;
+extern NSString * __nonnull const ADJAdRevenueSourceTopOn;
+extern NSString * __nonnull const ADJAdRevenueSourceADX;
 
 /**
  * Constants for country app's URL strategies.
  */
 extern NSString * __nonnull const ADJUrlStrategyIndia;
 extern NSString * __nonnull const ADJUrlStrategyChina;
 extern NSString * __nonnull const ADJUrlStrategyCn;
+extern NSString * __nonnull const ADJUrlStrategyCnOnly;
 extern NSString * __nonnull const ADJDataResidencyEU;
 extern NSString * __nonnull const ADJDataResidencyTR;
 extern NSString * __nonnull const ADJDataResidencyUS;
@@ -164,6 +167,14 @@ extern NSString * __nonnull const ADJDataResidencyUS;
  */
 + (nullable NSString *)idfa;
 
+/**
+ * @brief Retrieve iOS device IDFV value.
+ *
+ * @return Device IDFV value.
+ */
++ (nullable NSString *)idfv;
+
+
 /**
  * @brief Get current adjust identifier for the user.
  *

Assets/Adjust/iOS/Adjust.h

@@ -245,6 +245,8 @@ void _AdjustLaunchApp(const char* appToken,
                 [adjustConfig setUrlStrategy:ADJUrlStrategyIndia];
             } else if ([stringUrlStrategy isEqualToString:@"cn"]) {
                 [adjustConfig setUrlStrategy:ADJUrlStrategyCn];
+            } else if ([stringUrlStrategy isEqualToString:@"cn-only"]) {
+                [adjustConfig setUrlStrategy:ADJUrlStrategyCnOnly];
             } else if ([stringUrlStrategy isEqualToString:@"data-residency-eu"]) {
                 [adjustConfig setUrlStrategy:ADJDataResidencyEU];
             } else if ([stringUrlStrategy isEqualToString:@"data-residency-tr"]) {
@@ -410,6 +412,21 @@ void _AdjustAppWillOpenUrl(const char* url) {
         return idfaCStringCopy;
     }
 
+    char* _AdjustGetIdfv() {
+        NSString *idfv = [Adjust idfv];
+        if (nil == idfv) {
+            return NULL;
+        }
+
+        const char* idfvCString = [idfv UTF8String];
+        if (NULL == idfvCString) {
+            return NULL;
+        }
+
+        char* idfvCStringCopy = strdup(idfvCString);
+        return idfvCStringCopy;
+    }
+
     char* _AdjustGetAdid() {
         NSString *adid = [Adjust adid];
         if (nil == adid) {

Assets/Adjust/iOS/AdjustSdk.a

@@ -8,7 +8,7 @@ namespace com.adjust.sdk
 #if UNITY_IOS
     public class AdjustiOS
     {
-        private const string sdkPrefix = "unity4.35.2";
+        private const string sdkPrefix = "unity4.36.0";
 
         [DllImport("__Internal")]
         private static extern void _AdjustLaunchApp(
@@ -79,6 +79,9 @@ private static extern void _AdjustTrackEvent(
         [DllImport("__Internal")]
         private static extern string _AdjustGetIdfa();
 
+        [DllImport("__Internal")]
+        private static extern string _AdjustGetIdfv();
+
         [DllImport("__Internal")]
         private static extern string _AdjustGetAdid();
 
@@ -467,6 +470,11 @@ public static string GetIdfa()
             return _AdjustGetIdfa();
         }
 
+        public static string GetIdfv()
+        {
+            return _AdjustGetIdfv();
+        }
+
         public static string GetAdid()
         {
             return _AdjustGetAdid();

Assets/Adjust/iOS/AdjustUnity.mm

@@ -1,3 +1,17 @@
+### Version 4.35.2 (24th November 2023)
+#### Added
+- Added support for Meta install referrer.
+- Added support for Google Play Games on PC.
+- Added support for `TopOn` and `AD(X)` ad revenue tracking.
+- Added a new type of URL strategy called `AdjustConfig.AdjustUrlStrategyCnOnly`. This URL strategy represents `AdjustConfig.AdjustUrlStrategyCn` strategy, but without fallback domains.
+- Added `setReadDeviceInfoOnceEnabled(bool)` method to `AdjustConfig` to indicate if Android device info should be read only once.
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.36.0]
+- [[email protected]][android_sdk_v4.37.0]
+- [[email protected]][windows_sdk_v4.17.0]
+---
+
 ### Version 4.35.2 (9th October 2023)
 #### Added
 - Added sending of `event_callback_id` parameter (if set) with the event payload.
@@ -1170,6 +1184,7 @@ Kudos to [Ivan](https://github.com/MatkovIvan) and [Evgeny](https://github.com/e
 [ios_sdk_v4.35.0]: https://github.com/adjust/ios_sdk/tree/v4.35.0
 [ios_sdk_v4.35.1]: https://github.com/adjust/ios_sdk/tree/v4.35.1
 [ios_sdk_v4.35.2]: https://github.com/adjust/ios_sdk/tree/v4.35.2
+[ios_sdk_v4.36.0]: https://github.com/adjust/ios_sdk/tree/v4.36.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
@@ -1217,6 +1232,7 @@ Kudos to [Ivan](https://github.com/MatkovIvan) and [Evgeny](https://github.com/e
 [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
 [android_sdk_v4.35.1]: https://github.com/adjust/android_sdk/tree/v4.35.1
+[android_sdk_v4.37.0]: https://github.com/adjust/android_sdk/tree/v4.37.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/iOS/AdjustiOS.cs

@@ -1 +1 @@
-4.35.2
+4.36.0

Assets/AdjustOaid/Android/adjust-android-oaid.jar

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