Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 4.37.2 #235

Merged
merged 7 commits into from
Mar 21, 2024
Merged

Version 4.37.2 #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
527b34c
build(deps): bump ip from 1.1.8 to 1.1.9 in /example
dependabot[bot] Mar 21, 2024
727e155
build(deps): bump ip from 1.1.8 to 1.1.9 in /test/app
dependabot[bot] Mar 21, 2024
46c01e3
Version 4.37.2
huextrat Mar 11, 2024
186be98
build: update submodules
uerceg Mar 21, 2024
c34ea53
docs: update changelog
uerceg Mar 21, 2024
46405f2
build: update native dependencies
uerceg Mar 21, 2024
53234cd
docs: update changelog
uerceg Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
### Version 4.37.2 (21st March 2024)
#### Fixed
- Fixed occasional crashes caused by not synchronized access to cached IDFA value (https://github.com/adjust/ios_sdk/issues/696).

#### Changed
- Added tracking of `third_party_sharing` and `measurement_consent` packages if invoked before SDK initialization in subsequent SDK initializations.

#### Native SDKs
- [iOS@v4.37.2][ios_sdk_v4.37.2]
- [Android@v4.38.2][android_sdk_v4.38.2]

---

### Version 4.37.1 (30th January 2024)
#### Fixed
- Marked all Android method parameters as `final` to address compilation errors when trying to access a callback inside of the inner class (https://github.com/adjust/react_native_sdk/issues/226).
Expand Down Expand Up @@ -617,6 +630,7 @@
[ios_sdk_v4.35.1]: https://github.com/adjust/ios_sdk/tree/v4.35.1
[ios_sdk_v4.35.2]: https://github.com/adjust/ios_sdk/tree/v4.35.2
[ios_sdk_v4.37.0]: https://github.com/adjust/ios_sdk/tree/v4.37.0
[ios_sdk_v4.37.2]: https://github.com/adjust/ios_sdk/tree/v4.37.2

[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 @@ -652,3 +666,4 @@
[android_sdk_v4.35.0]: https://github.com/adjust/android_sdk/tree/v4.35.0
[android_sdk_v4.35.1]: https://github.com/adjust/android_sdk/tree/v4.35.1
[android_sdk_v4.38.1]: https://github.com/adjust/android_sdk/tree/v4.38.1
[android_sdk_v4.38.2]: https://github.com/adjust/android_sdk/tree/v4.38.2
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.37.1
4.37.2
Binary file modified android/libs/adjust-android.jar
View file
Open in desktop
Binary file not shown.
14 changes: 7 additions & 7 deletions example/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PODS:
- Adjust (4.37.0):
- Adjust/Core (= 4.37.0)
- Adjust/Core (4.37.0)
- Adjust (4.37.2):
- Adjust/Core (= 4.37.2)
- Adjust/Core (4.37.2)
- boost (1.76.0)
- CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.6)
Expand Down Expand Up @@ -287,8 +287,8 @@ PODS:
- React-jsinspector (0.69.4)
- React-logger (0.69.4):
- glog
- react-native-adjust (4.37.1):
- Adjust (= 4.37.0)
- react-native-adjust (4.37.2):
- Adjust (= 4.37.2)
- React-Core
- React-perflogger (0.69.4)
- React-RCTActionSheet (0.69.4):
Expand Down Expand Up @@ -508,7 +508,7 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
Adjust: 86a6935688251ca6cea371f9b284578ccf3d981b
Adjust: a830d963025334aee8a62a7bac87825e297a841e
boost: a7c83b31436843459a1961bfd74b96033dc77234
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
Expand Down Expand Up @@ -541,7 +541,7 @@ SPEC CHECKSUMS:
React-jsiexecutor: a27badbbdbc0ff781813370736a2d1c7261181d4
React-jsinspector: 8a3d3f5dcd23a91e8c80b1bf0e96902cd1dca999
React-logger: 1088859f145b8f6dd0d3ed051a647ef0e3e80fad
react-native-adjust: 0463129823eabe31ff28262295be713ba5f99d2c
react-native-adjust: 9a9d5b7fff8de8209d468ee4bd3fc1bc386d78cd
React-perflogger: cb386fd44c97ec7f8199c04c12b22066b0f2e1e0
React-RCTActionSheet: f803a85e46cf5b4066c2ac5e122447f918e9c6e5
React-RCTAnimation: 19c80fa950ccce7f4db76a2a7f2cf79baae07fc7
Expand Down
10 changes: 5 additions & 5 deletions example/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3551,9 +3551,9 @@ invariant@^2.2.4:
loose-envify "^1.0.0"

ip@^1.1.5:
version "1.1.8"
resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48"
integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==
version "1.1.9"
resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.9.tgz#8dfbcc99a754d07f425310b86a99546b1151e396"
integrity sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==

is-accessor-descriptor@^1.0.1:
version "1.0.1"
Expand Down Expand Up @@ -5750,10 +5750,10 @@ react-is@^17.0.1:
integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==

react-native-adjust-oaid@../plugins/oaid:
version "4.37.1"
version "4.37.2"

react-native-adjust@../temp:
version "4.37.1"
version "4.37.2"

react-native-codegen@^0.69.1:
version "0.69.2"
Expand Down
2 changes: 1 addition & 1 deletion ext/android/sdk
Open in desktop
Submodule sdk updated 20 files
+1 −1 Adjust/build.gradle
+29 −22 Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityHandler.java
+1 −1 Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java
+1 −0 Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustSigner.java
+1 −1 Adjust/sdk-core/src/main/java/com/adjust/sdk/Constants.java
+0 −39 Adjust/sdk-core/src/main/java/com/adjust/sdk/PackageBuilder.java
+12 −1 Adjust/sdk-core/src/main/java/com/adjust/sdk/network/ActivityPackageSender.java
+1 −1 Adjust/sdk-plugin-criteo/build.gradle
+1 −1 Adjust/sdk-plugin-imei/build.gradle
+1 −1 Adjust/sdk-plugin-oaid/build.gradle
+1 −1 Adjust/sdk-plugin-samsung-referrer/build.gradle
+1 −1 Adjust/sdk-plugin-sociomantic/build.gradle
+1 −1 Adjust/sdk-plugin-trademob/build.gradle
+1 −1 Adjust/sdk-plugin-vivo-referrer/build.gradle
+1 −1 Adjust/sdk-plugin-webbridge/build.gradle
+1 −1 Adjust/sdk-plugin-webbridge/src/main/assets/adjust.js
+1 −1 Adjust/sdk-plugin-xiaomi-referrer/build.gradle
+1 −1 Adjust/test-unit/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java
+9 −0 CHANGELOG.md
+1 −1 VERSION
2 changes: 1 addition & 1 deletion ext/ios/sdk
Open in desktop
Submodule sdk updated 21 files
+2 −2 Adjust.podspec
+22 −0 Adjust/ADJActivityHandler.m
+22 −15 Adjust/ADJPackageBuilder.m
+1 −1 Adjust/ADJUtil.m
+2 −1 Adjust/Adjust.h
+1 −0 Adjust/Adjust.m
+1 −1 AdjustBridge/AdjustBridgeRegister.m
+26 −9 CHANGELOG.md
+1 −1 VERSION
+18 −18 examples/AdjustExample-FbPixel/AdjustExample-FbPixel.xcodeproj/project.pbxproj
+7 −1 examples/AdjustExample-FbPixel/AdjustExample-FbPixel/AppDelegate.m
+5 −1 examples/AdjustExample-ObjC/AdjustExample-ObjC/AppDelegate.m
+8 −4 examples/AdjustExample-Swift/AdjustExample-Swift/AppDelegate.swift
+5 −5 examples/AdjustExample-Swift/Podfile.lock
+18 −18 examples/AdjustExample-WebView/AdjustExample-WebView.xcodeproj/project.pbxproj
+6 −0 examples/AdjustExample-WebView/AdjustExample-WebView/AppDelegate.m
+18 −0 examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/project.pbxproj
+18 −0 examples/AdjustExample-iWatch/AdjustExample-iWatch.xcodeproj/project.pbxproj
+6 −1 examples/AdjustExample-iWatch/AdjustExample-iWatch/AppDelegate.m
+18 −0 examples/AdjustExample-tvOS/AdjustExample-tvOS.xcodeproj/project.pbxproj
+7 −1 examples/AdjustExample-tvOS/AdjustExample-tvOS/AppDelegate.m
4 changes: 2 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ Adjust.getAmazonAdId = function(callback) {
};

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

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

var AdjustConfig = function(appToken, environment) {
this.sdkPrefix = "react-native4.37.1";
this.sdkPrefix = "react-native4.37.2";
this.appToken = appToken;
this.environment = environment;
this.logLevel = null;
Expand Down
22 changes: 22 additions & 0 deletions ios/Adjust/ADJActivityHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,6 +1030,28 @@ - (void)processSessionI:(ADJActivityHandler *)selfI {
[ADJUserDefaults removeDisableThirdPartySharing];

return;
} else {
// these checks should run after SDK initialization after the first one
if ([ADJUserDefaults getDisableThirdPartySharing]) {
[selfI disableThirdPartySharingI:selfI];
}
if (selfI.savedPreLaunch.preLaunchAdjustThirdPartySharingArray != nil) {
for (ADJThirdPartySharing *thirdPartySharing
in selfI.savedPreLaunch.preLaunchAdjustThirdPartySharingArray)
{
[selfI trackThirdPartySharingI:selfI
thirdPartySharing:thirdPartySharing];
}

selfI.savedPreLaunch.preLaunchAdjustThirdPartySharingArray = nil;
}
if (selfI.savedPreLaunch.lastMeasurementConsentTracked != nil) {
[selfI
trackMeasurementConsentI:selfI
enabled:[selfI.savedPreLaunch.lastMeasurementConsentTracked boolValue]];

selfI.savedPreLaunch.lastMeasurementConsentTracked = nil;
}
}

double lastInterval = now - selfI.activityState.lastActivity;
Expand Down
37 changes: 22 additions & 15 deletions ios/Adjust/ADJPackageBuilder.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1385,23 +1385,30 @@ + (void)addIdfaToParameters:(NSMutableDictionary * _Nullable)parameters
return;
}

// read once && IDFA not cached
if (adjConfig.readDeviceInfoOnceEnabled && packageParams.idfaCached != nil) {
[ADJPackageBuilder parameters:parameters setString:packageParams.idfaCached forKey:@"idfa"];
return;
}
__block NSString *idfa = nil;
[ADJUtil launchSynchronisedWithObject:[ADJPackageBuilder class] block:^{
// read once && IDFA not cached
if (adjConfig.readDeviceInfoOnceEnabled && packageParams.idfaCached != nil) {
idfa = packageParams.idfaCached;
} else {
// read IDFA
idfa = [ADJUtil idfa];
if (idfa == nil ||
idfa.length == 0 ||
[idfa isEqualToString:@"00000000-0000-0000-0000-000000000000"])
{
idfa = nil;
} else {
// cache IDFA
packageParams.idfaCached = idfa;
}
}
}];

// read IDFA
NSString *idfa = [ADJUtil idfa];
if (idfa == nil ||
idfa.length == 0 ||
[idfa isEqualToString:@"00000000-0000-0000-0000-000000000000"]) {
return;
if (idfa != nil) {
// add IDFA to payload
[ADJPackageBuilder parameters:parameters setString:idfa forKey:@"idfa"];
}
// cache IDFA
packageParams.idfaCached = idfa;
// add IDFA to payload
[ADJPackageBuilder parameters:parameters setString:idfa forKey:@"idfa"];
}

@end
2 changes: 1 addition & 1 deletion ios/Adjust/ADJUtil.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
static NSRegularExpression *shortUniversalLinkRegex = nil;
static NSRegularExpression *excludedDeeplinkRegex = nil;

static NSString * const kClientSdk = @"ios4.37.0";
static NSString * const kClientSdk = @"ios4.37.2";
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Adjust.h
// Adjust SDK
//
// V4.37.0
// V4.37.2
// Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
// Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
//
Expand Down Expand Up @@ -58,6 +58,7 @@ extern NSString * __nonnull const ADJAdRevenueSourceHeliumChartboost;
extern NSString * __nonnull const ADJAdRevenueSourcePublisher;
extern NSString * __nonnull const ADJAdRevenueSourceTopOn;
extern NSString * __nonnull const ADJAdRevenueSourceADX;
extern NSString * __nonnull const ADJAdRevenueSourceTradplus;

/**
* Constants for country app's URL strategies.
Expand Down
1 change: 1 addition & 0 deletions ios/Adjust/Adjust.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
NSString * const ADJAdRevenueSourcePublisher = @"publisher_sdk";
NSString * const ADJAdRevenueSourceTopOn = @"topon_sdk";
NSString * const ADJAdRevenueSourceADX = @"adx_sdk";
NSString * const ADJAdRevenueSourceTradplus = @"tradplus_sdk";

NSString * const ADJUrlStrategyIndia = @"UrlStrategyIndia";
NSString * const ADJUrlStrategyChina = @"UrlStrategyChina";
Expand Down
3 changes: 2 additions & 1 deletion ios/Adjust/include/Adjust.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Adjust.h
// Adjust SDK
//
// V4.37.0
// V4.37.2
// Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
// Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
//
Expand Down Expand Up @@ -58,6 +58,7 @@ extern NSString * __nonnull const ADJAdRevenueSourceHeliumChartboost;
extern NSString * __nonnull const ADJAdRevenueSourcePublisher;
extern NSString * __nonnull const ADJAdRevenueSourceTopOn;
extern NSString * __nonnull const ADJAdRevenueSourceADX;
extern NSString * __nonnull const ADJAdRevenueSourceTradplus;

/**
* Constants for country app's URL strategies.
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "react-native-adjust",
"description": "Adjust React Native SDK",
"version": "4.37.1",
"version": "4.37.2",
"main": "index.js",
"author": "Adjust",
"license": "MIT",
Expand Down
Binary file modified plugins/oaid/android/libs/adjust-android-oaid.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion plugins/oaid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "react-native-adjust-oaid",
"description": "Adjust React Native OAID plugin",
"version": "4.37.1",
"version": "4.37.2",
"main": "index.js",
"author": "Adjust",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion react-native-adjust.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ Pod::Spec.new do |s|
s.preserve_paths = 'LICENSE', 'README.md', 'package.json', 'index.js'
s.source_files = 'ios/*.{h,m}'

s.dependency 'Adjust', '4.37.0'
s.dependency 'Adjust', '4.37.2'
s.dependency 'React-Core'
end
2 changes: 1 addition & 1 deletion test/app/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const App: () => React$Node = () => {
var baseUrl = "";
var gdprUrl = "";
var subscriptionUrl = "";
var ipAddress = "192.168.8.70";
var ipAddress = "192.168.8.64";
if (Platform.OS === "android") {
baseUrl = "https://" + ipAddress + ":8443";
gdprUrl = "https://" + ipAddress + ":8443";
Expand Down
18 changes: 9 additions & 9 deletions test/app/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PODS:
- Adjust (4.37.0):
- Adjust/Core (= 4.37.0)
- Adjust/Core (4.37.0)
- Adjust (4.37.2):
- Adjust/Core (= 4.37.2)
- Adjust/Core (4.37.2)
- boost (1.76.0)
- CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.6)
Expand Down Expand Up @@ -287,10 +287,10 @@ PODS:
- React-jsinspector (0.69.4)
- React-logger (0.69.4):
- glog
- react-native-adjust (4.37.1):
- Adjust (= 4.37.0)
- react-native-adjust (4.37.2):
- Adjust (= 4.37.2)
- React-Core
- react-native-adjust-test (4.37.1):
- react-native-adjust-test (4.37.2):
- React
- React-perflogger (0.69.4)
- React-RCTActionSheet (0.69.4):
Expand Down Expand Up @@ -513,7 +513,7 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
Adjust: 86a6935688251ca6cea371f9b284578ccf3d981b
Adjust: a830d963025334aee8a62a7bac87825e297a841e
boost: a7c83b31436843459a1961bfd74b96033dc77234
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
Expand Down Expand Up @@ -546,8 +546,8 @@ SPEC CHECKSUMS:
React-jsiexecutor: a27badbbdbc0ff781813370736a2d1c7261181d4
React-jsinspector: 8a3d3f5dcd23a91e8c80b1bf0e96902cd1dca999
React-logger: 1088859f145b8f6dd0d3ed051a647ef0e3e80fad
react-native-adjust: 0463129823eabe31ff28262295be713ba5f99d2c
react-native-adjust-test: 8a3a43bbe0e7a59a8312a22f4af4e2034d223e7e
react-native-adjust: 9a9d5b7fff8de8209d468ee4bd3fc1bc386d78cd
react-native-adjust-test: 24dcaec553acf560a9aedaa2622498fc8ec29a45
React-perflogger: cb386fd44c97ec7f8199c04c12b22066b0f2e1e0
React-RCTActionSheet: f803a85e46cf5b4066c2ac5e122447f918e9c6e5
React-RCTAnimation: 19c80fa950ccce7f4db76a2a7f2cf79baae07fc7
Expand Down
Loading