Skip to content

Commit cbb6e64

Browse files
uerceguerceg
authored
Merge pull request #282 from adjust/v4360
Version 4.36.0
2 parents 7a6ddcc + 52fc1a1 commit cbb6e64

File tree

16 files changed

+121
-9
lines changed

16 files changed

+121
-9
lines changed

‎Assets/Adjust/Android/AdjustAndroid.cs‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace com.adjust.sdk
88
#if UNITY_ANDROID
99
public class AdjustAndroid
1010
{
11-
private const string sdkPrefix = "unity4.35.2";
11+
private const string sdkPrefix = "unity4.36.0";
1212
private static bool launchDeferredDeeplink = true;
1313
private static AndroidJavaClass ajcAdjust = new AndroidJavaClass("com.adjust.sdk.Adjust");
1414
private static AndroidJavaObject ajoCurrentActivity = new AndroidJavaClass("com.unity3d.player.UnityPlayer").GetStatic<AndroidJavaObject>("currentActivity");
@@ -93,6 +93,12 @@ public static void Start(AdjustConfig adjustConfig)
9393
ajoAdjustConfig.Call("setFinalAttributionEnabled", adjustConfig.finalAndroidAttributionEnabled.Value);
9494
}
9595

96+
// Check read Android IDs only once.
97+
if (adjustConfig.readDeviceInfoOnceEnabled != null)
98+
{
99+
ajoAdjustConfig.Call("setReadDeviceInfoOnceEnabled", adjustConfig.readDeviceInfoOnceEnabled.Value);
100+
}
101+
96102
// Check Play Store Kids Apps setting.
97103
if (adjustConfig.playStoreKidsAppEnabled != null)
98104
{
@@ -123,6 +129,12 @@ public static void Start(AdjustConfig adjustConfig)
123129
ajoAdjustConfig.Call("setPreinstallFilePath", adjustConfig.preinstallFilePath);
124130
}
125131

132+
// Check if FB app ID has been set.
133+
if (adjustConfig.fbAppId != null)
134+
{
135+
ajoAdjustConfig.Call("setFbAppId", adjustConfig.fbAppId);
136+
}
137+
126138
// Check if user has set user agent value.
127139
if (adjustConfig.userAgent != null)
128140
{
@@ -165,6 +177,11 @@ public static void Start(AdjustConfig adjustConfig)
165177
AndroidJavaObject ajoUrlStrategyCn = new AndroidJavaClass("com.adjust.sdk.AdjustConfig").GetStatic<AndroidJavaObject>("URL_STRATEGY_CN");
166178
ajoAdjustConfig.Call("setUrlStrategy", ajoUrlStrategyCn);
167179
}
180+
else if (adjustConfig.urlStrategy == AdjustConfig.AdjustUrlStrategyCnOnly)
181+
{
182+
AndroidJavaObject ajoUrlStrategyCnOnly = new AndroidJavaClass("com.adjust.sdk.AdjustConfig").GetStatic<AndroidJavaObject>("URL_STRATEGY_CN_ONLY");
183+
ajoAdjustConfig.Call("setUrlStrategy", ajoUrlStrategyCnOnly);
184+
}
168185
else if (adjustConfig.urlStrategy == AdjustConfig.AdjustDataResidencyEU)
169186
{
170187
AndroidJavaObject ajoDataResidencyEU = new AndroidJavaClass("com.adjust.sdk.AdjustConfig").GetStatic<AndroidJavaObject>("DATA_RESIDENCY_EU");

‎Assets/Adjust/Android/AdjustAndroidManifest.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@
1919
<uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE" />
2020
<uses-permission android:name="com.google.android.gms.permission.AD_ID" />
2121

22+
<queries>
23+
<package android:name="com.facebook.katana" />
24+
</queries>
25+
<queries>
26+
<package android:name="com.instagram.android" />
27+
</queries>
28+
2229
<application
2330
android:theme="@style/UnityThemeSelector"
2431
android:icon="@drawable/app_icon"

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

7.26 KB
Binary file not shown.

‎Assets/Adjust/Unity/Adjust.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -779,6 +779,27 @@ public static string getIdfa()
779779
#endif
780780
}
781781

