Merge pull request #198 from adjust/v4240

Version 4.24.0

Assets/Adjust/Android/AdjustAndroid.cs

@@ -8,7 +8,7 @@ namespace com.adjust.sdk
 #if UNITY_ANDROID
     public class AdjustAndroid
     {
-        private const string sdkPrefix = "unity4.23.2";
+        private const string sdkPrefix = "unity4.24.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");
@@ -86,6 +86,18 @@ public static void Start(AdjustConfig adjustConfig)
                 ajoAdjustConfig.Call("setSendInBackground", adjustConfig.sendInBackground.Value);
             }
 
+            // Check if user wants to get cost data in attribution callback.
+            if (adjustConfig.needsCost != null)
+            {
+                ajoAdjustConfig.Call("setNeedsCost", adjustConfig.needsCost.Value);
+            }
+
+            // Check if user wants to run preinstall campaigns.
+            if (adjustConfig.preinstallTrackingEnabled != null)
+            {
+                ajoAdjustConfig.Call("setPreinstallTrackingEnabled", adjustConfig.preinstallTrackingEnabled.Value);
+            }
+
             // Check if user has set user agent value.
             if (adjustConfig.userAgent != null)
             {
@@ -311,6 +323,21 @@ public static AdjustAttribution GetAttribution()
                     null : ajoAttribution.Get<string>(AdjustUtils.KeyClickLabel);
                 adjustAttribution.adid = ajoAttribution.Get<string>(AdjustUtils.KeyAdid) == "" ?
                     null : ajoAttribution.Get<string>(AdjustUtils.KeyAdid);
+                adjustAttribution.costType = ajoAttribution.Get<string>(AdjustUtils.KeyCostType) == "" ?
+                    null : ajoAttribution.Get<string>(AdjustUtils.KeyCostType);
+                AndroidJavaObject ajoCostAmount = ajoAttribution.Get<AndroidJavaObject>(AdjustUtils.KeyCostAmount) == null ?
+                    null : ajoAttribution.Get<AndroidJavaObject>(AdjustUtils.KeyCostAmount);
+                if (ajoCostAmount == null)
+                {
+                    adjustAttribution.costAmount = null;
+                }
+                else
+                {
+                    double costAmount = ajoCostAmount.Call<double>("doubleValue");
+                    adjustAttribution.costAmount = costAmount;
+                }
+                adjustAttribution.costCurrency = ajoAttribution.Get<string>(AdjustUtils.KeyCostCurrency) == "" ?
+                    null : ajoAttribution.Get<string>(AdjustUtils.KeyCostCurrency);
                 return adjustAttribution;
             }
             catch (Exception) {}
@@ -506,6 +533,21 @@ public void onAttributionChanged(AndroidJavaObject attribution)
                     null : attribution.Get<string>(AdjustUtils.KeyClickLabel);
                 adjustAttribution.adid = attribution.Get<string>(AdjustUtils.KeyAdid) == "" ?
                     null : attribution.Get<string>(AdjustUtils.KeyAdid);
+                adjustAttribution.costType = attribution.Get<string>(AdjustUtils.KeyCostType) == "" ?
+                    null : attribution.Get<string>(AdjustUtils.KeyCostType);
+                AndroidJavaObject ajoCostAmount = attribution.Get<AndroidJavaObject>(AdjustUtils.KeyCostAmount) == null ?
+                    null : attribution.Get<AndroidJavaObject>(AdjustUtils.KeyCostAmount);
+                if (ajoCostAmount == null)
+                {
+                    adjustAttribution.costAmount = null;
+                }
+                else
+                {
+                    double costAmount = ajoCostAmount.Call<double>("doubleValue");
+                    adjustAttribution.costAmount = costAmount;
+                }
+                adjustAttribution.costCurrency = attribution.Get<string>(AdjustUtils.KeyCostCurrency) == "" ?
+                    null : attribution.Get<string>(AdjustUtils.KeyCostCurrency);
                 callback(adjustAttribution);
             }
         }

Assets/Adjust/Test/CommandExecutor.cs

@@ -351,6 +351,9 @@ private void Config()
                     _testLibrary.AddInfoToSend("creative", attribution.creative);
                     _testLibrary.AddInfoToSend("clickLabel", attribution.clickLabel);
                     _testLibrary.AddInfoToSend("adid", attribution.adid);
+                    _testLibrary.AddInfoToSend("costType", attribution.costType);
+                    _testLibrary.AddInfoToSend("costAmount", attribution.costAmount.ToString());
+                    _testLibrary.AddInfoToSend("costCurrency", attribution.costCurrency);
                     _testLibrary.SendInfoToServer(localExtraPath);
                 });
             }

Assets/Adjust/Test/TestApp.cs

