Skip to content

Commit

Permalink
Merge pull request #154 from adjust/v4295
Browse files Browse the repository at this point in the history
Version 4.29.5
  • Loading branch information
uerceg authored Dec 14, 2021
2 parents 4af11a4 + 51d718c commit d786618
Show file tree
Hide file tree
Showing 24 changed files with 1,331 additions and 1,209 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,21 @@
### Version 4.29.5 (14th December 2021)
#### Added
- Added Huawei Install Referrer Track ID support.
- Added support for `Admost` ad revenue tracking.

#### Fixed
- Fixed `NativeEventEmitter` warnings caused by RN 0.66 upgrade (https://github.com/adjust/react_native_sdk/issues/147).

#### Native SDKs
- [[email protected]][ios_sdk_v4.29.6]
- [[email protected]][android_sdk_v4.28.8]

---

### Version 4.29.4 (19th August 2021)
#### Added
- Added support to OAID plugin for MSA SDK v1.0.26.

#### Fixed
- Fixed issue with insufficient buffer size for storing SDK prefix (https://github.com/adjust/react_native_sdk/issues/140).

Expand Down Expand Up @@ -472,6 +489,7 @@
[ios_sdk_v4.29.3]: https://github.com/adjust/ios_sdk/tree/v4.29.3
[ios_sdk_v4.29.4]: https://github.com/adjust/ios_sdk/tree/v4.29.4
[ios_sdk_v4.29.5]: https://github.com/adjust/ios_sdk/tree/v4.29.5
[ios_sdk_v4.29.6]: https://github.com/adjust/ios_sdk/tree/v4.29.6

[android_sdk_v4.10.4]: https://github.com/adjust/android_sdk/tree/v4.10.4
[android_sdk_v4.11.0]: https://github.com/adjust/android_sdk/tree/v4.11.0
Expand Down Expand Up @@ -499,3 +517,4 @@
[android_sdk_v4.28.2]: https://github.com/adjust/android_sdk/tree/v4.28.2
[android_sdk_v4.28.3]: https://github.com/adjust/android_sdk/tree/v4.28.3
[android_sdk_v4.28.4]: https://github.com/adjust/android_sdk/tree/v4.28.4
[android_sdk_v4.28.8]: https://github.com/adjust/android_sdk/tree/v4.28.8
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.29.4
4.29.5
Binary file modified android/libs/adjust-android.jar
Binary file not shown.
10 changes: 10 additions & 0 deletions android/src/main/java/com/adjust/sdk/Adjust.java
Original file line number Diff line number Diff line change
Expand Up @@ -903,4 +903,14 @@ private void sendEvent(ReactContext reactContext, String eventName, @Nullable Wr
private boolean checkKey(ReadableMap map, String key) {
return map.hasKey(key) && !map.isNull(key);
}

@ReactMethod
public void addListener(String eventName) {
// Keep: Required for RN built in Event Emitter Calls.
}

@ReactMethod
public void removeListeners(double count) {
// Keep: Required for RN built in Event Emitter Calls.
}
}
6 changes: 3 additions & 3 deletions example/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5546,9 +5546,9 @@ through2@^2.0.1:
xtend "~4.0.1"

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

to-fast-properties@^2.0.0:
version "2.0.0"
Expand Down
2 changes: 1 addition & 1 deletion ext/android/sdk
Submodule sdk updated 63 files
+4 −4 Adjust/build.gradle
+10 −5 Adjust/example-app-fbpixel/build.gradle
+3 −1 Adjust/example-app-fbpixel/src/main/AndroidManifest.xml
+9 −5 Adjust/example-app-java/build.gradle
+3 −1 Adjust/example-app-java/src/main/AndroidManifest.xml
+9 −5 Adjust/example-app-keyboard/build.gradle
+5 −2 Adjust/example-app-keyboard/src/main/AndroidManifest.xml
+9 −5 Adjust/example-app-kotlin/build.gradle
+3 −1 Adjust/example-app-kotlin/src/main/AndroidManifest.xml
+9 −5 Adjust/example-app-tv/build.gradle
+3 −1 Adjust/example-app-tv/src/main/AndroidManifest.xml
+9 −5 Adjust/example-app-webbridge/build.gradle
+3 −1 Adjust/example-app-webbridge/src/main/AndroidManifest.xml
+1 −1 Adjust/gradle/wrapper/gradle-wrapper.properties
+32 −15 Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityHandler.java
+6 −0 Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityState.java
+26 −8 Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java
+4 −1 Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustConfig.java
+3 −2 Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java
+2 −2 Adjust/sdk-core/src/main/java/com/adjust/sdk/InstallReferrer.java
+82 −11 Adjust/sdk-core/src/main/java/com/adjust/sdk/InstallReferrerHuawei.java
+1 −1 Adjust/sdk-core/src/main/java/com/adjust/sdk/InstallReferrerReadListener.java
+16 −8 Adjust/sdk-core/src/main/java/com/adjust/sdk/Util.java
+38 −0 Adjust/sdk-core/src/main/java/com/adjust/sdk/scheduler/AsyncTaskExecutor.java
+1 −1 Adjust/sdk-plugin-criteo/build.gradle
+1 −1 Adjust/sdk-plugin-imei/build.gradle
+43 −6 Adjust/sdk-plugin-imei/src/main/java/com/adjust/sdk/imei/TelephonyIdsUtil.java
+1 −1 Adjust/sdk-plugin-oaid/build.gradle
+0 −1 Adjust/sdk-plugin-play/.gitignore
+0 −20 Adjust/sdk-plugin-play/build.gradle
+0 −21 Adjust/sdk-plugin-play/proguard-rules.pro
+0 −2 Adjust/sdk-plugin-play/src/main/AndroidManifest.xml
+0 −194 Adjust/sdk-plugin-play/src/main/java/com/adjust/sdk/play/InstallReferrer.java
+0 −45 Adjust/sdk-plugin-play/src/main/java/com/adjust/sdk/play/Util.java
+0 −3 Adjust/sdk-plugin-play/src/main/res/values/strings.xml
+1 −1 Adjust/sdk-plugin-sociomantic/build.gradle
+1 −1 Adjust/sdk-plugin-trademob/build.gradle
+1 −1 Adjust/sdk-plugin-webbridge/build.gradle
+1 −1 Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js
+1 −1 Adjust/settings.gradle
+10 −5 Adjust/test-app-core/build.gradle
+3 −1 Adjust/test-app-core/src/main/AndroidManifest.xml
+5 −5 Adjust/test-app-webbridge/build.gradle
+3 −1 Adjust/test-app-webbridge/src/main/AndroidManifest.xml
+5 −5 Adjust/test-kotlin/build.gradle
+2 −1 Adjust/test-kotlin/src/main/AndroidManifest.xml
+2 −2 Adjust/test-library/build.gradle
+2 −2 Adjust/test-options/build.gradle
+6 −6 Adjust/test-unit/build.gradle
+1 −1 Adjust/test-unit/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java
+3 −1 Adjust/test-unit/src/main/AndroidManifest.xml
+28 −0 CHANGELOG.md
+16 −7 README.md
+1 −1 VERSION
+12 −2 doc/chinese/README.md
+2 −2 doc/chinese/plugins/oaid.md
+1 −1 doc/english/migration/migrate.md
+2 −2 doc/english/plugins/oaid.md
+12 −2 doc/japanese/README.md
+1 −1 doc/japanese/migration/migrate.md
+2 −2 doc/japanese/plugins/oaid.md
+12 −2 doc/korean/README.md
+2 −2 doc/korean/plugins/oaid.md
5 changes: 3 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Adjust.getAmazonAdId = function(callback) {
};

Adjust.getSdkVersion = function(callback) {
module_adjust.getSdkVersion("react-native4.29.4", callback);
module_adjust.getSdkVersion("react-native4.29.5", callback);
};

Adjust.setReferrer = function(referrer) {
Expand Down Expand Up @@ -234,7 +234,7 @@ Adjust.onPause = function(testParam) {
// AdjustConfig

var AdjustConfig = function(appToken, environment) {
this.sdkPrefix = "react-native4.29.4";
this.sdkPrefix = "react-native4.29.5";
this.appToken = appToken;
this.environment = environment;
this.logLevel = null;
Expand Down Expand Up @@ -295,6 +295,7 @@ AdjustConfig.AdRevenueSourceAppLovinMAX = "applovin_max_sdk";
AdjustConfig.AdRevenueSourceMopub = "mopub";
AdjustConfig.AdRevenueSourceAdmob = "admob_sdk";
AdjustConfig.AdRevenueSourceIronSource = "ironsource_sdk";
AdjustConfig.AdRevenueSourceAdmost = "admost_sdk";

AdjustConfig.prototype.setEventBufferingEnabled = function(isEnabled) {
this.eventBufferingEnabled = isEnabled;
Expand Down
54 changes: 42 additions & 12 deletions ios/Adjust/ADJPackageBuilder.m
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,6 @@ - (NSMutableDictionary *)getSessionParameters:(BOOL)isInDelay {
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
[self addIdfaIfPossibleToParameters:parameters];
Expand Down Expand Up @@ -418,6 +417,8 @@ - (NSMutableDictionary *)getSessionParameters:(BOOL)isInDelay {
[ADJPackageBuilder parameters:parameters setDictionary:[self.sessionParameters.partnerParameters copy] forKey:@"partner_params"];
}

[self injectFeatureFlagsWithParameters:parameters];

return parameters;
}

Expand All @@ -435,7 +436,6 @@ - (NSMutableDictionary *)getEventParameters:(BOOL)isInDelay forEventPackage:(ADJ
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
[ADJPackageBuilder parameters:parameters setString:event.callbackId forKey:@"event_callback_id"];
[ADJPackageBuilder parameters:parameters setString:event.eventToken forKey:@"event_token"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
Expand Down Expand Up @@ -502,6 +502,8 @@ - (NSMutableDictionary *)getEventParameters:(BOOL)isInDelay forEventPackage:(ADJ
[ADJPackageBuilder parameters:parameters setString:event.transactionId forKey:@"transaction_id"];
}

[self injectFeatureFlagsWithParameters:parameters];

return parameters;
}

Expand All @@ -523,7 +525,6 @@ - (NSMutableDictionary *)getInfoParameters:(NSString *)source {
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
[self addIdfaIfPossibleToParameters:parameters];
Expand Down Expand Up @@ -576,6 +577,8 @@ - (NSMutableDictionary *)getInfoParameters:(NSString *)source {
[ADJPackageBuilder parameters:parameters setString:self.attribution.trackerName forKey:@"tracker"];
}

[self injectFeatureFlagsWithParameters:parameters];

return parameters;
}

Expand All @@ -593,7 +596,6 @@ - (NSMutableDictionary *)getAdRevenueParameters:(NSString *)source payload:(NSDa
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
[self addIdfaIfPossibleToParameters:parameters];
Expand Down Expand Up @@ -637,6 +639,8 @@ - (NSMutableDictionary *)getAdRevenueParameters:(NSString *)source payload:(NSDa
}
}

[self injectFeatureFlagsWithParameters:parameters];

return parameters;
}

Expand All @@ -654,7 +658,6 @@ - (NSMutableDictionary *)getAdRevenueParameters:(ADJAdRevenue *)adRevenue isInDe
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
[self addIdfaIfPossibleToParameters:parameters];
Expand Down Expand Up @@ -716,6 +719,8 @@ - (NSMutableDictionary *)getAdRevenueParameters:(ADJAdRevenue *)adRevenue isInDe
}
}

[self injectFeatureFlagsWithParameters:parameters];

return parameters;
}

Expand All @@ -737,7 +742,6 @@ - (NSMutableDictionary *)getClickParameters:(NSString *)source {
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
[self addIdfaIfPossibleToParameters:parameters];
Expand Down Expand Up @@ -790,6 +794,8 @@ - (NSMutableDictionary *)getClickParameters:(NSString *)source {
[ADJPackageBuilder parameters:parameters setString:self.attribution.trackerName forKey:@"tracker"];
}

[self injectFeatureFlagsWithParameters:parameters];

return parameters;
}

Expand All @@ -806,7 +812,6 @@ - (NSMutableDictionary *)getAttributionParameters:(NSString *)initiatedBy {
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
[self addIdfaIfPossibleToParameters:parameters];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.idfv forKey:@"idfv"];
Expand Down Expand Up @@ -842,6 +847,8 @@ - (NSMutableDictionary *)getAttributionParameters:(NSString *)initiatedBy {
}
}

[self injectFeatureFlagsWithParameters:parameters];

return parameters;
}

Expand All @@ -858,7 +865,6 @@ - (NSMutableDictionary *)getGdprParameters {
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
[self addIdfaIfPossibleToParameters:parameters];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.idfv forKey:@"idfv"];
Expand Down Expand Up @@ -893,6 +899,8 @@ - (NSMutableDictionary *)getGdprParameters {
}
}

