Skip to content

Commit d786618

Browse files
uerceguerceg
authored
Merge pull request #154 from adjust/v4295
Version 4.29.5
2 parents 4af11a4 + 51d718c commit d786618

File tree

24 files changed

+1331
-1209
lines changed

24 files changed

+1331
-1209
lines changed

‎CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1+
### Version 4.29.5 (14th December 2021)
2+
#### Added
3+
- Added Huawei Install Referrer Track ID support.
4+
- Added support for `Admost` ad revenue tracking.
5+
6+
#### Fixed
7+
- Fixed `NativeEventEmitter` warnings caused by RN 0.66 upgrade (https://github.com/adjust/react_native_sdk/issues/147).
8+
9+
#### Native SDKs
10+
- [[email protected]][ios_sdk_v4.29.6]
11+
- [[email protected]][android_sdk_v4.28.8]
12+
13+
---
14+
115
### Version 4.29.4 (19th August 2021)
16+
#### Added
17+
- Added support to OAID plugin for MSA SDK v1.0.26.
18+
219
#### Fixed
320
- Fixed issue with insufficient buffer size for storing SDK prefix (https://github.com/adjust/react_native_sdk/issues/140).
421

@@ -472,6 +489,7 @@
472489
[ios_sdk_v4.29.3]: https://github.com/adjust/ios_sdk/tree/v4.29.3
473490
[ios_sdk_v4.29.4]: https://github.com/adjust/ios_sdk/tree/v4.29.4
474491
[ios_sdk_v4.29.5]: https://github.com/adjust/ios_sdk/tree/v4.29.5
492+
[ios_sdk_v4.29.6]: https://github.com/adjust/ios_sdk/tree/v4.29.6
475493

476494
[android_sdk_v4.10.4]: https://github.com/adjust/android_sdk/tree/v4.10.4
477495
[android_sdk_v4.11.0]: https://github.com/adjust/android_sdk/tree/v4.11.0
@@ -499,3 +517,4 @@
499517
[android_sdk_v4.28.2]: https://github.com/adjust/android_sdk/tree/v4.28.2
500518
[android_sdk_v4.28.3]: https://github.com/adjust/android_sdk/tree/v4.28.3
501519
[android_sdk_v4.28.4]: https://github.com/adjust/android_sdk/tree/v4.28.4
520+
[android_sdk_v4.28.8]: https://github.com/adjust/android_sdk/tree/v4.28.8

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.29.4
1+
4.29.5

‎android/libs/adjust-android.jar

3.26 KB
Binary file not shown.

‎android/src/main/java/com/adjust/sdk/Adjust.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -903,4 +903,14 @@ private void sendEvent(ReactContext reactContext, String eventName, @Nullable Wr
903903
private boolean checkKey(ReadableMap map, String key) {
904904
return map.hasKey(key) && !map.isNull(key);
905905
}
906+
907+
@ReactMethod
908+
public void addListener(String eventName) {
909+
// Keep: Required for RN built in Event Emitter Calls.
910+
}
911+
912+
@ReactMethod
913+
public void removeListeners(double count) {
914+
// Keep: Required for RN built in Event Emitter Calls.
915+
}
906916
}

‎example/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5546,9 +5546,9 @@ through2@^2.0.1:
55465546
xtend "~4.0.1"
55475547

55485548
[email protected]:
5549-
version "1.0.4"
5550-
resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
5551-
integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
5549+
version "1.0.5"
5550+
resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
5551+
integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
55525552

55535553
to-fast-properties@^2.0.0:
55545554
version "2.0.0"

‎ext/android/sdk

Submodule sdk updated 63 files

‎ext/ios/sdk

Submodule sdk updated 25 files

‎index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Adjust.getAmazonAdId = function(callback) {
132132
};
133133

134134
Adjust.getSdkVersion = function(callback) {
135-
module_adjust.getSdkVersion("react-native4.29.4", callback);
135+
module_adjust.getSdkVersion("react-native4.29.5", callback);
136136
};
137137

138138
Adjust.setReferrer = function(referrer) {
@@ -234,7 +234,7 @@ Adjust.onPause = function(testParam) {
234234
// AdjustConfig
235235

236236
var AdjustConfig = function(appToken, environment) {
237-
this.sdkPrefix = "react-native4.29.4";
237+
this.sdkPrefix = "react-native4.29.5";
238238
this.appToken = appToken;
239239
this.environment = environment;
240240
this.logLevel = null;
@@ -295,6 +295,7 @@ AdjustConfig.AdRevenueSourceAppLovinMAX = "applovin_max_sdk";
295295
AdjustConfig.AdRevenueSourceMopub = "mopub";
296296
AdjustConfig.AdRevenueSourceAdmob = "admob_sdk";
297297
AdjustConfig.AdRevenueSourceIronSource = "ironsource_sdk";
298+
AdjustConfig.AdRevenueSourceAdmost = "admost_sdk";
298299

299300
AdjustConfig.prototype.setEventBufferingEnabled = function(isEnabled) {
300301
this.eventBufferingEnabled = isEnabled;

‎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) {

0 commit comments

Comments
 (0)