@@ -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.32";
+        private const string IP = "192.168.86.33";
 #elif UNITY_IOS
         private const string PORT = ":8080";
         private const string PROTOCOL = "http://";
-        private const string IP = "192.168.86.32";
+        private const string IP = "192.168.86.33";
         private TestLibraryiOS _testLibraryiOS;
 #endif
         private const string BASE_URL = PROTOCOL + IP + PORT;

Assets/Adjust/Unity/AdjustAttribution.cs

@@ -13,6 +13,9 @@ public class AdjustAttribution
         public string clickLabel { get; set; }
         public string trackerName { get; set; }
         public string trackerToken { get; set; }
+        public string costType { get; set; }
+        public double? costAmount { get; set; }
+        public string costCurrency { get; set; }
 
         public AdjustAttribution() {}
 
@@ -32,6 +35,10 @@ public AdjustAttribution(string jsonString)
             creative = AdjustUtils.GetJsonString(jsonNode, AdjustUtils.KeyCreative);
             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),
+                System.Globalization.CultureInfo.InvariantCulture);
+            costCurrency = AdjustUtils.GetJsonString(jsonNode, AdjustUtils.KeyCostCurrency);
         }
 
         public AdjustAttribution(Dictionary<string, string> dicAttributionData)
@@ -49,6 +56,10 @@ public AdjustAttribution(Dictionary<string, string> dicAttributionData)
             creative = AdjustUtils.TryGetValue(dicAttributionData, AdjustUtils.KeyCreative);
             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),
+                System.Globalization.CultureInfo.InvariantCulture);
+            costCurrency = AdjustUtils.TryGetValue(dicAttributionData, AdjustUtils.KeyCostCurrency);
         }
     }
 }

Assets/Adjust/Unity/AdjustConfig.cs

@@ -24,7 +24,7 @@ public class AdjustConfig
         internal bool? sendInBackground;
         internal bool? eventBufferingEnabled;
         internal bool? allowSuppressLogLevel;
-        internal bool? skAdNetworkHandling;
+        internal bool? needsCost;
         internal bool launchDeferredDeeplink;
         internal AdjustLogLevel? logLevel;
         internal AdjustEnvironment environment;
@@ -37,10 +37,12 @@ public class AdjustConfig
 
         // Android specific members
         internal bool? readImei;
+        internal bool? preinstallTrackingEnabled;
         internal string processName;
         // iOS specific members
         internal bool? allowiAdInfoReading;
         internal bool? allowIdfaReading;
+        internal bool? skAdNetworkHandling;
         // Windows specific members
         internal Action<String> logDelegate;
 
@@ -91,6 +93,11 @@ public void setEventBufferingEnabled(bool eventBufferingEnabled)
             this.eventBufferingEnabled = eventBufferingEnabled;
         }
 
+        public void setNeedsCost(bool needsCost)
+        {
+            this.needsCost = needsCost;
+        }
+
         public void setDelayStart(double delayStart)
         {
             this.delayStart = delayStart;
@@ -214,6 +221,11 @@ public void setReadMobileEquipmentIdentity(bool readMobileEquipmentIdentity)
             // this.readImei = readMobileEquipmentIdentity;
         }
 
