Skip to content

Commit 275f19b

Browse files
uerceguerceg
committed
update native binaries and test runs
1 parent c9b9d39 commit 275f19b

File tree

13 files changed

+1286
-1194
lines changed

13 files changed

+1286
-1194
lines changed

‎android/libs/adjust-android.jar‎

3.26 KB
Binary file not shown.

‎ios/Adjust/ADJPackageBuilder.m‎

Lines changed: 42 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@ - (NSMutableDictionary *)getSessionParameters:(BOOL)isInDelay {
371371
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
372372
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
373373
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
374-
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
375374
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
376375
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
377376
[self addIdfaIfPossibleToParameters:parameters];
@@ -418,6 +417,8 @@ - (NSMutableDictionary *)getSessionParameters:(BOOL)isInDelay {
418417
[ADJPackageBuilder parameters:parameters setDictionary:[self.sessionParameters.partnerParameters copy] forKey:@"partner_params"];
419418
}
420419

420+
[self injectFeatureFlagsWithParameters:parameters];
421+
421422
return parameters;
422423
}
423424

@@ -435,7 +436,6 @@ - (NSMutableDictionary *)getEventParameters:(BOOL)isInDelay forEventPackage:(ADJ
435436
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
436437
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
437438
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
438-
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
439439
[ADJPackageBuilder parameters:parameters setString:event.callbackId forKey:@"event_callback_id"];
440440
[ADJPackageBuilder parameters:parameters setString:event.eventToken forKey:@"event_token"];
441441
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
@@ -502,6 +502,8 @@ - (NSMutableDictionary *)getEventParameters:(BOOL)isInDelay forEventPackage:(ADJ
502502
[ADJPackageBuilder parameters:parameters setString:event.transactionId forKey:@"transaction_id"];
503503
}
504504

505+
[self injectFeatureFlagsWithParameters:parameters];
506+
505507
return parameters;
506508
}
507509

@@ -523,7 +525,6 @@ - (NSMutableDictionary *)getInfoParameters:(NSString *)source {
523525
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
524526
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
525527
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
526-
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
527528
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
528529
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
529530
[self addIdfaIfPossibleToParameters:parameters];
@@ -576,6 +577,8 @@ - (NSMutableDictionary *)getInfoParameters:(NSString *)source {
576577
[ADJPackageBuilder parameters:parameters setString:self.attribution.trackerName forKey:@"tracker"];
577578
}
578579

580+
[self injectFeatureFlagsWithParameters:parameters];
581+
579582
return parameters;
580583
}
581584

@@ -593,7 +596,6 @@ - (NSMutableDictionary *)getAdRevenueParameters:(NSString *)source payload:(NSDa
593596
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
594597
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
595598
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
596-
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
597599
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
598600
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
599601
[self addIdfaIfPossibleToParameters:parameters];
@@ -637,6 +639,8 @@ - (NSMutableDictionary *)getAdRevenueParameters:(NSString *)source payload:(NSDa
637639
}
638640
}
639641

642+
[self injectFeatureFlagsWithParameters:parameters];
643+
640644
return parameters;
641645
}
642646

@@ -654,7 +658,6 @@ - (NSMutableDictionary *)getAdRevenueParameters:(ADJAdRevenue *)adRevenue isInDe
654658
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
655659
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
656660
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
657-
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
658661
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
659662
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
660663
[self addIdfaIfPossibleToParameters:parameters];
@@ -716,6 +719,8 @@ - (NSMutableDictionary *)getAdRevenueParameters:(ADJAdRevenue *)adRevenue isInDe
716719
}
717720
}
718721

722+
[self injectFeatureFlagsWithParameters:parameters];
723+
719724
return parameters;
720725
}
721726

@@ -737,7 +742,6 @@ - (NSMutableDictionary *)getClickParameters:(NSString *)source {
737742
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
738743
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
739744
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
740-
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
741745
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
742746
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
743747
[self addIdfaIfPossibleToParameters:parameters];
@@ -790,6 +794,8 @@ - (NSMutableDictionary *)getClickParameters:(NSString *)source {
790794
[ADJPackageBuilder parameters:parameters setString:self.attribution.trackerName forKey:@"tracker"];
791795
}
792796

797+
[self injectFeatureFlagsWithParameters:parameters];
798+
793799
return parameters;
794800
}
795801

@@ -806,7 +812,6 @@ - (NSMutableDictionary *)getAttributionParameters:(NSString *)initiatedBy {
806812
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
807813
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
808814
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
809-
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
810815
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
811816
[self addIdfaIfPossibleToParameters:parameters];
812817
[ADJPackageBuilder parameters:parameters setString:self.packageParams.idfv forKey:@"idfv"];
@@ -842,6 +847,8 @@ - (NSMutableDictionary *)getAttributionParameters:(NSString *)initiatedBy {
842847
}
843848
}
844849

