Merge pull request #138 from adjust/v4150

Version 4.15.0

Author: uerceg

.gitmodules

@@ -10,15 +10,3 @@
 	path = ext/windows/sdk
 	url = [email protected]:adjust/windows_sdk.git
 	branch = master
-[submodule "ext/android/sdk-dev"]
-	path = ext/android/sdk-dev
-	url = [email protected]:adjust/android_sdk_dev.git
-	branch = master
-[submodule "ext/ios/sdk-dev"]
-	path = ext/ios/sdk-dev
-	url = [email protected]:adjust/ios_sdk_dev.git
-	branch = master
-[submodule "ext/windows/sdk-dev"]
-	path = ext/windows/sdk-dev
-	url = [email protected]:adjust/windows_sdk_dev.git
-	branch = master

Assets/Adjust/Adjust.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
-using com.adjust.sdk.test;
 
 namespace com.adjust.sdk
 {
@@ -86,6 +85,7 @@ public static void start(AdjustConfig adjustConfig)
                 Debug.Log("Adjust: Missing config to start.");
                 return;
             }
+
             #if UNITY_IOS
                 Adjust.eventSuccessDelegate = adjustConfig.getEventSuccessDelegate();
                 Adjust.eventFailureDelegate = adjustConfig.getEventFailureDelegate();
@@ -186,15 +186,15 @@ public static void setDeviceToken(string deviceToken)
 
         public static void gdprForgetMe()
         {
-#if UNITY_IOS
-            AdjustiOS.GdprForgetMe();
-#elif UNITY_ANDROID
-            AdjustAndroid.GdprForgetMe();
-#elif (UNITY_WSA || UNITY_WP8)
-            AdjustWindows.GdprForgetMe();
-#else
-            Debug.Log(errorMsgPlatform);
-#endif
+            #if UNITY_IOS
+                AdjustiOS.GdprForgetMe();
+            #elif UNITY_ANDROID
+                AdjustAndroid.GdprForgetMe();
+            #elif (UNITY_WSA || UNITY_WP8)
+                AdjustWindows.GdprForgetMe();
+            #else
+                Debug.Log(errorMsgPlatform);
+            #endif
         }
 
         public static void appWillOpenUrl(string url)
@@ -531,7 +531,7 @@ private static bool IsEditor()
             #endif
         }
 
