Skip to content

Commit 46405f2

Browse files
committed
build: update native dependencies
1 parent c34ea53 commit 46405f2

File tree

10 files changed

+872
-688
lines changed

10 files changed

+872
-688
lines changed

android/libs/adjust-android.jar

-119 Bytes
Binary file not shown.

ios/Adjust/ADJActivityHandler.m

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,6 +1030,28 @@ - (void)processSessionI:(ADJActivityHandler *)selfI {
10301030
[ADJUserDefaults removeDisableThirdPartySharing];
10311031

10321032
return;
1033+
} else {
1034+
// these checks should run after SDK initialization after the first one
1035+
if ([ADJUserDefaults getDisableThirdPartySharing]) {
1036+
[selfI disableThirdPartySharingI:selfI];
1037+
}
1038+
if (selfI.savedPreLaunch.preLaunchAdjustThirdPartySharingArray != nil) {
1039+
for (ADJThirdPartySharing *thirdPartySharing
1040+
in selfI.savedPreLaunch.preLaunchAdjustThirdPartySharingArray)
1041+
{
1042+
[selfI trackThirdPartySharingI:selfI
1043+
thirdPartySharing:thirdPartySharing];
1044+
}
1045+
1046+
selfI.savedPreLaunch.preLaunchAdjustThirdPartySharingArray = nil;
1047+
}
1048+
if (selfI.savedPreLaunch.lastMeasurementConsentTracked != nil) {
1049+
[selfI
1050+
trackMeasurementConsentI:selfI
1051+
enabled:[selfI.savedPreLaunch.lastMeasurementConsentTracked boolValue]];
1052+
1053+
selfI.savedPreLaunch.lastMeasurementConsentTracked = nil;
1054+
}
10331055
}
10341056

10351057
double lastInterval = now - selfI.activityState.lastActivity;

ios/Adjust/ADJPackageBuilder.m

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,23 +1385,30 @@ + (void)addIdfaToParameters:(NSMutableDictionary * _Nullable)parameters
13851385
return;
13861386
}
13871387

1388-
// read once && IDFA not cached
1389-
if (adjConfig.readDeviceInfoOnceEnabled && packageParams.idfaCached != nil) {
1390-
[ADJPackageBuilder parameters:parameters setString:packageParams.idfaCached forKey:@"idfa"];
1391-
return;
1392-
}
1388+
__block NSString *idfa = nil;
1389+
[ADJUtil launchSynchronisedWithObject:[ADJPackageBuilder class] block:^{
1390+
// read once && IDFA not cached
1391+
if (adjConfig.readDeviceInfoOnceEnabled && packageParams.idfaCached != nil) {
1392+
idfa = packageParams.idfaCached;
1393+
} else {
1394+
// read IDFA
1395+
idfa = [ADJUtil idfa];
1396+
if (idfa == nil ||
1397+
idfa.length == 0 ||
1398+
[idfa isEqualToString:@"00000000-0000-0000-0000-000000000000"])
1399+
{
1400+
idfa = nil;
1401+
} else {
1402+
// cache IDFA
1403+
packageParams.idfaCached = idfa;
1404+
}
1405+
}
1406+
}];
13931407

1394-
// read IDFA
1395-
NSString *idfa = [ADJUtil idfa];
1396-
if (idfa == nil ||
1397-
idfa.length == 0 ||
1398-
[idfa isEqualToString:@"00000000-0000-0000-0000-000000000000"]) {
1399-
return;
1408+
if (idfa != nil) {
1409+
// add IDFA to payload
1410+
[ADJPackageBuilder parameters:parameters setString:idfa forKey:@"idfa"];
14001411
}
1401-
// cache IDFA
1402-
packageParams.idfaCached = idfa;
1403-
// add IDFA to payload
1404-
[ADJPackageBuilder parameters:parameters setString:idfa forKey:@"idfa"];
14051412
}
14061413

14071414
@end

ios/Adjust/Adjust.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ extern NSString * __nonnull const ADJAdRevenueSourceHeliumChartboost;
5858
extern NSString * __nonnull const ADJAdRevenueSourcePublisher;
5959
extern NSString * __nonnull const ADJAdRevenueSourceTopOn;
6060
extern NSString * __nonnull const ADJAdRevenueSourceADX;
61+
extern NSString * __nonnull const ADJAdRevenueSourceTradplus;
6162

6263
/**
6364
* Constants for country app's URL strategies.

ios/Adjust/Adjust.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
NSString * const ADJAdRevenueSourcePublisher = @"publisher_sdk";
3333
NSString * const ADJAdRevenueSourceTopOn = @"topon_sdk";
3434
NSString * const ADJAdRevenueSourceADX = @"adx_sdk";
35+
NSString * const ADJAdRevenueSourceTradplus = @"tradplus_sdk";
3536

3637
NSString * const ADJUrlStrategyIndia = @"UrlStrategyIndia";
3738
NSString * const ADJUrlStrategyChina = @"UrlStrategyChina";

ios/Adjust/include/Adjust.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ extern NSString * __nonnull const ADJAdRevenueSourceHeliumChartboost;
5858
extern NSString * __nonnull const ADJAdRevenueSourcePublisher;
5959
extern NSString * __nonnull const ADJAdRevenueSourceTopOn;
6060
extern NSString * __nonnull const ADJAdRevenueSourceADX;
61+
extern NSString * __nonnull const ADJAdRevenueSourceTradplus;
6162

6263
/**
6364
* Constants for country app's URL strategies.
Binary file not shown.

test/app/App.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const App: () => React$Node = () => {
5050
var baseUrl = "";
5151
var gdprUrl = "";
5252
var subscriptionUrl = "";
53-
var ipAddress = "192.168.8.70";
53+
var ipAddress = "192.168.8.64";
5454
if (Platform.OS === "android") {
5555
baseUrl = "https://" + ipAddress + ":8443";
5656
gdprUrl = "https://" + ipAddress + ":8443";

test/app/yarn.lock

Lines changed: 824 additions & 672 deletions
Large diffs are not rendered by default.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)