850+
[self injectFeatureFlagsWithParameters:parameters];
851+
845852
return parameters;
846853
}
847854

@@ -858,7 +865,6 @@ - (NSMutableDictionary *)getGdprParameters {
858865
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
859866
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
860867
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
861-
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
862868
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
863869
[self addIdfaIfPossibleToParameters:parameters];
864870
[ADJPackageBuilder parameters:parameters setString:self.packageParams.idfv forKey:@"idfv"];
@@ -893,6 +899,8 @@ - (NSMutableDictionary *)getGdprParameters {
893899
}
894900
}
895901

902+
[self injectFeatureFlagsWithParameters:parameters];
903+
896904
return parameters;
897905
}
898906

@@ -914,7 +922,6 @@ - (NSMutableDictionary *)getDisableThirdPartySharingParameters {
914922
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
915923
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
916924
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
917-
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
918925
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
919926
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
920927
[self addIdfaIfPossibleToParameters:parameters];
@@ -959,6 +966,8 @@ - (NSMutableDictionary *)getDisableThirdPartySharingParameters {
959966
}
960967
}
961968

969+
[self injectFeatureFlagsWithParameters:parameters];
970+
962971
return parameters;
963972
}
964973

@@ -980,7 +989,6 @@ - (NSMutableDictionary *)getThirdPartySharingParameters:(nonnull ADJThirdPartySh
980989
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
981990
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
982991
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
983-
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
984992
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
985993
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
986994
[self addIdfaIfPossibleToParameters:parameters];
@@ -1031,6 +1039,8 @@ - (NSMutableDictionary *)getThirdPartySharingParameters:(nonnull ADJThirdPartySh
10311039
}
10321040
}
10331041

1042+
[self injectFeatureFlagsWithParameters:parameters];
1043+
10341044
return parameters;
10351045
}
10361046

@@ -1052,7 +1062,6 @@ - (NSMutableDictionary *)getMeasurementConsentParameters:(BOOL)enabled {
10521062
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
10531063
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
10541064
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
1055-
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
10561065
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
10571066
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
10581067
[self addIdfaIfPossibleToParameters:parameters];
@@ -1100,6 +1109,8 @@ - (NSMutableDictionary *)getMeasurementConsentParameters:(BOOL)enabled {
11001109
}
11011110
}
11021111

1112+
[self injectFeatureFlagsWithParameters:parameters];
1113+
11031114
return parameters;
11041115
}
11051116
- (NSMutableDictionary *)getSubscriptionParameters:(BOOL)isInDelay forSubscriptionPackage:(ADJSubscription *)subscription {
@@ -1115,7 +1126,6 @@ - (NSMutableDictionary *)getSubscriptionParameters:(BOOL)isInDelay forSubscripti
11151126
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
11161127
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
11171128
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
1118-
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
11191129
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
11201130
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
11211131
[self addIdfaIfPossibleToParameters:parameters];
@@ -1176,6 +1186,8 @@ - (NSMutableDictionary *)getSubscriptionParameters:(BOOL)isInDelay forSubscripti
11761186
[ADJPackageBuilder parameters:parameters setDate:subscription.transactionDate forKey:@"transaction_date"];
11771187
[ADJPackageBuilder parameters:parameters setString:subscription.salesRegion forKey:@"sales_region"];
11781188

1189+
[self injectFeatureFlagsWithParameters:parameters];
1190+
11791191
return parameters;
11801192
}
11811193

@@ -1196,6 +1208,24 @@ - (void)addIdfaIfPossibleToParameters:(NSMutableDictionary *)parameters {
11961208
[ADJPackageBuilder parameters:parameters setString:idfa forKey:@"idfa"];
11971209
}
11981210

