Skip to content

Commit 1b0016f

Browse files
uerceguerceg
authored
Merge pull request #94 from adjust/v4103
Version 4.10.3
2 parents 1f5337f + bbba879 commit 1b0016f

21 files changed

+370
-248
lines changed

‎Assets/Adjust/Adjust.cs

+1-5
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@ void Awake() {
4040
if (!this.startManually) {
4141
AdjustConfig adjustConfig;
4242

43-
if (this.logLevel != AdjustLogLevel.Suppress) {
44-
adjustConfig = new AdjustConfig(this.appToken, this.environment);
45-
} else {
46-
adjustConfig = new AdjustConfig(this.appToken, this.environment, true);
47-
}
43+
adjustConfig = new AdjustConfig(this.appToken, this.environment, (this.logLevel == AdjustLogLevel.Suppress));
4844

4945
adjustConfig.setLogLevel(this.logLevel);
5046
adjustConfig.setSendInBackground(this.sendInBackground);

‎Assets/Adjust/Android/AdjustAndroid.cs

+19-12
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace com.adjust.sdk {
88
#if UNITY_ANDROID
99
public class AdjustAndroid : IAdjust {
1010
#region Fields
11-
private const string sdkPrefix = "unity4.10.2";
11+
private const string sdkPrefix = "unity4.10.3";
1212

1313
private static bool launchDeferredDeeplink = true;
1414

@@ -46,20 +46,23 @@ public void start(AdjustConfig adjustConfig) {
4646

4747
// Check if suppress log leve is supported.
4848
if (adjustConfig.allowSuppressLogLevel != null) {
49-
AndroidJavaObject ajoAllowSuppressLogLevel = new AndroidJavaObject("java.lang.Boolean", adjustConfig.allowSuppressLogLevel.Value);
50-
51-
ajoAdjustConfig = new AndroidJavaObject("com.adjust.sdk.AdjustConfig", ajoCurrentActivity, adjustConfig.appToken, ajoEnvironment, ajoAllowSuppressLogLevel);
49+
ajoAdjustConfig = new AndroidJavaObject("com.adjust.sdk.AdjustConfig", ajoCurrentActivity, adjustConfig.appToken, ajoEnvironment, adjustConfig.allowSuppressLogLevel);
5250
} else {
5351
ajoAdjustConfig = new AndroidJavaObject("com.adjust.sdk.AdjustConfig", ajoCurrentActivity, adjustConfig.appToken, ajoEnvironment);
5452
}
55-
5653

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

6057
// Check log level.
6158
if (adjustConfig.logLevel != null) {
62-
AndroidJavaObject ajoLogLevel = new AndroidJavaClass("com.adjust.sdk.LogLevel").GetStatic<AndroidJavaObject>(adjustConfig.logLevel.Value.uppercaseToString());
59+
AndroidJavaObject ajoLogLevel;
60+
61+
if (adjustConfig.logLevel.Value.uppercaseToString().Equals("SUPPRESS")) {
62+
ajoLogLevel = new AndroidJavaClass("com.adjust.sdk.LogLevel").GetStatic<AndroidJavaObject>("SUPRESS");
63+
} else {
64+
ajoLogLevel = new AndroidJavaClass("com.adjust.sdk.LogLevel").GetStatic<AndroidJavaObject>(adjustConfig.logLevel.Value.uppercaseToString());
65+
}
6366

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

150-
if (adjustEvent.revenue != null && adjustEvent.currency != null) {
153+
if (adjustEvent.revenue != null) {
151154
ajoAdjustEvent.Call("setRevenue", (double)adjustEvent.revenue, adjustEvent.currency);
152155
}
153156

@@ -169,6 +172,10 @@ public void trackEvent(AdjustEvent adjustEvent) {
169172
}
170173
}
171174

175+
if (adjustEvent.transactionId != null) {
176+
ajoAdjustEvent.Call("setOrderId", adjustEvent.transactionId);
177+
}
178+
172179
ajcAdjust.CallStatic("trackEvent", ajoAdjustEvent);
173180
}
174181

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

275282
public void onAttributionChanged(AndroidJavaObject attribution) {
276-
if (callback == null) {
283+
if (callback == null) {
277284
return;
278285
}
279286

@@ -319,7 +326,7 @@ public EventTrackingSucceededListener(Action<AdjustEventSuccess> pCallback) : ba
319326
}
320327

321328
public void onFinishedEventTrackingSucceeded(AndroidJavaObject eventSuccessData) {
322-
if (callback == null) {
329+
if (callback == null) {
323330
return;
324331
}
325332

@@ -355,7 +362,7 @@ public EventTrackingFailedListener(Action<AdjustEventFailure> pCallback) : base(
355362
}
356363

357364
public void onFinishedEventTrackingFailed(AndroidJavaObject eventFailureData) {
358-
if (callback == null) {
365+
if (callback == null) {
359366
return;
360367
}
361368

@@ -392,7 +399,7 @@ public SessionTrackingSucceededListener(Action<AdjustSessionSuccess> pCallback)
392399
}
393400

394401
public void onFinishedSessionTrackingSucceeded(AndroidJavaObject sessionSuccessData) {
395-
if (callback == null) {
402+
if (callback == null) {
396403
return;
397404
}
398405

@@ -427,7 +434,7 @@ public SessionTrackingFailedListener(Action<AdjustSessionFailure> pCallback) : b
427434
}
428435

429436
public void onFinishedSessionTrackingFailed(AndroidJavaObject sessionFailureData) {
430-
if (callback == null) {
437+
if (callback == null) {
431438
return;
432439
}
433440

‎Assets/Adjust/Android/adjust-android.jar

609 Bytes
Binary file not shown.

‎Assets/Adjust/ExampleGUI/ExampleGUI.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void OnGUI() {
2525

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

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

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

5757
Adjust.trackEvent(adjustEvent);
5858
}
5959

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

6363
adjustEvent.addCallbackParameter("key", "value");
6464
adjustEvent.addCallbackParameter("foo", "bar");
@@ -67,7 +67,7 @@ void OnGUI() {
6767
}
6868

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

7272
adjustEvent.addPartnerParameter("key", "value");
7373
adjustEvent.addPartnerParameter("foo", "bar");

‎Assets/Adjust/Metro/AdjustMetro.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace com.adjust.sdk {
1010
public class AdjustMetro : IAdjust {
11-
private const string sdkPrefix = "unity4.10.2";
11+
private const string sdkPrefix = "unity4.10.3";
1212

1313
public bool isEnabled() {
1414
return AdjustWS.IsEnabled();

‎Assets/Adjust/WP8/AdjustWP8.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace com.adjust.sdk {
1010
public class AdjustWP8 : IAdjust {
11-
private const string sdkPrefix = "unity4.10.2";
11+
private const string sdkPrefix = "unity4.10.3";
1212

1313
public bool isEnabled() {
1414
return AdjustWP.IsEnabled();

‎Assets/Adjust/iOS/ADJConfig.h

-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@
171171
@property (nonatomic, copy) NSString *userAgent;
172172

173173
@property (nonatomic, assign, readonly) BOOL hasResponseDelegate;
174-
@property (nonatomic, assign, readonly) BOOL hasAttributionChangedDelegate;
175174

176175
- (BOOL) isValid;
177176
@end

‎Assets/Adjust/iOS/Adjust.h

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Adjust.h
33
// Adjust
44
//
5+
// V4.10.3
56
// Created by Christian Wellenbrock on 2012-07-23.
67
// Copyright (c) 2012-2014 adjust GmbH. All rights reserved.
78
//

‎Assets/Adjust/iOS/AdjustSdk.a

12.8 KB
Binary file not shown.

‎Assets/Adjust/iOS/AdjustUnity.h

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
#import "Adjust.h"
22

3-
@interface AdjustUnity : NSObject<AdjustDelegate>
4-
5-
- (void)adjustAttributionChanged:(ADJAttribution *)attribution;
6-
- (void)adjustEventTrackingSucceeded:(ADJEventSuccess *)eventSuccessResponseData;
7-
- (void)adjustEventTrackingFailed:(ADJEventFailure *)eventFailureResponseData;
8-
- (void)adjustSessionTrackingSucceeded:(ADJSessionSuccess *)sessionSuccessResponseData;
9-
- (void)adjustSessionTrackingFailed:(ADJSessionFailure *)sessionFailureResponseData;
10-
- (BOOL)adjustDeeplinkResponse:(NSURL *)deeplink;
3+
@interface AdjustUnity : NSObject
114

125
@end

0 commit comments

Comments
 (0)