+        public void setPreinstallTrackingEnabled(bool preinstallTrackingEnabled)
+        {
+            this.preinstallTrackingEnabled = preinstallTrackingEnabled;
+        }
+
         // Windows specific methods.
         public void setLogDelegate(Action<String> logDelegate)
         {

Assets/Adjust/Unity/AdjustUtils.cs

@@ -21,6 +21,9 @@ public class AdjustUtils
         public static string KeyTrackerName = "trackerName";
         public static string KeyTrackerToken = "trackerToken";
         public static string KeyJsonResponse = "jsonResponse";
+        public static string KeyCostType = "costType";
+        public static string KeyCostAmount = "costAmount";
+        public static string KeyCostCurrency = "costCurrency";
 
         // For testing purposes.
         public static string KeyTestOptionsBaseUrl = "baseUrl";

Assets/Adjust/Windows/AdjustWindows.cs

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

Assets/Adjust/iOS/ADJAttribution.h

@@ -53,6 +53,21 @@
  */
 @property (nonatomic, copy, nullable) NSString *adid;
 
+/**
+ * @brief Cost type.
+ */
+@property (nonatomic, copy, nullable) NSString *costType;
+
+/**
+ * @brief Cost amount.
+ */
+@property (nonatomic, copy, nullable) NSNumber *costAmount;
+
+/**
+ * @brief Cost currency.
+ */
+@property (nonatomic, copy, nullable) NSString *costCurrency;
+
 /**
  * @brief Make attribution object.
  * 

Assets/Adjust/iOS/ADJConfig.h

@@ -168,6 +168,11 @@
  */
 @property (nonatomic, assign) BOOL isDeviceKnown;
 
+/**
+ * @brief Set if cost data is needed in attribution response.
+ */
+@property (nonatomic, assign) BOOL needsCost;
+
 /**
  * @brief Adjust app secret id.
  */

Assets/Adjust/iOS/Adjust.h

@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust
 //
-//  V4.23.2
+//  V4.24.0
 //  Created by Christian Wellenbrock (wellle) on 23rd July 2013.
 //  Copyright © 2012-2017 Adjust GmbH. All rights reserved.
 //

Assets/Adjust/iOS/AdjustUnity.mm

@@ -68,7 +68,13 @@ BOOL isStringValid(const char* cString) {
 
 void addValueOrEmpty(NSMutableDictionary *dictionary, NSString *key, NSObject *value) {
     if (nil != value) {
-        [dictionary setObject:[NSString stringWithFormat:@"%@", value] forKey:key];
+        if ([value isKindOfClass:[NSString class]]) {
+            [dictionary setObject:[NSString stringWithFormat:@"%@", value] forKey:key];
+        } else if ([value isKindOfClass:[NSNumber class]]) {
+            [dictionary setObject:[NSString stringWithFormat:@"%@", [((NSNumber *)value) stringValue]] forKey:key];
+        } else {
+            [dictionary setObject:@"" forKey:key];
+        }
     } else {
         [dictionary setObject:@"" forKey:key];
     }
@@ -94,6 +100,7 @@ void _AdjustLaunchApp(const char* appToken,
                           int allowiAdInfoReading,
                           int allowIdfaReading,
                           int deactivateSkAdNetworkHandling,
+                          int needsCost,
                           int64_t secretId,
                           int64_t info1,
                           int64_t info2,
@@ -188,6 +195,11 @@ void _AdjustLaunchApp(const char* appToken,
             [adjustConfig setDelayStart:delayStart];
         }
 
+        // Cost data in attribution callback.
+        if (needsCost != -1) {
+            [adjustConfig setNeedsCost:(BOOL)needsCost];
+        }
+
         // User agent.
         if (stringUserAgent != nil) {
             [adjustConfig setUserAgent:stringUserAgent];
@@ -400,6 +412,9 @@ void _AdjustAppWillOpenUrl(const char* url) {
         addValueOrEmpty(dictionary, @"adgroup", attribution.adgroup);
         addValueOrEmpty(dictionary, @"clickLabel", attribution.clickLabel);
         addValueOrEmpty(dictionary, @"adid", attribution.adid);
+        addValueOrEmpty(dictionary, @"costType", attribution.costType);
+        addValueOrEmpty(dictionary, @"costAmount", attribution.costAmount);
+        addValueOrEmpty(dictionary, @"costCurrency", attribution.costCurrency);
 
         NSData *dataAttribution = [NSJSONSerialization dataWithJSONObject:dictionary options:0 error:nil];
         NSString *stringAttribution = [[NSString alloc] initWithBytes:[dataAttribution bytes]

Assets/Adjust/iOS/AdjustUnityDelegate.mm

@@ -91,6 +91,9 @@ - (void)adjustAttributionChangedWannabe:(ADJAttribution *)attribution {
     [self addValueOrEmpty:attribution.adgroup forKey:@"adgroup" toDictionary:dictionary];
     [self addValueOrEmpty:attribution.clickLabel forKey:@"clickLabel" toDictionary:dictionary];
     [self addValueOrEmpty:attribution.adid forKey:@"adid" toDictionary:dictionary];
+    [self addValueOrEmpty:attribution.costType forKey:@"costType" toDictionary:dictionary];
+    [self addValueOrEmpty:attribution.costAmount forKey:@"costAmount" toDictionary:dictionary];
+    [self addValueOrEmpty:attribution.costCurrency forKey:@"costCurrency" toDictionary:dictionary];
 
     NSData *dataAttribution = [NSJSONSerialization dataWithJSONObject:dictionary options:0 error:nil];
     NSString *stringAttribution = [[NSString alloc] initWithBytes:[dataAttribution bytes]
@@ -221,7 +224,13 @@ - (void)addValueOrEmpty:(NSObject *)value
                  forKey:(NSString *)key
            toDictionary:(NSMutableDictionary *)dictionary {
     if (nil != value) {
-        [dictionary setObject:[NSString stringWithFormat:@"%@", value] forKey:key];
+        if ([value isKindOfClass:[NSString class]]) {
+            [dictionary setObject:[NSString stringWithFormat:@"%@", value] forKey:key];
+        } else if ([value isKindOfClass:[NSNumber class]]) {
+            [dictionary setObject:[NSString stringWithFormat:@"%@", [((NSNumber *)value) stringValue]] forKey:key];
+        } else {
+            [dictionary setObject:@"" forKey:key];
+        }
     } else {
         [dictionary setObject:@"" forKey:key];
     }

Assets/Adjust/iOS/AdjustiOS.cs

@@ -8,7 +8,7 @@ namespace com.adjust.sdk
 #if UNITY_IOS
     public class AdjustiOS
     {
-        private const string sdkPrefix = "unity4.23.2";
+        private const string sdkPrefix = "unity4.24.0";
 
         [DllImport("__Internal")]
         private static extern void _AdjustLaunchApp(
@@ -28,6 +28,7 @@ private static extern void _AdjustLaunchApp(
             int allowiAdInfoReading,
             int allowIdfaReading,
             int deactivateSkAdNetworkHandling,
+            int needsCost,
             long secretId,
             long info1,
             long info2,
@@ -173,6 +174,7 @@ public static void Start(AdjustConfig adjustConfig)
             int allowSuppressLogLevel = AdjustUtils.ConvertBool(adjustConfig.allowSuppressLogLevel);
             int launchDeferredDeeplink = AdjustUtils.ConvertBool(adjustConfig.launchDeferredDeeplink);
             int deactivateSkAdNetworkHandling = AdjustUtils.ConvertBool(adjustConfig.skAdNetworkHandling);
+            int needsCost = AdjustUtils.ConvertBool(adjustConfig.needsCost);
             int isAttributionCallbackImplemented = AdjustUtils.ConvertBool(adjustConfig.getAttributionChangedDelegate() != null);
             int isEventSuccessCallbackImplemented = AdjustUtils.ConvertBool(adjustConfig.getEventSuccessDelegate() != null);
             int isEventFailureCallbackImplemented = AdjustUtils.ConvertBool(adjustConfig.getEventFailureDelegate() != null);
@@ -197,6 +199,7 @@ public static void Start(AdjustConfig adjustConfig)
                 allowiAdInfoReading,
                 allowIdfaReading,
                 deactivateSkAdNetworkHandling,
+                needsCost,
                 secretId,
                 info1,
                 info2,

CHANGELOG.md

@@ -1,3 +1,17 @@
+### Version 4.24.0 (11th December 2020)
+#### Added
+- Added possibility to get cost data information in attribution callback.
+- Added `setNeedsCost` method to `AdjustConfig` to indicate if cost data is needed in attribution callback (by default cost data will not be part of attribution callback if not enabled with this setter method).
+- Added `setPreinstallTrackingEnabled` method to `AdjustConfig` to allow enabling of preintall tracking (this feature is OFF by default).
+- Added support for MSA SDK v1.0.23 in OAID plugin.
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.24.0]
+- [[email protected]][android_sdk_v4.25.0]
+- [[email protected]][windows_sdk_v4.17.0]
+
+---
+
 ### Version 4.23.2 (2nd October 2020)
 #### Added
 - Added note to `Assets/Adjust` menu toggling actions that project needs to be saved in order for actions to take effect.
@@ -794,6 +808,7 @@
 [ios_sdk_v4.22.1]: https://github.com/adjust/ios_sdk/tree/v4.22.1
 [ios_sdk_v4.23.0]: https://github.com/adjust/ios_sdk/tree/v4.23.0
 [ios_sdk_v4.23.2]: https://github.com/adjust/ios_sdk/tree/v4.23.2
+[ios_sdk_v4.24.0]: https://github.com/adjust/ios_sdk/tree/v4.24.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
@@ -823,6 +838,7 @@
 [android_sdk_v4.22.0]: https://github.com/adjust/android_sdk/tree/v4.22.0
 [android_sdk_v4.24.0]: https://github.com/adjust/android_sdk/tree/v4.24.0
 [android_sdk_v4.24.1]: https://github.com/adjust/android_sdk/tree/v4.24.1
+[android_sdk_v4.25.0]: https://github.com/adjust/android_sdk/tree/v4.25.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

README.md

@@ -648,6 +648,11 @@ The callback function will be called when the SDK receives final attribution dat
 - `string creative` the creative grouping level of the current attribution
 - `string clickLabel` the click label of the current attribution
 - `string adid` the Adjust device identifier
+- `string costType` the cost type string
+- `double? costAmount` the cost amount
+- `string costCurrency` the cost currency string
+
+**Note**: The cost data - `costType`, `costAmount` & `costCurrency` are only available when configured in `AdjustConfig` by calling `setNeedsCost` method. If not configured or configured, but not being part of the attribution, these fields will have value `null`. This feature is available in SDK v4.24.0 and above.
 
 ### <a id="ad-ad-revenue"></a>Ad revenue tracking
 

VERSION

@@ -1 +1 @@
-4.23.2
+4.24.0

doc/english/migration/migrate.md

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