-        public static void SetTestOptions(AdjustTestOptions testOptions)
+        public static void SetTestOptions(Dictionary<string, string> testOptions)
         {
             if (IsEditor()) { return; }
 

Assets/Adjust/Android/AdjustAndroid.cs

@@ -2,19 +2,15 @@
 using System.Text;
 using System.Collections;
 using System.Runtime.InteropServices;
-
 using UnityEngine;
 using UnityEngine.UI;
-
 using com.adjust.sdk;
 
 public class ExampleGUI : MonoBehaviour
 {
     private int numberOfButtons = 8;
-
     private bool isEnabled;
     private bool showPopUp = false;
-
     private string txtSetEnabled = "Disable SDK";
     private string txtManualLaunch = "Manual Launch";
     private string txtSetOfflineMode = "Turn Offline Mode ON";
@@ -23,7 +19,7 @@ void OnGUI()
     {
         if (showPopUp)
         {
-            GUI.Window(0, new Rect((Screen.width / 2) - 150, (Screen.height / 2) - 65, 300, 130), showGUI, "Is SDK enabled?");
+            GUI.Window(0, new Rect((Screen.width / 2) - 150, (Screen.height / 2) - 65, 300, 130), ShowGUI, "Is SDK enabled?");
         }
 
         if (GUI.Button(new Rect(0, Screen.height * 0 / numberOfButtons, Screen.width, Screen.height / numberOfButtons), txtManualLaunch))
@@ -33,8 +29,6 @@ void OnGUI()
                 AdjustConfig adjustConfig = new AdjustConfig("2fm9gkqubvpc", AdjustEnvironment.Sandbox);
                 adjustConfig.setLogLevel(AdjustLogLevel.Verbose);
                 adjustConfig.setLogDelegate(msg => Debug.Log(msg));
-                adjustConfig.setSendInBackground(true);
-                adjustConfig.setLaunchDeferredDeeplink(true);
                 adjustConfig.setEventSuccessDelegate(EventSuccessCallback);
                 adjustConfig.setEventFailureDelegate(EventFailureCallback);
                 adjustConfig.setSessionSuccessDelegate(SessionSuccessCallback);
@@ -112,7 +106,7 @@ void OnGUI()
         }
     }
 
-    void showGUI(int windowID)
+    void ShowGUI(int windowID)
     {
         if (isEnabled)
         {
@@ -129,7 +123,7 @@ void showGUI(int windowID)
         }
     }
 
-    public void handleGooglePlayId(String adId)
+    public void HandleGooglePlayId(String adId)
     {
         Debug.Log("Google Play Ad ID = " + adId);
     }
@@ -142,37 +136,30 @@ public void AttributionChangedCallback(AdjustAttribution attributionData)
         {
             Debug.Log("Tracker name: " + attributionData.trackerName);
         }
-
         if (attributionData.trackerToken != null)
         {
             Debug.Log("Tracker token: " + attributionData.trackerToken);
         }
-
         if (attributionData.network != null)
         {
             Debug.Log("Network: " + attributionData.network);
         }
-
         if (attributionData.campaign != null)
         {
             Debug.Log("Campaign: " + attributionData.campaign);
         }
-
         if (attributionData.adgroup != null)
         {
             Debug.Log("Adgroup: " + attributionData.adgroup);
         }
-
         if (attributionData.creative != null)
         {
             Debug.Log("Creative: " + attributionData.creative);
         }
-
         if (attributionData.clickLabel != null)
         {
             Debug.Log("Click label: " + attributionData.clickLabel);
         }
-
         if (attributionData.adid != null)
         {
             Debug.Log("ADID: " + attributionData.adid);
@@ -187,22 +174,22 @@ public void EventSuccessCallback(AdjustEventSuccess eventSuccessData)
         {
             Debug.Log("Message: " + eventSuccessData.Message);
         }
-
         if (eventSuccessData.Timestamp != null)
         {
             Debug.Log("Timestamp: " + eventSuccessData.Timestamp);
         }
-
         if (eventSuccessData.Adid != null)
         {
             Debug.Log("Adid: " + eventSuccessData.Adid);
         }
-
         if (eventSuccessData.EventToken != null)
         {
             Debug.Log("EventToken: " + eventSuccessData.EventToken);
         }
-
+        if (eventSuccessData.CallbackId != null)
+        {
+            Debug.Log("CallbackId: " + eventSuccessData.CallbackId);
+        }
         if (eventSuccessData.JsonResponse != null)
         {
             Debug.Log("JsonResponse: " + eventSuccessData.GetJsonResponse());
@@ -217,28 +204,28 @@ public void EventFailureCallback(AdjustEventFailure eventFailureData)
         {
             Debug.Log("Message: " + eventFailureData.Message);
         }
-
         if (eventFailureData.Timestamp != null)
         {
             Debug.Log("Timestamp: " + eventFailureData.Timestamp);
         }
-
         if (eventFailureData.Adid != null)
         {
             Debug.Log("Adid: " + eventFailureData.Adid);
         }
-
         if (eventFailureData.EventToken != null)
         {
             Debug.Log("EventToken: " + eventFailureData.EventToken);
         }
-
-        Debug.Log("WillRetry: " + eventFailureData.WillRetry.ToString());
-
+        if (eventFailureData.CallbackId != null)
+        {
+            Debug.Log("CallbackId: " + eventFailureData.CallbackId);
+        }
         if (eventFailureData.JsonResponse != null)
         {
             Debug.Log("JsonResponse: " + eventFailureData.GetJsonResponse());
         }
+
+        Debug.Log("WillRetry: " + eventFailureData.WillRetry.ToString());
     }
 
     public void SessionSuccessCallback(AdjustSessionSuccess sessionSuccessData)
@@ -249,17 +236,14 @@ public void SessionSuccessCallback(AdjustSessionSuccess sessionSuccessData)
         {
             Debug.Log("Message: " + sessionSuccessData.Message);
         }
-
         if (sessionSuccessData.Timestamp != null)
         {
             Debug.Log("Timestamp: " + sessionSuccessData.Timestamp);
         }
-
         if (sessionSuccessData.Adid != null)
         {
             Debug.Log("Adid: " + sessionSuccessData.Adid);
         }
-
         if (sessionSuccessData.JsonResponse != null)
         {
             Debug.Log("JsonResponse: " + sessionSuccessData.GetJsonResponse());
@@ -274,23 +258,20 @@ public void SessionFailureCallback(AdjustSessionFailure sessionFailureData)
         {
             Debug.Log("Message: " + sessionFailureData.Message);
         }
-
         if (sessionFailureData.Timestamp != null)
         {
             Debug.Log("Timestamp: " + sessionFailureData.Timestamp);
         }
-
         if (sessionFailureData.Adid != null)
         {
             Debug.Log("Adid: " + sessionFailureData.Adid);
         }
-
-        Debug.Log("WillRetry: " + sessionFailureData.WillRetry.ToString());
-
         if (sessionFailureData.JsonResponse != null)
         {
             Debug.Log("JsonResponse: " + sessionFailureData.GetJsonResponse());
         }
+
+        Debug.Log("WillRetry: " + sessionFailureData.WillRetry.ToString());
     }
 
     private void DeferredDeeplinkCallback(string deeplinkURL)