1211+
- (void)injectFeatureFlagsWithParameters:(NSMutableDictionary *)parameters {
1212+
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled
1213+
forKey:@"event_buffering_enabled"];
1214+
1215+
if (self.adjustConfig.isSKAdNetworkHandlingActive == NO) {
1216+
[ADJPackageBuilder parameters:parameters setBool:YES forKey:@"ff_skadn_disabled"];
1217+
}
1218+
if (self.adjustConfig.allowIdfaReading == NO) {
1219+
[ADJPackageBuilder parameters:parameters setBool:YES forKey:@"ff_idfa_disabled"];
1220+
}
1221+
if (self.adjustConfig.allowiAdInfoReading == NO) {
1222+
[ADJPackageBuilder parameters:parameters setBool:YES forKey:@"ff_iad_disabled"];
1223+
}
1224+
if (self.adjustConfig.allowAdServicesInfoReading == NO) {
1225+
[ADJPackageBuilder parameters:parameters setBool:YES forKey:@"ff_adserv_disabled"];
1226+
}
1227+
}
1228+
11991229
- (ADJActivityPackage *)defaultActivityPackage {
12001230
ADJActivityPackage *activityPackage = [[ADJActivityPackage alloc] init];
12011231
activityPackage.clientSdk = self.packageParams.clientSdk;

‎ios/Adjust/ADJRequestHandler.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ - (void)sendRequest:(NSMutableURLRequest *)request
143143

144144
{
145145
if (authorizationHeader != nil) {
146-
[ADJAdjustFactory.logger debug:@"Authorzation header content: %@", authorizationHeader];
146+
[ADJAdjustFactory.logger debug:@"Authorization header content: %@", authorizationHeader];
147147
[request setValue:authorizationHeader forHTTPHeaderField:@"Authorization"];
148148
}
149149
if (self.userAgent != nil) {

‎ios/Adjust/ADJUtil.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
static NSRegularExpression *shortUniversalLinkRegex = nil;
4040
static NSRegularExpression *excludedDeeplinkRegex = nil;
4141

42-
static NSString * const kClientSdk = @"ios4.29.5";
42+
static NSString * const kClientSdk = @"ios4.29.6";
4343
static NSString * const kDeeplinkParam = @"deep_link=";
4444
static NSString * const kSchemeDelimiter = @"://";
4545
static NSString * const kDefaultScheme = @"AdjustUniversalScheme";

‎ios/Adjust/Adjust.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Adjust.h
33
// Adjust SDK
44
//
5-
// V4.29.5
5+
// V4.29.6
66
// Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
77
// Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
88
//
@@ -48,6 +48,7 @@ extern NSString * __nonnull const ADJAdRevenueSourceAppLovinMAX;
4848
extern NSString * __nonnull const ADJAdRevenueSourceMopub;
4949
extern NSString * __nonnull const ADJAdRevenueSourceAdMob;
5050
extern NSString * __nonnull const ADJAdRevenueSourceIronSource;
51+
extern NSString * __nonnull const ADJAdRevenueSourceAdMost;
5152

5253
/**
5354
* 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
@@ -25,6 +25,7 @@
2525
NSString * const ADJAdRevenueSourceMopub = @"mopub";
2626
NSString * const ADJAdRevenueSourceAdMob = @"admob_sdk";
2727
NSString * const ADJAdRevenueSourceIronSource = @"ironsource_sdk";
28+
NSString * const ADJAdRevenueSourceAdMost = @"admost_sdk";
2829

2930
NSString * const ADJUrlStrategyIndia = @"UrlStrategyIndia";
3031
NSString * const ADJUrlStrategyChina = @"UrlStrategyChina";

‎ios/Adjust/include/Adjust.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Adjust.h
33
// Adjust SDK
44
//
5-
// V4.29.5
5+
// V4.29.6
66
// Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
77
// Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
88
//
@@ -48,6 +48,7 @@ extern NSString * __nonnull const ADJAdRevenueSourceAppLovinMAX;
4848
extern NSString * __nonnull const ADJAdRevenueSourceMopub;
4949
extern NSString * __nonnull const ADJAdRevenueSourceAdMob;
5050
extern NSString * __nonnull const ADJAdRevenueSourceIronSource;
51+
extern NSString * __nonnull const ADJAdRevenueSourceAdMost;
5152

5253
/**
5354
* Constants for country app's URL strategies.

‎plugins/oaid/android/libs/adjust-android-oaid.jar‎

0 Bytes
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.86.50";
53+
var ipAddress = "192.168.86.80";
5454
if (Platform.OS === "android") {
5555
baseUrl = "https://" + ipAddress + ":8443";
5656
gdprUrl = "https://" + ipAddress + ":8443";

‎test/app/command_executor.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,14 @@ AdjustCommandExecutor.prototype.config = function(params) {
364364
adjustConfig.setAllowIdfaReading(allowIdfaReading);
365365
}
366366

367+
if ('allowSkAdNetworkHandling' in params) {
368+
var allowSkAdNetworkHandlingS = getFirstParameterValue(params, 'allowSkAdNetworkHandling');
369+
var allowSkAdNetworkHandling = allowSkAdNetworkHandlingS == 'true';
370+
if (allowSkAdNetworkHandling == false) {
371+
adjustConfig.deactivateSKAdNetworkHandling();
372+
}
373+
}
374+
367375
if ('userAgent' in params) {
368376
var userAgent = getFirstParameterValue(params, 'userAgent');
369377
adjustConfig.setUserAgent(userAgent);

0 commit comments

Comments
 (0)