[self injectFeatureFlagsWithParameters:parameters];

return parameters;
}

Expand All @@ -914,7 +922,6 @@ - (NSMutableDictionary *)getDisableThirdPartySharingParameters {
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
[self addIdfaIfPossibleToParameters:parameters];
Expand Down Expand Up @@ -959,6 +966,8 @@ - (NSMutableDictionary *)getDisableThirdPartySharingParameters {
}
}

[self injectFeatureFlagsWithParameters:parameters];

return parameters;
}

Expand All @@ -980,7 +989,6 @@ - (NSMutableDictionary *)getThirdPartySharingParameters:(nonnull ADJThirdPartySh
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
[self addIdfaIfPossibleToParameters:parameters];
Expand Down Expand Up @@ -1031,6 +1039,8 @@ - (NSMutableDictionary *)getThirdPartySharingParameters:(nonnull ADJThirdPartySh
}
}

[self injectFeatureFlagsWithParameters:parameters];

return parameters;
}

Expand All @@ -1052,7 +1062,6 @@ - (NSMutableDictionary *)getMeasurementConsentParameters:(BOOL)enabled {
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
[self addIdfaIfPossibleToParameters:parameters];
Expand Down Expand Up @@ -1100,6 +1109,8 @@ - (NSMutableDictionary *)getMeasurementConsentParameters:(BOOL)enabled {
}
}

