Merge pull request #235 from adjust/v4372

uerceg · web-flow · commit 74e2d836d629 · 2024-03-21T22:53:57.000+01:00
Version 4.37.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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).
@@ -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
@@ -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
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.37.1
+4.37.2
diff --git a/android/libs/adjust-android.jar b/android/libs/adjust-android.jar
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -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)
@@ -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):
@@ -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
@@ -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
diff --git a/example/yarn.lock b/example/yarn.lock
@@ -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"
@@ -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"
diff --git a/ext/android/sdk b/ext/android/sdk
@@ -1 +1 @@
-Subproject commit 57f4684cd7cb2253cd9d19367be2b76c0abe40b6
+Subproject commit e4222a82ca93c99902acd95d716aa851074cb6e5
diff --git a/ext/ios/sdk b/ext/ios/sdk
@@ -1 +1 @@
-Subproject commit f7a0ad4a9f99fcbfc4c73dcad557ea3c86c5aaf6
+Subproject commit cd05aecfcb9af2f5c5f23cac162974e94eab10d4
diff --git a/index.js b/index.js
@@ -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) {
@@ -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;
diff --git a/ios/Adjust/ADJActivityHandler.m b/ios/Adjust/ADJActivityHandler.m
@@ -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;
diff --git a/ios/Adjust/ADJPackageBuilder.m b/ios/Adjust/ADJPackageBuilder.m
@@ -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
diff --git a/ios/Adjust/ADJUtil.m b/ios/Adjust/ADJUtil.m
@@ -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";
diff --git a/ios/Adjust/Adjust.h b/ios/Adjust/Adjust.h
@@ -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.
 //
@@ -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.
diff --git a/ios/Adjust/Adjust.m b/ios/Adjust/Adjust.m
@@ -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";
diff --git a/ios/Adjust/include/Adjust.h b/ios/Adjust/include/Adjust.h
@@ -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.
 //
@@ -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.
diff --git a/package.json b/package.json
@@ -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",
diff --git a/plugins/oaid/android/libs/adjust-android-oaid.jar b/plugins/oaid/android/libs/adjust-android-oaid.jar
diff --git a/plugins/oaid/package.json b/plugins/oaid/package.json
@@ -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",
diff --git a/react-native-adjust.podspec b/react-native-adjust.podspec
@@ -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
diff --git a/test/app/App.js b/test/app/App.js
@@ -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";
diff --git a/test/app/ios/Podfile.lock b/test/app/ios/Podfile.lock
@@ -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)
@@ -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):
@@ -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
@@ -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
diff --git a/test/app/yarn.lock b/test/app/yarn.lock
diff --git a/test/lib/android/libs/adjust-test-library.jar b/test/lib/android/libs/adjust-test-library.jar
diff --git a/test/lib/package.json b/test/lib/package.json
