Merge pull request #326 from adjust/v510

Version 5.1.0

Author: uerceg

Diff for: Assets/Adjust/Native/Editor/Dependencies.xml

@@ -7,7 +7,7 @@
         </androidPackage>
     </androidPackages>
     <iosPods>
-        <iosPod name="Adjust" version="5.1.0" minTargetSdk="12.0">
+        <iosPod name="Adjust" version="5.1.1" minTargetSdk="12.0">
         </iosPod>
     </iosPods>
 </dependencies>

Diff for: Assets/Adjust/Native/iOS/AdjustUnity.mm

@@ -346,16 +346,7 @@ void _AdjustSetPushToken(const char* pushToken) {
     void _AdjustProcessDeeplink(const char* deeplink) {
         if (deeplink != NULL) {
             NSString *strDeeplink = [NSString stringWithUTF8String:deeplink];
-            NSURL *urlDeeplink;
-            if ([NSString instancesRespondToSelector:@selector(stringByAddingPercentEncodingWithAllowedCharacters:)]) {
-                urlDeeplink = [NSURL URLWithString:[strDeeplink stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]]];
-            } else {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-                urlDeeplink = [NSURL URLWithString:[strDeeplink stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
-            }
-#pragma clang diagnostic pop
-
+            NSURL *urlDeeplink = [NSURL URLWithString:strDeeplink];
             ADJDeeplink *deeplink = [[ADJDeeplink alloc] initWithDeeplink:urlDeeplink];
             [Adjust processDeeplink:deeplink];
         }
@@ -381,6 +372,13 @@ void _AdjustGetAttribution(AdjustDelegateAttributionGetter callback) {
             addValueOrEmpty(dictionary, @"costType", attribution.costType);
             addValueOrEmpty(dictionary, @"costAmount", attribution.costAmount);
             addValueOrEmpty(dictionary, @"costCurrency", attribution.costCurrency);
+
+            NSData *jsonData = [NSJSONSerialization dataWithJSONObject:attribution.jsonResponse 
+                                                               options:0
+                                                                 error:nil];
+            NSString *strJsonResponse = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+            addValueOrEmpty(dictionary, @"jsonResponse", strJsonResponse);
+
             NSData *dataAttribution = [NSJSONSerialization dataWithJSONObject:dictionary
                                                                       options:0
                                                                         error:nil];
@@ -719,16 +717,7 @@ void _AdjustVerifyAppStorePurchase(const char* transactionId,
     void _AdjustProcessAndResolveDeeplink(const char* deeplink, AdjustDelegateResolvedDeeplinkCallback callback) {
         if (deeplink != NULL) {
             NSString *strDeeplink = [NSString stringWithUTF8String:deeplink];
-            NSURL *urlDeeplink;
-            if ([NSString instancesRespondToSelector:@selector(stringByAddingPercentEncodingWithAllowedCharacters:)]) {
-                urlDeeplink = [NSURL URLWithString:[strDeeplink stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLFragmentAllowedCharacterSet]]];
-            } else {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-                urlDeeplink = [NSURL URLWithString:[strDeeplink stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
-            }
-#pragma clang diagnostic pop
-
+            NSURL *urlDeeplink = [NSURL URLWithString:strDeeplink];
             ADJDeeplink *deeplink = [[ADJDeeplink alloc] initWithDeeplink:urlDeeplink];
             [Adjust processAndResolveDeeplink:deeplink withCompletionHandler:^(NSString * _Nullable resolvedLink) {
                 // TODO: nil checks

Diff for: Assets/Adjust/Native/iOS/AdjustUnityDelegate.mm

@@ -124,6 +124,14 @@ - (void)adjustAttributionChangedWannabe:(ADJAttribution *)attribution {
                    forKey:@"costCurrency"
              toDictionary:dictionary];
 
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:attribution.jsonResponse 
+                                                       options:0
+                                                         error:nil];
+    NSString *strJsonResponse = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+    [self addValueOrEmpty:strJsonResponse
+                   forKey:@"jsonResponse"
+             toDictionary:dictionary];
+
     NSData *dataAttribution = [NSJSONSerialization dataWithJSONObject:dictionary
                                                               options:0
                                                                 error:nil];

Diff for: Assets/Adjust/Scripts/AdjustAndroid.cs

@@ -15,6 +15,7 @@ public class AdjustAttribution
         public string CostType { get; set; }
         public double? CostAmount { get; set; }
         public string CostCurrency { get; set; }
+        public Dictionary<string, object> JsonResponse { get; set; }
         // Android only
         public string FbInstallReferrer { get; set; }
 
@@ -49,6 +50,14 @@ public AdjustAttribution(string jsonString)
             }
             this.CostCurrency = AdjustUtils.GetJsonString(jsonNode, AdjustUtils.KeyCostCurrency);
             this.FbInstallReferrer = AdjustUtils.GetJsonString(jsonNode, AdjustUtils.KeyFbInstallReferrer);
+
+            string jsonResponseString = AdjustUtils.GetJsonString(jsonNode, AdjustUtils.KeyJsonResponse);
+            var jsonResponseNode = JSON.Parse(jsonResponseString);
+            if (jsonResponseNode != null && jsonResponseNode.AsObject != null)
+            {
+                this.JsonResponse = new Dictionary<string, object>();
+                AdjustUtils.WriteJsonResponseDictionary(jsonResponseNode.AsObject, this.JsonResponse);
+            }
         }
 
         public AdjustAttribution(Dictionary<string, string> dicAttributionData)

Diff for: Assets/Adjust/Scripts/AdjustAttribution.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class AdjustThreadDispatcher : MonoBehaviour
+{
+    private static readonly Queue<Action> executionQueue = new Queue<Action>();
+    private static AdjustThreadDispatcher instance;
+
+    public static void RunOnMainThread(Action action)
+    {
+        if (action == null)
+        {
+            return;
+        }
+
+        lock (executionQueue)
+        {
+            executionQueue.Enqueue(action);
+        }
+    }
+
+    private void Update()
+    {
+        while (executionQueue.Count > 0)
+        {
+            Action action;
+            lock (executionQueue)
+            {
+                action = executionQueue.Dequeue();
+            }
+            if (action != null)
+            {
+                action.Invoke();
+            }
+        }
+    }
+
+    [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
+    private static void Initialize()
+    {
+        if (instance == null)
+        {
+            GameObject obj = new GameObject("AdjustThreadDispatcher");
+            instance = obj.AddComponent<AdjustThreadDispatcher>();
+            DontDestroyOnLoad(obj);
+        }
+    }
+}

Diff for: Assets/Adjust/Scripts/AdjustThreadDispatcher.cs

@@ -350,6 +350,11 @@ public static Dictionary<string, string> GetSkanUpdateDataDictionary(string skan
             return skanUpdateDataDictionary;
         }
 
+        public static string GetValueOrEmptyToNull(string value)
+        {
+            return string.IsNullOrEmpty(value) ? null : value;
+        }
+
 #if UNITY_ANDROID
         public static AndroidJavaObject TestOptionsMap2AndroidJavaObject(Dictionary<string, string> testOptionsMap, AndroidJavaObject ajoCurrentActivity)
         {