Merge pull request #199 from adjust/v4241

Version 4.24.1
adjust · Dec 24, 2020 · 44656e4 · 44656e4
2 parents 74cb2b9 + b64b217
commit 44656e4
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 7 deletions.
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.24.0";
+        private const string sdkPrefix = "unity4.24.1";
         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");

diff --git a/Assets/Adjust/Unity/AdjustAttribution.cs b/Assets/Adjust/Unity/AdjustAttribution.cs
@@ -36,8 +36,16 @@ public AdjustAttribution(string jsonString)
             clickLabel = AdjustUtils.GetJsonString(jsonNode, AdjustUtils.KeyClickLabel);
             adid = AdjustUtils.GetJsonString(jsonNode, AdjustUtils.KeyAdid);
             costType = AdjustUtils.GetJsonString(jsonNode, AdjustUtils.KeyCostType);
-            costAmount = double.Parse(AdjustUtils.GetJsonString(jsonNode, AdjustUtils.KeyCostAmount),
+            try
+            {
+                costAmount = double.Parse(AdjustUtils.GetJsonString(jsonNode, AdjustUtils.KeyCostAmount),
                 System.Globalization.CultureInfo.InvariantCulture);
+            }
+            catch (Exception)
+            {
+                // attribution response doesn't contain cost amount attached
+                // value will default to null
+            }
             costCurrency = AdjustUtils.GetJsonString(jsonNode, AdjustUtils.KeyCostCurrency);
         }
 
@@ -57,8 +65,16 @@ public AdjustAttribution(Dictionary<string, string> dicAttributionData)
             clickLabel = AdjustUtils.TryGetValue(dicAttributionData, AdjustUtils.KeyClickLabel);
             adid = AdjustUtils.TryGetValue(dicAttributionData, AdjustUtils.KeyAdid);
             costType = AdjustUtils.TryGetValue(dicAttributionData, AdjustUtils.KeyCostType);
-            costAmount = double.Parse(AdjustUtils.TryGetValue(dicAttributionData, AdjustUtils.KeyCostAmount),
+            try
+            {
+                costAmount = double.Parse(AdjustUtils.TryGetValue(dicAttributionData, AdjustUtils.KeyCostAmount),
                 System.Globalization.CultureInfo.InvariantCulture);
+            }
+            catch (Exception)
+            {
+                // attribution response doesn't contain cost amount attached
+                // value will default to null
+            }
             costCurrency = AdjustUtils.TryGetValue(dicAttributionData, AdjustUtils.KeyCostCurrency);
         }
     }

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.24.0";
+        private const string sdkPrefix = "unity4.24.1";
         private static bool appLaunched = false;
 
         public static void Start(AdjustConfig adjustConfig)

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.24.0";
+        private const string sdkPrefix = "unity4.24.1";
 
         [DllImport("__Internal")]
         private static extern void _AdjustLaunchApp(

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+### Version 4.24.1 (24th December 2020)
+#### Fixed
+- Fixed handling of native `null` values for cost amount.
+
+#### Native SDKs
+- [iOS@v4.24.0][ios_sdk_v4.24.0]
+- [Android@v4.25.0][android_sdk_v4.25.0]
+- [Windows@v4.17.0][windows_sdk_v4.17.0]
+
+---
+
 ### Version 4.24.0 (11th December 2020)
 #### Added
 - Added possibility to get cost data information in attribution callback.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.24.0
+4.24.1
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.24.0 from 3.4.4
+## Migrate your Adjust SDK for Unity3d to 4.24.1 from 3.4.4
 
 ### Migration procedure