Merge pull request #702 from adjust/v4380

Version 4.38.0
adjust · Mar 22, 2024 · 3ebb6fe · 3ebb6fe
2 parents cd05aec + c25fd63
commit 3ebb6fe
Show file tree

Hide file tree

Showing 47 changed files with 1,089 additions and 805 deletions.
diff --git a/Adjust.podspec b/Adjust.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.37.2"
+  s.version        = "4.38.0"
   s.summary        = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
   s.homepage       = "https://github.com/adjust/ios_sdk"
   s.license        = { :type => 'MIT', :file => 'MIT-LICENSE' }
   s.author         = { "Adjust" => "[email protected]" }
-  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.37.2" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.38.0" }
   s.ios.deployment_target = '9.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'
@@ -17,6 +17,7 @@ Pod::Spec.new do |s|
 
   s.subspec 'Core' do |co|
     co.source_files   = 'Adjust/*.{h,m}', 'Adjust/ADJAdditions/*.{h,m}'
+    co.resource_bundle = {'Adjust' => ['Adjust/*.xcprivacy']}
   end
 
   s.subspec 'Sociomantic' do |sm|

diff --git a/Adjust.xcodeproj/project.pbxproj b/Adjust.xcodeproj/project.pbxproj
@@ -22,6 +22,9 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+		07BFEAA22A49E3DA004E29D9 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 07BFEAA12A49E3DA004E29D9 /* PrivacyInfo.xcprivacy */; };
+		07BFEAA32A49E3DA004E29D9 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 07BFEAA12A49E3DA004E29D9 /* PrivacyInfo.xcprivacy */; };
+		07BFEAA42A49E3DA004E29D9 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 07BFEAA12A49E3DA004E29D9 /* PrivacyInfo.xcprivacy */; };
 		0A67F1D92919641D00AC684A /* ADJSKAdNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DF212D32909E86A0056D579 /* ADJSKAdNetwork.m */; };
 		0A67F1DA2919641E00AC684A /* ADJSKAdNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DF212D32909E86A0056D579 /* ADJSKAdNetwork.m */; };
 		0A67F1DB2919641F00AC684A /* ADJSKAdNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DF212D32909E86A0056D579 /* ADJSKAdNetwork.m */; };
@@ -947,6 +950,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		07BFEAA12A49E3DA004E29D9 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		0AB1C97127DD450D00509231 /* libAdjustSdk.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libAdjustSdk.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		0AB1C97327DD450D00509231 /* AdjustSdk.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AdjustSdk.h; sourceTree = "<group>"; };
 		0AB1C9F627DD5B5100509231 /* ModuleMap */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ModuleMap; sourceTree = "<group>"; };
@@ -1675,6 +1679,7 @@
 		96E5E34B18BBB48A008E7B30 /* Adjust */ = {
 			isa = PBXGroup;
 			children = (
+				07BFEAA12A49E3DA004E29D9 /* PrivacyInfo.xcprivacy */,
 				96CD2BDB1A13BFC600A40AFB /* ADJAdditions */,
 				96E5E34C18BBB48A008E7B30 /* Adjust.h */,
 				96E5E34D18BBB48A008E7B30 /* Adjust.m */,
@@ -2993,6 +2998,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				07BFEAA42A49E3DA004E29D9 /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3007,13 +3013,15 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				07BFEAA32A49E3DA004E29D9 /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		9DFA37AB1C0F219400782607 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				07BFEAA22A49E3DA004E29D9 /* PrivacyInfo.xcprivacy in Resources */,
 				0AB1C9F727DD5B5100509231 /* ModuleMap in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/Adjust/ADJActivityHandler.m b/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;

diff --git a/Adjust/ADJAdjustFactory.h b/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;

diff --git a/Adjust/ADJAdjustFactory.m b/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
diff --git a/Adjust/ADJPackageBuilder.h b/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;