782+
public static string getIdfv()
783+
{
784+
if (IsEditor())
785+
{
786+
return string.Empty;
787+
}
788+
789+
#if UNITY_IOS
790+
return AdjustiOS.GetIdfv();
791+
#elif UNITY_ANDROID
792+
Debug.Log("[Adjust]: Error! IDFV is not available on Android platform.");
793+
return string.Empty;
794+
#elif (UNITY_WSA || UNITY_WP8)
795+
Debug.Log("[Adjust]: Error! IDFV is not available on Windows platform.");
796+
return string.Empty;
797+
#else
798+
Debug.Log(errorMsgPlatform);
799+
return string.Empty;
800+
#endif
801+
}
802+
782803
public static string getSdkVersion()
783804
{
784805
if (IsEditor())

‎Assets/Adjust/Unity/AdjustConfig.cs‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ public class AdjustConfig
77
public const string AdjustUrlStrategyChina = "china";
88
public const string AdjustUrlStrategyIndia = "india";
99
public const string AdjustUrlStrategyCn = "cn";
10+
public const string AdjustUrlStrategyCnOnly = "cn-only";
1011

1112
public const string AdjustDataResidencyEU = "data-residency-eu";
1213
public const string AdjustDataResidencyTR = "data-residency-tr";
@@ -20,6 +21,8 @@ public class AdjustConfig
2021
public const string AdjustAdRevenueSourceUnity = "unity_sdk";
2122
public const string AdjustAdRevenueSourceHeliumChartboost = "helium_chartboost_sdk";
2223
public const string AdjustAdRevenueSourcePublisher = "publisher_sdk";
24+
public const string AdjustAdRevenueSourceTopOn = "topon_sdk";
25+
public const string AdjustAdRevenueSourceAdx = "adx_sdk";
2326

2427
internal string appToken;
2528
internal string sceneName;
@@ -41,7 +44,6 @@ public class AdjustConfig
4144
internal bool? allowSuppressLogLevel;
4245
internal bool? needsCost;
4346
internal bool launchDeferredDeeplink;
44-
internal bool? finalAndroidAttributionEnabled;
4547
internal AdjustLogLevel? logLevel;
4648
internal AdjustEnvironment environment;
4749
internal Action<string> deferredDeeplinkDelegate;
@@ -58,6 +60,9 @@ public class AdjustConfig
5860
internal bool? readImei;
5961
internal bool? preinstallTrackingEnabled;
6062
internal string preinstallFilePath;
63+
internal bool? finalAndroidAttributionEnabled;
64+
internal string fbAppId;
65+
internal bool? readDeviceInfoOnceEnabled;
6166
// iOS specific members
6267
internal bool? allowAdServicesInfoReading;
6368
internal bool? allowIdfaReading;
@@ -304,6 +309,16 @@ public void setFinalAndroidAttributionEnabled(bool finalAndroidAttributionEnable
304309
this.finalAndroidAttributionEnabled = finalAndroidAttributionEnabled;
305310
}
306311

312+
public void setFbAppId(string fbAppId)
313+
{
314+
this.fbAppId = fbAppId;
315+
}
316+
317+
public void setReadDeviceInfoOnceEnabled(bool readDeviceInfoOnceEnabled)
318+
{
319+
this.readDeviceInfoOnceEnabled = readDeviceInfoOnceEnabled;
320+
}
321+
307322
// Windows specific methods.
308323
public void setLogDelegate(Action<String> logDelegate)
309324
{

‎Assets/Adjust/Windows/AdjustWindows.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace com.adjust.sdk
1717
{
1818
public class AdjustWindows
1919
{
20-
private const string sdkPrefix = "unity4.35.2";
20+
private const string sdkPrefix = "unity4.36.0";
2121
private static bool appLaunched = false;
2222

2323
public static void Start(AdjustConfig adjustConfig)

‎Assets/Adjust/iOS/Adjust.h‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Adjust.h
33
// Adjust SDK
44
//
5-
// V4.35.2
5+
// V4.36.0
66
// Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
77
// Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
88
//
@@ -54,13 +54,16 @@ extern NSString * __nonnull const ADJAdRevenueSourceAdMost;
5454
extern NSString * __nonnull const ADJAdRevenueSourceUnity;
5555
extern NSString * __nonnull const ADJAdRevenueSourceHeliumChartboost;
5656
extern NSString * __nonnull const ADJAdRevenueSourcePublisher;
57+
extern NSString * __nonnull const ADJAdRevenueSourceTopOn;
58+
extern NSString * __nonnull const ADJAdRevenueSourceADX;
5759

5860
/**
5961
* Constants for country app's URL strategies.
6062
*/
6163
extern NSString * __nonnull const ADJUrlStrategyIndia;
6264
extern NSString * __nonnull const ADJUrlStrategyChina;
6365
extern NSString * __nonnull const ADJUrlStrategyCn;
66+
extern NSString * __nonnull const ADJUrlStrategyCnOnly;
6467
extern NSString * __nonnull const ADJDataResidencyEU;
6568
extern NSString * __nonnull const ADJDataResidencyTR;
6669
extern NSString * __nonnull const ADJDataResidencyUS;
@@ -164,6 +167,14 @@ extern NSString * __nonnull const ADJDataResidencyUS;
164167
*/
165168
+ (nullable NSString *)idfa;
166169

170+
/**
171+
* @brief Retrieve iOS device IDFV value.
172+
*
173+
* @return Device IDFV value.
174+
*/
175+
+ (nullable NSString *)idfv;
176+
177+
167178
/**
168179
* @brief Get current adjust identifier for the user.
169180
*

‎Assets/Adjust/iOS/AdjustSdk.a‎

9.05 KB
Binary file not shown.

‎Assets/Adjust/iOS/AdjustUnity.mm‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,8 @@ void _AdjustLaunchApp(const char* appToken,
245245
[adjustConfig setUrlStrategy:ADJUrlStrategyIndia];
246246
} else if ([stringUrlStrategy isEqualToString:@"cn"]) {
247247
[adjustConfig setUrlStrategy:ADJUrlStrategyCn];
248+
} else if ([stringUrlStrategy isEqualToString:@"cn-only"]) {
249+
[adjustConfig setUrlStrategy:ADJUrlStrategyCnOnly];
248250
} else if ([stringUrlStrategy isEqualToString:@"data-residency-eu"]) {
249251
[adjustConfig setUrlStrategy:ADJDataResidencyEU];
250252
} else if ([stringUrlStrategy isEqualToString:@"data-residency-tr"]) {
@@ -410,6 +412,21 @@ void _AdjustAppWillOpenUrl(const char* url) {
410412
return idfaCStringCopy;
411413
}
412414

415+
char* _AdjustGetIdfv() {
416+
NSString *idfv = [Adjust idfv];
417+
if (nil == idfv) {
418+
return NULL;
419+
}
420+
421+
const char* idfvCString = [idfv UTF8String];
422+
if (NULL == idfvCString) {
423+
return NULL;
424+
}
425+
426+
char* idfvCStringCopy = strdup(idfvCString);
427+
return idfvCStringCopy;
428+
}
429+
413430
char* _AdjustGetAdid() {
414431
NSString *adid = [Adjust adid];
415432
if (nil == adid) {

‎Assets/Adjust/iOS/AdjustiOS.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace com.adjust.sdk
88
#if UNITY_IOS
99
public class AdjustiOS
1010
{
11-
private const string sdkPrefix = "unity4.35.2";
11+
private const string sdkPrefix = "unity4.36.0";
1212

1313
[DllImport("__Internal")]
1414
private static extern void _AdjustLaunchApp(
@@ -79,6 +79,9 @@ private static extern void _AdjustTrackEvent(
7979
[DllImport("__Internal")]
8080
private static extern string _AdjustGetIdfa();
8181

82+
[DllImport("__Internal")]
83+
private static extern string _AdjustGetIdfv();
84+
8285
[DllImport("__Internal")]
8386
private static extern string _AdjustGetAdid();
8487

@@ -467,6 +470,11 @@ public static string GetIdfa()
467470
return _AdjustGetIdfa();
468471
}
469472

473+
public static string GetIdfv()
474+
{
475+
return _AdjustGetIdfv();
476+
}
477+
470478
public static string GetAdid()
471479
{
472480
return _AdjustGetAdid();

0 commit comments

Comments
 (0)