Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 4.22.0 #182

Merged
merged 13 commits into from
Jun 4, 2020
Merged

Version 4.22.0 #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d08c4d5
Native submodules update
uerceg Jun 1, 2020
eea2ea1
New version 4.22.0
uerceg Jun 2, 2020
26ac336
Native binaries update
uerceg Jun 2, 2020
bb707e0
Update OAID plugin JAR with retry mechanism added
uerceg Jun 2, 2020
1c2457d
Initial subscription tracking implementation in C# layer
uerceg Jun 2, 2020
2d988cb
iOS subscription tracking implementation + testing
uerceg Jun 2, 2020
f33e7e0
Android subscription tracking implementation + testing
uerceg Jun 4, 2020
3c5e60d
Cleanup here and there
uerceg Jun 4, 2020
ce4831d
CHANGELOG.md update
uerceg Jun 4, 2020
af5398c
README update
uerceg Jun 4, 2020
2c74604
v4.22.0 version of OAID plugin JAR
uerceg Jun 4, 2020
d5cd3a5
Small fixes
uerceg Jun 4, 2020
1a261fc
CHANGELOG.md update
uerceg Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 43 additions & 1 deletion Assets/Adjust/Android/AdjustAndroid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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()
{
Expand Down
29 changes: 29 additions & 0 deletions Assets/Adjust/Android/Test/Java-WebSocket-1.4.0.jar.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Adjust/Android/Test/adjust-test.jar
View file
Open in desktop
Binary file not shown.
29 changes: 29 additions & 0 deletions Assets/Adjust/Android/Test/gson-2.8.6.jar.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 29 additions & 0 deletions Assets/Adjust/Android/Test/slf4j-api-1.7.30.jar.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Adjust/Android/adjust-android.jar
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions Assets/Adjust/Editor/AdjustEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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");
Expand Down
Loading