Merge pull request #206 from adjust/v4260

Version 4.26.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.24.1";
+        private const string sdkPrefix = "unity4.26.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");
@@ -458,6 +458,39 @@ public static void TrackPlayStoreSubscription(AdjustPlayStoreSubscription subscr
             ajcAdjust.CallStatic("trackPlayStoreSubscription", ajoSubscription);
         }
 
+        public static void TrackThirdPartySharing(AdjustThirdPartySharing thirdPartySharing)
+        {
+            AndroidJavaObject ajoIsEnabled;
+            AndroidJavaObject ajoAdjustThirdPartySharing;
+            if (thirdPartySharing.isEnabled != null)
+            {
+                ajoIsEnabled = new AndroidJavaObject("java.lang.Boolean", thirdPartySharing.isEnabled.Value);
+                ajoAdjustThirdPartySharing = new AndroidJavaObject("com.adjust.sdk.AdjustThirdPartySharing", ajoIsEnabled);
+            }
+            else
+            {
+                ajoAdjustThirdPartySharing = new AndroidJavaObject("com.adjust.sdk.AdjustThirdPartySharing", null);
+            }
+
+            if (thirdPartySharing.granularOptions != null)
+            {
+                foreach (KeyValuePair<string, List<string>> entry in thirdPartySharing.granularOptions)
+                {
+                    for (int i = 0; i < entry.Value.Count;)
+                    {
+                        ajoAdjustThirdPartySharing.Call("addGranularOption", entry.Key, entry.Value[i++], entry.Value[i++]);
+                    }
+                }
+            }
+
+            ajcAdjust.CallStatic("trackThirdPartySharing", ajoAdjustThirdPartySharing);
+        }
+
+        public static void TrackMeasurementConsent(bool measurementConsent)
+        {
+            ajcAdjust.CallStatic("trackMeasurementConsent", measurementConsent);
+        }
+
         // Android specific methods.
         public static void OnPause()
         {

Assets/Adjust/Android/Test/adjust-test-library.aar

@@ -153,6 +153,7 @@ private static void RunPostBuildScript(BuildTarget target, bool preBuild, string
             // The Adjust SDK will try to add following frameworks to your project:
             // - AdSupport.framework (needed for access to IDFA value)
             // - iAd.framework (needed in case you are running ASA campaigns)
+            // - AdServices.framework (needed in case you are running ASA campaigns)
             // - CoreTelephony.framework (needed to get information about network type user is connected to)
             // - StoreKit.framework (needed for communication with SKAdNetwork framework)
             // - AppTrackingTransparency.framework (needed for information about user's consent to be tracked)
@@ -173,6 +174,10 @@ private static void RunPostBuildScript(BuildTarget target, bool preBuild, string
             xcodeProject.AddFrameworkToProject(xcodeTarget, "iAd.framework", true);
             UnityEngine.Debug.Log("[Adjust]: iAd.framework added successfully.");
 
+            UnityEngine.Debug.Log("[Adjust]: Adding AdServices.framework to Xcode project.");
+            xcodeProject.AddFrameworkToProject(xcodeTarget, "AdServices.framework", true);
+            UnityEngine.Debug.Log("[Adjust]: AdServices.framework added successfully.");
+
             UnityEngine.Debug.Log("[Adjust]: Adding CoreTelephony.framework to Xcode project.");
             xcodeProject.AddFrameworkToProject(xcodeTarget, "CoreTelephony.framework", true);
             UnityEngine.Debug.Log("[Adjust]: CoreTelephony.framework added successfully.");

Assets/Adjust/Android/Test/adjust-test-library.aar.meta

@@ -70,6 +70,8 @@ public void ExecuteCommand(Command command)
                     case "trackAdRevenue": TrackAdRevenue(); break;
                     case "disableThirdPartySharing": DisableThirdPartySharing(); break;
                     case "trackSubscription": TrackSubscription(); break;
+                    case "thirdPartySharing": ThirdPartySharing(); break;
+                    case "measurementConsent": MeasurementConsent(); break;
                     default: CommandNotFound(_command.ClassName, _command.MethodName); break;
                 }
             }
@@ -111,11 +113,21 @@ private void TestOptions()
             {
                 testOptions[AdjustUtils.KeyTestOptionsNoBackoffWait] = _command.GetFirstParameterValue("noBackoffWait");
             }
-            testOptions [AdjustUtils.KeyTestOptionsiAdFrameworkEnabled] = "false";  // false - iAd will not be used in test app by default
+            // iAd.framework will not be used in test app by default
+            testOptions [AdjustUtils.KeyTestOptionsiAdFrameworkEnabled] = "false";
             if (_command.ContainsParameter("iAdFrameworkEnabled"))
             {
                 testOptions[AdjustUtils.KeyTestOptionsiAdFrameworkEnabled] = _command.GetFirstParameterValue("iAdFrameworkEnabled");
             }
+            // AdServices.framework will not be used in test app by default
+            testOptions [AdjustUtils.KeyTestOptionsAdServicesFrameworkEnabled] = "false";
+            if (_command.ContainsParameter("adServicesFrameworkEnabled"))
+            {
+                testOptions[AdjustUtils.KeyTestOptionsAdServicesFrameworkEnabled] = _command.GetFirstParameterValue("adServicesFrameworkEnabled");
+            }
+#if UNITY_ANDROID
+            bool useTestConnectionOptions = false;
+#endif
             if (_command.ContainsParameter("teardown"))
             {
                 List<string> teardownOptions = _command.Parameters["teardown"];
@@ -125,7 +137,12 @@ private void TestOptions()
                     {
                         testOptions[AdjustUtils.KeyTestOptionsTeardown] = "true";
                         testOptions[AdjustUtils.KeyTestOptionsExtraPath] = ExtraPath;
+#if UNITY_IOS
                         testOptions[AdjustUtils.KeyTestOptionsUseTestConnectionOptions] = "true";
+#endif
+#if UNITY_ANDROID
+                        useTestConnectionOptions = true;
+#endif
                     }
                     if (teardownOption == "deleteState")
                     {
@@ -144,7 +161,9 @@ private void TestOptions()
                     {
                         testOptions[AdjustUtils.KeyTestOptionsTeardown] = "true";
                         testOptions[AdjustUtils.KeyTestOptionsExtraPath] = null;
+#if UNITY_IOS
                         testOptions[AdjustUtils.KeyTestOptionsUseTestConnectionOptions] = "false";
+#endif
                     }
                     if (teardownOption == "test")
                     {
@@ -159,6 +178,12 @@ private void TestOptions()
             }
 
             Adjust.SetTestOptions(testOptions);
+#if UNITY_ANDROID
+            if (useTestConnectionOptions)
+            {
+                TestConnectionOptions.SetTestConnectionOptions();
+            }
+#endif
         }
 
         private void Config()
@@ -306,6 +331,13 @@ private void Config()
                 adjustConfig.allowiAdInfoReading = allowiAdInfoReading;
             }
 
+            if (_command.ContainsParameter("allowAdServicesInfoReading"))
+            {
+                var allowAdServicesInfoReadingS = _command.GetFirstParameterValue("allowAdServicesInfoReading");
+                var allowAdServicesInfoReading = allowAdServicesInfoReadingS.ToLower() == "true";
+                adjustConfig.allowAdServicesInfoReading = allowAdServicesInfoReading;
+            }
+
             if (_command.ContainsParameter("allowIdfaReading"))
             {
                 var allowIdfaReadingS = _command.GetFirstParameterValue("allowIdfaReading");
@@ -783,6 +815,38 @@ private void TrackSubscription()
 #endif
         }
 
+        private void ThirdPartySharing()
+        {
+            string enabled = _command.GetFirstParameterValue("isEnabled");
+            bool? isEnabled = null;
+            if (enabled != null)
+            {
+                isEnabled = bool.Parse(enabled);
+            }
+
+            AdjustThirdPartySharing adjustThirdPartySharing = new AdjustThirdPartySharing(isEnabled);
+
+            if (_command.ContainsParameter("granularOptions"))
+            {
+                var granularOptions = _command.Parameters["granularOptions"];
+                for (var i = 0; i < granularOptions.Count; i += 3)
+                {
+                    var partnerName = granularOptions[i];
+                    var key = granularOptions[i+1];
+                    var value = granularOptions[i+2];
+                    adjustThirdPartySharing.addGranularOption(partnerName, key, value);
+                }
+            }
+
+            Adjust.trackThirdPartySharing(adjustThirdPartySharing);
+        }
+
+        private void MeasurementConsent()
+        {
+            var enabled = bool.Parse(_command.GetFirstParameterValue("isEnabled"));
+            Adjust.trackMeasurementConsent(enabled);
+        }
+
         private void CommandNotFound(string className, string methodName)
         {
             TestApp.Log("Adjust Test: Method '" + methodName + "' not found for class '" + className + "'");

Assets/Adjust/Android/Test/adjust-test-options.aar

@@ -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.86.33";
+        private const string IP = "192.168.86.50";
 #elif UNITY_IOS
         private const string PORT = ":8080";
         private const string PROTOCOL = "http://";
-        private const string IP = "192.168.86.33";
+        private const string IP = "192.168.86.50";
         private TestLibraryiOS _testLibraryiOS;
 #endif
         private const string BASE_URL = PROTOCOL + IP + PORT;
@@ -44,7 +44,7 @@ private void StartTestSession()
 #endif
             // Set specific tests to run.
             // testLibrary.AddTest("current/eventBuffering/Test_EventBuffering_sensitive_packets");
-            // testLibrary.AddTest("current/gdpr/Test_GdprForgetMe_after_install");
+            // testLibrary.AddTest("Test_ThirdPartySharing_after_install");
             // testLibrary.AddTestDirectory ("current/deeplink-deferred");
 
             Log("Starting test session.");

Assets/Adjust/Android/Test/adjust-test-options.aar.meta

@@ -0,0 +1,15 @@
+using UnityEngine;
+
+namespace com.adjust.sdk.test
+{
+#if UNITY_ANDROID
+    public class TestConnectionOptions
+    {
+        public static void SetTestConnectionOptions()
+        {
+            AndroidJavaClass ajcTestConnectionOptions = new AndroidJavaClass("com.adjust.test_options.TestConnectionOptions");
+            ajcTestConnectionOptions.CallStatic("setTestConnectionOptions");
+        }
+    }
+#endif
+}