[self injectFeatureFlagsWithParameters:parameters];

return parameters;
}
- (NSMutableDictionary *)getSubscriptionParameters:(BOOL)isInDelay forSubscriptionPackage:(ADJSubscription *)subscription {
Expand All @@ -1115,7 +1126,6 @@ - (NSMutableDictionary *)getSubscriptionParameters:(BOOL)isInDelay forSubscripti
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceName forKey:@"device_name"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.deviceType forKey:@"device_type"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.environment forKey:@"environment"];
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled forKey:@"event_buffering_enabled"];
[ADJPackageBuilder parameters:parameters setString:self.adjustConfig.externalDeviceId forKey:@"external_device_id"];
[ADJPackageBuilder parameters:parameters setString:self.packageParams.fbAnonymousId forKey:@"fb_anon_id"];
[self addIdfaIfPossibleToParameters:parameters];
Expand Down Expand Up @@ -1176,6 +1186,8 @@ - (NSMutableDictionary *)getSubscriptionParameters:(BOOL)isInDelay forSubscripti
[ADJPackageBuilder parameters:parameters setDate:subscription.transactionDate forKey:@"transaction_date"];
[ADJPackageBuilder parameters:parameters setString:subscription.salesRegion forKey:@"sales_region"];

[self injectFeatureFlagsWithParameters:parameters];

