Merge pull request #236 from adjust/v4380

Version 4.38.0

CHANGELOG.md

@@ -1,3 +1,16 @@
+### Version 4.38.0 (27th March 2024)
+#### Added
+- Added iOS Privacy Manifest for the Adjust SDK.
+- Added new domains and corresponding payload restrictions for the Adjust SDK to direct the iOS traffic to:
+    - https://consent.adjust.com - for consented users
+    - https://analytics.adjust.com - for non-consented users
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.38.0]
+- [[email protected]][android_sdk_v4.38.3]
+
+---
+
 ### 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).
@@ -631,6 +644,7 @@
 [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
+[ios_sdk_v4.38.0]: https://github.com/adjust/ios_sdk/tree/v4.38.0
 
 [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
@@ -667,3 +681,4 @@
 [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
+[android_sdk_v4.38.3]: https://github.com/adjust/android_sdk/tree/v4.38.3

VERSION

@@ -1 +1 @@
-4.37.2
+4.38.0

example/ios/Podfile.lock

@@ -1,7 +1,7 @@
 PODS:
-  - Adjust (4.37.2):
-    - Adjust/Core (= 4.37.2)
-  - Adjust/Core (4.37.2)
+  - Adjust (4.38.0):
+    - Adjust/Core (= 4.38.0)
+  - Adjust/Core (4.38.0)
   - 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.2):
-    - Adjust (= 4.37.2)
+  - react-native-adjust (4.38.0):
+    - Adjust (= 4.38.0)
     - 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: a830d963025334aee8a62a7bac87825e297a841e
+  Adjust: c98d85594a746ff9f2bafe424c5beb6db66cd6a8
   boost: a7c83b31436843459a1961bfd74b96033dc77234
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
@@ -541,7 +541,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: a27badbbdbc0ff781813370736a2d1c7261181d4
   React-jsinspector: 8a3d3f5dcd23a91e8c80b1bf0e96902cd1dca999
   React-logger: 1088859f145b8f6dd0d3ed051a647ef0e3e80fad
-  react-native-adjust: 9a9d5b7fff8de8209d468ee4bd3fc1bc386d78cd
+  react-native-adjust: 801fe33f0dc0097b0474f11d08572a89fa6602ce
   React-perflogger: cb386fd44c97ec7f8199c04c12b22066b0f2e1e0
   React-RCTActionSheet: f803a85e46cf5b4066c2ac5e122447f918e9c6e5
   React-RCTAnimation: 19c80fa950ccce7f4db76a2a7f2cf79baae07fc7

index.js

@@ -136,7 +136,7 @@ Adjust.getAmazonAdId = function(callback) {
 };
 
 Adjust.getSdkVersion = function(callback) {
-    module_adjust.getSdkVersion("react-native4.37.2", callback);
+    module_adjust.getSdkVersion("react-native4.38.0", callback);
 };
 
 Adjust.setReferrer = function(referrer) {
@@ -280,7 +280,7 @@ Adjust.onPause = function(testParam) {
 // AdjustConfig
 
 var AdjustConfig = function(appToken, environment) {
-    this.sdkPrefix = "react-native4.37.2";
+    this.sdkPrefix = "react-native4.38.0";
     this.appToken = appToken;
     this.environment = environment;
     this.logLevel = null;

ios/Adjust/ADJActivityHandler.m

@@ -2625,9 +2625,9 @@ - (void)updatePackagesAttStatusAndIdfaI:(ADJActivityHandler *)selfI {
     // update activity packages
     int attStatus = [ADJUtil attStatus];
     if (attStatus != 0) {
-        [selfI.packageHandler updatePackagesWithIdfaAndAttStatus];
-        [selfI.sdkClickHandler updatePackagesWithIdfaAndAttStatus];
-        [selfI.purchaseVerificationHandler updatePackagesWithIdfaAndAttStatus];
+        [selfI.packageHandler updatePackagesWithAttStatus:attStatus];
+        [selfI.sdkClickHandler updatePackagesWithAttStatus:attStatus];
+        [selfI.purchaseVerificationHandler updatePackagesWithAttStatus:attStatus];
     }
 
     selfI.internalState.updatePackagesAttData = NO;

ios/Adjust/ADJAdjustFactory.h

@@ -18,6 +18,8 @@
 + (double)sessionInterval;
 + (double)subsessionInterval;
 + (double)requestTimeout;
++ (NSNumber *)attStatus;
++ (NSString *)idfa;
 + (NSTimeInterval)timerInterval;
 + (NSTimeInterval)timerStart;
 + (ADJBackoffStrategy *)packageHandlerBackoffStrategy;
@@ -26,15 +28,14 @@
 
 + (BOOL)testing;
 + (NSTimeInterval)maxDelayStart;
-+ (NSString *)baseUrl;
-+ (NSString *)gdprUrl;
-+ (NSString *)subscriptionUrl;
-+ (NSString *)purchaseVerificationUrl;
++ (NSString *)urlOverwrite;
 + (BOOL)adServicesFrameworkEnabled;
 
 + (void)setLogger:(id<ADJLogger>)logger;
 + (void)setSessionInterval:(double)sessionInterval;
 + (void)setSubsessionInterval:(double)subsessionInterval;
++ (void)setAttStatus:(NSNumber *)attStatus;
++ (void)setIdfa:(NSString *)idfa;
 + (void)setRequestTimeout:(double)requestTimeout;
 + (void)setTimerInterval:(NSTimeInterval)timerInterval;
 + (void)setTimerStart:(NSTimeInterval)timerStart;
@@ -43,10 +44,7 @@
 + (void)setTesting:(BOOL)testing;
 + (void)setAdServicesFrameworkEnabled:(BOOL)adServicesFrameworkEnabled;
 + (void)setMaxDelayStart:(NSTimeInterval)maxDelayStart;
-+ (void)setBaseUrl:(NSString *)baseUrl;
-+ (void)setGdprUrl:(NSString *)gdprUrl;
-+ (void)setSubscriptionUrl:(NSString *)subscriptionUrl;
-+ (void)setPurchaseVerificationUrl:(NSString *)purchaseVerificationUrl;
++ (void)setUrlOverwrite:(NSString *)urlOverwrite;
 
 + (void)enableSigning;
 + (void)disableSigning;

ios/Adjust/ADJAdjustFactory.m

@@ -15,6 +15,8 @@
 static double internalSessionInterval    = -1;
 static double intervalSubsessionInterval = -1;
 static double internalRequestTimeout = -1;
+static NSNumber * internalAttStatus = nil;
+static NSString * internalIdfa = nil;
 static NSTimeInterval internalTimerInterval = -1;
 static NSTimeInterval intervalTimerStart = -1;
 static ADJBackoffStrategy * packageHandlerBackoffStrategy = nil;
@@ -24,10 +26,7 @@
 static NSTimeInterval internalMaxDelayStart = -1;
 static BOOL internalAdServicesFrameworkEnabled = YES;
 
-static NSString * internalBaseUrl = nil;
-static NSString * internalGdprUrl = nil;
-static NSString * internalSubscriptionUrl = nil;
-static NSString * internalPurchaseVerificationUrl = nil;
+static NSString * internalUrlOverwrite = nil;
 
 @implementation ADJAdjustFactory
 
@@ -60,6 +59,14 @@ + (double)requestTimeout {
     return internalRequestTimeout;
 }
 
++ (NSNumber *)attStatus {
+    return internalAttStatus;
+}
+
++ (NSString *)idfa {
+    return internalIdfa;
+}
+
 + (NSTimeInterval)timerInterval {
     if (internalTimerInterval < 0) {
         return 60;                // 1 minute
@@ -110,20 +117,8 @@ + (NSTimeInterval)maxDelayStart {
     return internalMaxDelayStart;
 }
 
-+ (NSString *)baseUrl {
-    return internalBaseUrl;
-}
-
-+ (NSString *)gdprUrl {
-    return internalGdprUrl;
-}
-
-+ (NSString *)subscriptionUrl {
-    return internalSubscriptionUrl;
-}
-
-+ (NSString *)purchaseVerificationUrl {
-    return internalPurchaseVerificationUrl;
++ (NSString *)urlOverwrite {
+    return internalUrlOverwrite;
 }
 
 + (void)setLogger:(id<ADJLogger>)logger {
@@ -137,6 +132,13 @@ + (void)setSessionInterval:(double)sessionInterval {
 + (void)setSubsessionInterval:(double)subsessionInterval {
     intervalSubsessionInterval = subsessionInterval;
 }
++ (void)setAttStatus:(NSNumber *)attStatus {
+    internalAttStatus = attStatus;
+}
+
++ (void)setIdfa:(NSString *)idfa {
+    internalIdfa = idfa;
+}
 
 + (void)setRequestTimeout:(double)requestTimeout {
     internalRequestTimeout = requestTimeout;
@@ -170,20 +172,8 @@ + (void)setMaxDelayStart:(NSTimeInterval)maxDelayStart {
     internalMaxDelayStart = maxDelayStart;
 }
 
-+ (void)setBaseUrl:(NSString *)baseUrl {
-    internalBaseUrl = baseUrl;
-}
-
-+ (void)setGdprUrl:(NSString *)gdprUrl {
-    internalGdprUrl = gdprUrl;
-}
-
-+ (void)setSubscriptionUrl:(NSString *)subscriptionUrl {
-    internalSubscriptionUrl = subscriptionUrl;
-}
-
-+ (void)setPurchaseVerificationUrl:(NSString *)purchaseVerificationUrl {
-    internalPurchaseVerificationUrl = purchaseVerificationUrl;
++ (void)setUrlOverwrite:(NSString *)urlOverwrite {
+    internalUrlOverwrite = urlOverwrite;
 }
 
 + (void)enableSigning {
@@ -240,15 +230,14 @@ + (void)teardown:(BOOL)deleteState {
     internalTimerInterval = -1;
     intervalTimerStart = -1;
     internalRequestTimeout = -1;
+    internalAttStatus = nil;
+    internalIdfa = nil;
     packageHandlerBackoffStrategy = nil;
     sdkClickHandlerBackoffStrategy = nil;
     installSessionBackoffStrategy = nil;
     internalTesting = NO;
     internalMaxDelayStart = -1;
-    internalBaseUrl = nil;
-    internalGdprUrl = nil;
-    internalSubscriptionUrl = nil;
-    internalPurchaseVerificationUrl = nil;
+    internalUrlOverwrite = nil;
     internalAdServicesFrameworkEnabled = YES;
 }
 @end

ios/Adjust/ADJPackageBuilder.h

@@ -94,10 +94,16 @@
 
 + (BOOL)isAdServicesPackage:(ADJActivityPackage * _Nullable)activityPackage;
 
-+ (void)addIdfaToParameters:(NSMutableDictionary * _Nullable)parameters
-                 withConfig:(ADJConfig * _Nullable)adjConfig
-                     logger:(id<ADJLogger> _Nullable)logger
-              packageParams:(ADJPackageParams * _Nullable)packageParams;
++ (void)addConsentDataToParameters:(NSMutableDictionary * _Nullable)parameters
+                   forActivityKind:(ADJActivityKind)activityKind
+                     withAttStatus:(NSString * _Nullable)attStatusString
+                     configuration:(ADJConfig * _Nullable)adjConfig
+                     packageParams:(ADJPackageParams * _Nullable)packageParams;
+
++ (void)removeConsentDataFromParameters:(nonnull NSMutableDictionary *)parameters;
+
++ (void)updateAttStatusInParameters:(nonnull NSMutableDictionary *)parameters;
+
 @end
 // TODO change to ADJ...
 extern NSString * _Nullable const ADJAttributionTokenParameter;