Merge pull request #182 from adjust/v4220

Version 4.22.0
adjust · Jun 4, 2020 · 34f9724 · 34f9724
2 parents f2a4681 + 1a261fc
commit 34f9724
Show file tree

Hide file tree

Showing 32 changed files with 769 additions and 88 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.21.3";
+        private const string sdkPrefix = "unity4.22.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");
@@ -374,6 +374,48 @@ public static void TrackAdRevenue(string source, string payload)
             ajcAdjust.CallStatic("trackAdRevenue", source, jsonPayload);
         }
 
+        public static void TrackPlayStoreSubscription(AdjustPlayStoreSubscription subscription)
+        {
+            AndroidJavaObject ajoSubscription = new AndroidJavaObject("com.adjust.sdk.AdjustPlayStoreSubscription",
+                Convert.ToInt64(subscription.price),
+                subscription.currency,
+                subscription.sku,
+                subscription.orderId,
+                subscription.signature,
+                subscription.purchaseToken);
+
+            // Check if user has set purchase time for subscription.
+            if (subscription.purchaseTime != null)
+            {
+                ajoSubscription.Call("setPurchaseTime", Convert.ToInt64(subscription.purchaseTime));
+            }
+
+            // Check if user has added any callback parameters to the subscription.
+            if (subscription.callbackList != null)
+            {
+                for (int i = 0; i < subscription.callbackList.Count; i += 2)
+                {
+                    string key = subscription.callbackList[i];
+                    string value = subscription.callbackList[i + 1];
+                    ajoSubscription.Call("addCallbackParameter", key, value);
+                }
+            }
+
+            // Check if user has added any partner parameters to the subscription.
+            if (subscription.partnerList != null)
+            {
+                for (int i = 0; i < subscription.partnerList.Count; i += 2)
+                {
+                    string key = subscription.partnerList[i];
+                    string value = subscription.partnerList[i + 1];
+                    ajoSubscription.Call("addPartnerParameter", key, value);
+                }
+            }
+
+            // Track the subscription.
+            ajcAdjust.CallStatic("trackPlayStoreSubscription", ajoSubscription);
+        }
+
         // Android specific methods.
         public static void OnPause()
         {

diff --git a/Assets/Adjust/Android/Test/Java-WebSocket-1.4.0.jar.meta b/Assets/Adjust/Android/Test/Java-WebSocket-1.4.0.jar.meta
diff --git a/Assets/Adjust/Android/Test/adjust-test.jar b/Assets/Adjust/Android/Test/adjust-test.jar
diff --git a/Assets/Adjust/Android/Test/gson-2.8.6.jar.meta b/Assets/Adjust/Android/Test/gson-2.8.6.jar.meta
diff --git a/Assets/Adjust/Android/Test/slf4j-api-1.7.30.jar.meta b/Assets/Adjust/Android/Test/slf4j-api-1.7.30.jar.meta
diff --git a/Assets/Adjust/Android/adjust-android.jar b/Assets/Adjust/Android/adjust-android.jar
diff --git a/Assets/Adjust/Editor/AdjustEditor.cs b/Assets/Adjust/Editor/AdjustEditor.cs
@@ -57,6 +57,7 @@ static void ExportAdjustUnityPackage()
         assetsToExport.Add(assetsPath + "/iOS/ADJLogger.h");
         assetsToExport.Add(assetsPath + "/iOS/ADJSessionFailure.h");
         assetsToExport.Add(assetsPath + "/iOS/ADJSessionSuccess.h");
+        assetsToExport.Add(assetsPath + "/iOS/ADJSubscription.h");
         assetsToExport.Add(assetsPath + "/iOS/Adjust.h");
         assetsToExport.Add(assetsPath + "/iOS/AdjustiOS.cs");
         assetsToExport.Add(assetsPath + "/iOS/AdjustSdk.a");
@@ -68,13 +69,15 @@ static void ExportAdjustUnityPackage()
         assetsToExport.Add(assetsPath + "/Prefab/Adjust.prefab");
 
         assetsToExport.Add(assetsPath + "/Unity/Adjust.cs");
+        assetsToExport.Add(assetsPath + "/Unity/AdjustAppStoreSubscription.cs");
         assetsToExport.Add(assetsPath + "/Unity/AdjustAttribution.cs");
         assetsToExport.Add(assetsPath + "/Unity/AdjustConfig.cs");
         assetsToExport.Add(assetsPath + "/Unity/AdjustEnvironment.cs");
         assetsToExport.Add(assetsPath + "/Unity/AdjustEvent.cs");
         assetsToExport.Add(assetsPath + "/Unity/AdjustEventFailure.cs");
         assetsToExport.Add(assetsPath + "/Unity/AdjustEventSuccess.cs");
         assetsToExport.Add(assetsPath + "/Unity/AdjustLogLevel.cs");
+        assetsToExport.Add(assetsPath + "/Unity/AdjustPlayStoreSubscription.cs");
         assetsToExport.Add(assetsPath + "/Unity/AdjustSessionFailure.cs");
         assetsToExport.Add(assetsPath + "/Unity/AdjustSessionSuccess.cs");
         assetsToExport.Add(assetsPath + "/Unity/AdjustUtils.cs");