return parameters;
}

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

- (void)injectFeatureFlagsWithParameters:(NSMutableDictionary *)parameters {
[ADJPackageBuilder parameters:parameters setBool:self.adjustConfig.eventBufferingEnabled
forKey:@"event_buffering_enabled"];

if (self.adjustConfig.isSKAdNetworkHandlingActive == NO) {
[ADJPackageBuilder parameters:parameters setBool:YES forKey:@"ff_skadn_disabled"];
}
if (self.adjustConfig.allowIdfaReading == NO) {
[ADJPackageBuilder parameters:parameters setBool:YES forKey:@"ff_idfa_disabled"];
}
if (self.adjustConfig.allowiAdInfoReading == NO) {
[ADJPackageBuilder parameters:parameters setBool:YES forKey:@"ff_iad_disabled"];
}
if (self.adjustConfig.allowAdServicesInfoReading == NO) {
[ADJPackageBuilder parameters:parameters setBool:YES forKey:@"ff_adserv_disabled"];
}
}

- (ADJActivityPackage *)defaultActivityPackage {
ADJActivityPackage *activityPackage = [[ADJActivityPackage alloc] init];
activityPackage.clientSdk = self.packageParams.clientSdk;
Expand Down
2 changes: 1 addition & 1 deletion ios/Adjust/ADJRequestHandler.m
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ - (void)sendRequest:(NSMutableURLRequest *)request

{
if (authorizationHeader != nil) {
[ADJAdjustFactory.logger debug:@"Authorzation header content: %@", authorizationHeader];
[ADJAdjustFactory.logger debug:@"Authorization header content: %@", authorizationHeader];
[request setValue:authorizationHeader forHTTPHeaderField:@"Authorization"];
}
if (self.userAgent != nil) {
Expand Down
2 changes: 1 addition & 1 deletion ios/Adjust/ADJUtil.m
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
static NSRegularExpression *shortUniversalLinkRegex = nil;
static NSRegularExpression *excludedDeeplinkRegex = nil;

static NSString * const kClientSdk = @"ios4.29.5";
static NSString * const kClientSdk = @"ios4.29.6";
static NSString * const kDeeplinkParam = @"deep_link=";
static NSString * const kSchemeDelimiter = @"://";
static NSString * const kDefaultScheme = @"AdjustUniversalScheme";
Expand Down
3 changes: 2 additions & 1 deletion ios/Adjust/Adjust.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Adjust.h
// Adjust SDK
//
// V4.29.5
// V4.29.6
// Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
// Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
//
Expand Down Expand Up @@ -48,6 +48,7 @@ extern NSString * __nonnull const ADJAdRevenueSourceAppLovinMAX;
extern NSString * __nonnull const ADJAdRevenueSourceMopub;
extern NSString * __nonnull const ADJAdRevenueSourceAdMob;
extern NSString * __nonnull const ADJAdRevenueSourceIronSource;
extern NSString * __nonnull const ADJAdRevenueSourceAdMost;

/**
* Constants for country app's URL strategies.
Expand Down
1 change: 1 addition & 0 deletions ios/Adjust/Adjust.m
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
NSString * const ADJAdRevenueSourceMopub = @"mopub";
NSString * const ADJAdRevenueSourceAdMob = @"admob_sdk";
NSString * const ADJAdRevenueSourceIronSource = @"ironsource_sdk";
NSString * const ADJAdRevenueSourceAdMost = @"admost_sdk";

NSString * const ADJUrlStrategyIndia = @"UrlStrategyIndia";
NSString * const ADJUrlStrategyChina = @"UrlStrategyChina";
Expand Down
Loading

0 comments on commit d786618

Please sign in to comment.