Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 1 addition & 5 deletions Assets/Adjust/Adjust.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,7 @@ void Awake() {
if (!this.startManually) {
AdjustConfig adjustConfig;

if (this.logLevel != AdjustLogLevel.Suppress) {
adjustConfig = new AdjustConfig(this.appToken, this.environment);
} else {
adjustConfig = new AdjustConfig(this.appToken, this.environment, true);
}
adjustConfig = new AdjustConfig(this.appToken, this.environment, (this.logLevel == AdjustLogLevel.Suppress));

adjustConfig.setLogLevel(this.logLevel);
adjustConfig.setSendInBackground(this.sendInBackground);
Expand Down
31 changes: 19 additions & 12 deletions Assets/Adjust/Android/AdjustAndroid.cs
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 : IAdjust {
#region Fields
private const string sdkPrefix = "unity4.10.2";
private const string sdkPrefix = "unity4.10.3";

private static bool launchDeferredDeeplink = true;

Expand Down Expand Up @@ -46,20 +46,23 @@ public void start(AdjustConfig adjustConfig) {

// Check if suppress log leve is supported.
if (adjustConfig.allowSuppressLogLevel != null) {
AndroidJavaObject ajoAllowSuppressLogLevel = new AndroidJavaObject("java.lang.Boolean", adjustConfig.allowSuppressLogLevel.Value);

ajoAdjustConfig = new AndroidJavaObject("com.adjust.sdk.AdjustConfig", ajoCurrentActivity, adjustConfig.appToken, ajoEnvironment, ajoAllowSuppressLogLevel);
ajoAdjustConfig = new AndroidJavaObject("com.adjust.sdk.AdjustConfig", ajoCurrentActivity, adjustConfig.appToken, ajoEnvironment, adjustConfig.allowSuppressLogLevel);
} else {
ajoAdjustConfig = new AndroidJavaObject("com.adjust.sdk.AdjustConfig", ajoCurrentActivity, adjustConfig.appToken, ajoEnvironment);
}


// Check if deferred deeplink should be launched by SDK.
launchDeferredDeeplink = adjustConfig.launchDeferredDeeplink;

// Check log level.
if (adjustConfig.logLevel != null) {
AndroidJavaObject ajoLogLevel = new AndroidJavaClass("com.adjust.sdk.LogLevel").GetStatic<AndroidJavaObject>(adjustConfig.logLevel.Value.uppercaseToString());
AndroidJavaObject ajoLogLevel;

if (adjustConfig.logLevel.Value.uppercaseToString().Equals("SUPPRESS")) {
ajoLogLevel = new AndroidJavaClass("com.adjust.sdk.LogLevel").GetStatic<AndroidJavaObject>("SUPRESS");
} else {
ajoLogLevel = new AndroidJavaClass("com.adjust.sdk.LogLevel").GetStatic<AndroidJavaObject>(adjustConfig.logLevel.Value.uppercaseToString());
}

if (ajoLogLevel != null) {
ajoAdjustConfig.Call("setLogLevel", ajoLogLevel);
Expand Down Expand Up @@ -147,7 +150,7 @@ public void start(AdjustConfig adjustConfig) {
public void trackEvent(AdjustEvent adjustEvent) {
AndroidJavaObject ajoAdjustEvent = new AndroidJavaObject("com.adjust.sdk.AdjustEvent", adjustEvent.eventToken);

if (adjustEvent.revenue != null && adjustEvent.currency != null) {
if (adjustEvent.revenue != null) {
ajoAdjustEvent.Call("setRevenue", (double)adjustEvent.revenue, adjustEvent.currency);
}

Expand All @@ -169,6 +172,10 @@ public void trackEvent(AdjustEvent adjustEvent) {
}
}

if (adjustEvent.transactionId != null) {
ajoAdjustEvent.Call("setOrderId", adjustEvent.transactionId);
}

ajcAdjust.CallStatic("trackEvent", ajoAdjustEvent);
}

Expand Down Expand Up @@ -273,7 +280,7 @@ public AttributionChangeListener(Action<AdjustAttribution> pCallback) : base("co
}

public void onAttributionChanged(AndroidJavaObject attribution) {
if (callback == null) {
if (callback == null) {
return;
}

Expand Down Expand Up @@ -319,7 +326,7 @@ public EventTrackingSucceededListener(Action<AdjustEventSuccess> pCallback) : ba
}

public void onFinishedEventTrackingSucceeded(AndroidJavaObject eventSuccessData) {
if (callback == null) {
if (callback == null) {
return;
}

Expand Down Expand Up @@ -355,7 +362,7 @@ public EventTrackingFailedListener(Action<AdjustEventFailure> pCallback) : base(
}

public void onFinishedEventTrackingFailed(AndroidJavaObject eventFailureData) {
if (callback == null) {
if (callback == null) {
return;
}

Expand Down Expand Up @@ -392,7 +399,7 @@ public SessionTrackingSucceededListener(Action<AdjustSessionSuccess> pCallback)
}

public void onFinishedSessionTrackingSucceeded(AndroidJavaObject sessionSuccessData) {
if (callback == null) {
if (callback == null) {
return;
}

Expand Down Expand Up @@ -427,7 +434,7 @@ public SessionTrackingFailedListener(Action<AdjustSessionFailure> pCallback) : b
}

public void onFinishedSessionTrackingFailed(AndroidJavaObject sessionFailureData) {
if (callback == null) {
if (callback == null) {
return;
}

Expand Down
Binary file modified Assets/Adjust/Android/adjust-android.jar
Binary file not shown.
10 changes: 5 additions & 5 deletions Assets/Adjust/ExampleGUI/ExampleGUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ void OnGUI() {

if (GUI.Button(new Rect(0, Screen.height * 0 / numberOfButtons, Screen.width, Screen.height / numberOfButtons), txtManualLaunch)) {
if (!string.Equals(txtManualLaunch, "SDK Launched", StringComparison.OrdinalIgnoreCase)) {
AdjustConfig adjustConfig = new AdjustConfig("{YourAppToken}", AdjustEnvironment.Sandbox);
AdjustConfig adjustConfig = new AdjustConfig("2fm9gkqubvpc", AdjustEnvironment.Sandbox);
adjustConfig.setLogLevel(AdjustLogLevel.Verbose);
adjustConfig.setLogDelegate(msg => Debug.Log(msg));
adjustConfig.setSendInBackground(true);
Expand All @@ -46,19 +46,19 @@ void OnGUI() {
}

if (GUI.Button(new Rect(0, Screen.height * 1 / numberOfButtons, Screen.width, Screen.height / numberOfButtons), "Track Simple Event")) {
AdjustEvent adjustEvent = new AdjustEvent("{YourEventToken}");
AdjustEvent adjustEvent = new AdjustEvent("g3mfiw");
Adjust.trackEvent(adjustEvent);
}

if (GUI.Button(new Rect(0, Screen.height * 2 / numberOfButtons, Screen.width, Screen.height / numberOfButtons), "Track Revenue Event")) {
AdjustEvent adjustEvent = new AdjustEvent("{YourEventToken}");
AdjustEvent adjustEvent = new AdjustEvent("a4fd35");
adjustEvent.setRevenue(0.25, "EUR");

Adjust.trackEvent(adjustEvent);
}

if (GUI.Button(new Rect(0, Screen.height * 3 / numberOfButtons, Screen.width, Screen.height / numberOfButtons), "Track Callback Event")) {
AdjustEvent adjustEvent = new AdjustEvent("{YourEventToken}");
AdjustEvent adjustEvent = new AdjustEvent("34vgg9");

adjustEvent.addCallbackParameter("key", "value");
adjustEvent.addCallbackParameter("foo", "bar");
Expand All @@ -67,7 +67,7 @@ void OnGUI() {
}

if (GUI.Button(new Rect(0, Screen.height * 4 / numberOfButtons, Screen.width, Screen.height / numberOfButtons), "Track Partner Event")) {
AdjustEvent adjustEvent = new AdjustEvent("{YourEventToken}");
AdjustEvent adjustEvent = new AdjustEvent("w788qs");

adjustEvent.addPartnerParameter("key", "value");
adjustEvent.addPartnerParameter("foo", "bar");
Expand Down
2 changes: 1 addition & 1 deletion Assets/Adjust/Metro/AdjustMetro.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace com.adjust.sdk {
public class AdjustMetro : IAdjust {
private const string sdkPrefix = "unity4.10.2";
private const string sdkPrefix = "unity4.10.3";

public bool isEnabled() {
return AdjustWS.IsEnabled();
Expand Down
2 changes: 1 addition & 1 deletion Assets/Adjust/WP8/AdjustWP8.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace com.adjust.sdk {
public class AdjustWP8 : IAdjust {
private const string sdkPrefix = "unity4.10.2";
private const string sdkPrefix = "unity4.10.3";

public bool isEnabled() {
return AdjustWP.IsEnabled();
Expand Down
1 change: 0 additions & 1 deletion Assets/Adjust/iOS/ADJConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@
@property (nonatomic, copy) NSString *userAgent;

@property (nonatomic, assign, readonly) BOOL hasResponseDelegate;
@property (nonatomic, assign, readonly) BOOL hasAttributionChangedDelegate;

- (BOOL) isValid;
@end
1 change: 1 addition & 0 deletions Assets/Adjust/iOS/Adjust.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Adjust.h
// Adjust
//
// V4.10.3
// Created by Christian Wellenbrock on 2012-07-23.
// Copyright (c) 2012-2014 adjust GmbH. All rights reserved.
//
Expand Down
Binary file modified Assets/Adjust/iOS/AdjustSdk.a
Binary file not shown.
9 changes: 1 addition & 8 deletions Assets/Adjust/iOS/AdjustUnity.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
#import "Adjust.h"

@interface AdjustUnity : NSObject<AdjustDelegate>

- (void)adjustAttributionChanged:(ADJAttribution *)attribution;
- (void)adjustEventTrackingSucceeded:(ADJEventSuccess *)eventSuccessResponseData;
- (void)adjustEventTrackingFailed:(ADJEventFailure *)eventFailureResponseData;
- (void)adjustSessionTrackingSucceeded:(ADJSessionSuccess *)sessionSuccessResponseData;
- (void)adjustSessionTrackingFailed:(ADJSessionFailure *)sessionFailureResponseData;
- (BOOL)adjustDeeplinkResponse:(NSURL *)deeplink;
@interface AdjustUnity : NSObject

@end
Loading