Skip to content

Commit 3ebb6fe

Browse files
uerceguerceg
authored
Merge pull request #702 from adjust/v4380
Version 4.38.0
2 parents cd05aec + c25fd63 commit 3ebb6fe

File tree

47 files changed

+1089
-805
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1089
-805
lines changed

‎Adjust.podspec‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Pod::Spec.new do |s|
22
s.name = "Adjust"
3-
s.version = "4.37.2"
3+
s.version = "4.38.0"
44
s.summary = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
55
s.homepage = "https://github.com/adjust/ios_sdk"
66
s.license = { :type => 'MIT', :file => 'MIT-LICENSE' }
77
s.author = { "Adjust" => "[email protected]" }
8-
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.37.2" }
8+
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.38.0" }
99
s.ios.deployment_target = '9.0'
1010
s.tvos.deployment_target = '9.0'
1111
s.framework = 'SystemConfiguration'
@@ -17,6 +17,7 @@ Pod::Spec.new do |s|
1717

1818
s.subspec 'Core' do |co|
1919
co.source_files = 'Adjust/*.{h,m}', 'Adjust/ADJAdditions/*.{h,m}'
20+
co.resource_bundle = {'Adjust' => ['Adjust/*.xcprivacy']}
2021
end
2122

2223
s.subspec 'Sociomantic' do |sm|

‎Adjust.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
/* End PBXAggregateTarget section */
2323

2424
/* Begin PBXBuildFile section */
25+
07BFEAA22A49E3DA004E29D9 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 07BFEAA12A49E3DA004E29D9 /* PrivacyInfo.xcprivacy */; };
26+
07BFEAA32A49E3DA004E29D9 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 07BFEAA12A49E3DA004E29D9 /* PrivacyInfo.xcprivacy */; };
27+
07BFEAA42A49E3DA004E29D9 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 07BFEAA12A49E3DA004E29D9 /* PrivacyInfo.xcprivacy */; };
2528
0A67F1D92919641D00AC684A /* ADJSKAdNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DF212D32909E86A0056D579 /* ADJSKAdNetwork.m */; };
2629
0A67F1DA2919641E00AC684A /* ADJSKAdNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DF212D32909E86A0056D579 /* ADJSKAdNetwork.m */; };
2730
0A67F1DB2919641F00AC684A /* ADJSKAdNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DF212D32909E86A0056D579 /* ADJSKAdNetwork.m */; };
@@ -947,6 +950,7 @@
947950
/* End PBXCopyFilesBuildPhase section */
948951

949952
/* Begin PBXFileReference section */
953+
07BFEAA12A49E3DA004E29D9 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
950954
0AB1C97127DD450D00509231 /* libAdjustSdk.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libAdjustSdk.a; sourceTree = BUILT_PRODUCTS_DIR; };
951955
0AB1C97327DD450D00509231 /* AdjustSdk.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AdjustSdk.h; sourceTree = "<group>"; };
952956
0AB1C9F627DD5B5100509231 /* ModuleMap */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ModuleMap; sourceTree = "<group>"; };
@@ -1675,6 +1679,7 @@
16751679
96E5E34B18BBB48A008E7B30 /* Adjust */ = {
16761680
isa = PBXGroup;
16771681
children = (
1682+
07BFEAA12A49E3DA004E29D9 /* PrivacyInfo.xcprivacy */,
16781683
96CD2BDB1A13BFC600A40AFB /* ADJAdditions */,
16791684
96E5E34C18BBB48A008E7B30 /* Adjust.h */,
16801685
96E5E34D18BBB48A008E7B30 /* Adjust.m */,
@@ -2993,6 +2998,7 @@
29932998
isa = PBXResourcesBuildPhase;
29942999
buildActionMask = 2147483647;
29953000
files = (
3001+
07BFEAA42A49E3DA004E29D9 /* PrivacyInfo.xcprivacy in Resources */,
29963002
);
29973003
runOnlyForDeploymentPostprocessing = 0;
29983004
};
@@ -3007,13 +3013,15 @@
30073013
isa = PBXResourcesBuildPhase;
30083014
buildActionMask = 2147483647;
30093015
files = (
3016+
07BFEAA32A49E3DA004E29D9 /* PrivacyInfo.xcprivacy in Resources */,
30103017
);
30113018
runOnlyForDeploymentPostprocessing = 0;
30123019
};
30133020
9DFA37AB1C0F219400782607 /* Resources */ = {
30143021
isa = PBXResourcesBuildPhase;
30153022
buildActionMask = 2147483647;
30163023
files = (
3024+
07BFEAA22A49E3DA004E29D9 /* PrivacyInfo.xcprivacy in Resources */,
30173025
0AB1C9F727DD5B5100509231 /* ModuleMap in Resources */,
30183026
);
30193027
runOnlyForDeploymentPostprocessing = 0;

‎Adjust/ADJActivityHandler.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2625,9 +2625,9 @@ - (void)updatePackagesAttStatusAndIdfaI:(ADJActivityHandler *)selfI {
26252625
// update activity packages
26262626
int attStatus = [ADJUtil attStatus];
26272627
if (attStatus != 0) {
2628-
[selfI.packageHandler updatePackagesWithIdfaAndAttStatus];
2629-
[selfI.sdkClickHandler updatePackagesWithIdfaAndAttStatus];
2630-
[selfI.purchaseVerificationHandler updatePackagesWithIdfaAndAttStatus];
2628+
[selfI.packageHandler updatePackagesWithAttStatus:attStatus];
2629+
[selfI.sdkClickHandler updatePackagesWithAttStatus:attStatus];
2630+
[selfI.purchaseVerificationHandler updatePackagesWithAttStatus:attStatus];
26312631
}
26322632

26332633
selfI.internalState.updatePackagesAttData = NO;

‎Adjust/ADJAdjustFactory.h‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
+ (double)sessionInterval;
1919
+ (double)subsessionInterval;
2020
+ (double)requestTimeout;
21+
+ (NSNumber *)attStatus;
22+
+ (NSString *)idfa;
2123
+ (NSTimeInterval)timerInterval;
2224
+ (NSTimeInterval)timerStart;
2325
+ (ADJBackoffStrategy *)packageHandlerBackoffStrategy;
@@ -26,15 +28,14 @@
2628

2729
+ (BOOL)testing;
2830
+ (NSTimeInterval)maxDelayStart;
29-
+ (NSString *)baseUrl;
30-
+ (NSString *)gdprUrl;
31-
+ (NSString *)subscriptionUrl;
32-
+ (NSString *)purchaseVerificationUrl;
31+
+ (NSString *)urlOverwrite;
3332
+ (BOOL)adServicesFrameworkEnabled;
3433

3534
+ (void)setLogger:(id<ADJLogger>)logger;
3635
+ (void)setSessionInterval:(double)sessionInterval;
3736
+ (void)setSubsessionInterval:(double)subsessionInterval;
37+
+ (void)setAttStatus:(NSNumber *)attStatus;
38+
+ (void)setIdfa:(NSString *)idfa;
3839
+ (void)setRequestTimeout:(double)requestTimeout;
3940
+ (void)setTimerInterval:(NSTimeInterval)timerInterval;
4041
+ (void)setTimerStart:(NSTimeInterval)timerStart;
@@ -43,10 +44,7 @@
4344
+ (void)setTesting:(BOOL)testing;
4445
+ (void)setAdServicesFrameworkEnabled:(BOOL)adServicesFrameworkEnabled;
4546
+ (void)setMaxDelayStart:(NSTimeInterval)maxDelayStart;
46-
+ (void)setBaseUrl:(NSString *)baseUrl;
47-
+ (void)setGdprUrl:(NSString *)gdprUrl;
48-
+ (void)setSubscriptionUrl:(NSString *)subscriptionUrl;
49-
+ (void)setPurchaseVerificationUrl:(NSString *)purchaseVerificationUrl;
47+
+ (void)setUrlOverwrite:(NSString *)urlOverwrite;
5048

5149
+ (void)enableSigning;
5250
+ (void)disableSigning;

‎Adjust/ADJAdjustFactory.m‎

Lines changed: 25 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
static double internalSessionInterval = -1;
1616
static double intervalSubsessionInterval = -1;
1717
static double internalRequestTimeout = -1;
18+
static NSNumber * internalAttStatus = nil;
19+
static NSString * internalIdfa = nil;
1820
static NSTimeInterval internalTimerInterval = -1;
1921
static NSTimeInterval intervalTimerStart = -1;
2022
static ADJBackoffStrategy * packageHandlerBackoffStrategy = nil;
@@ -24,10 +26,7 @@
2426
static NSTimeInterval internalMaxDelayStart = -1;
2527
static BOOL internalAdServicesFrameworkEnabled = YES;
2628

27-
static NSString * internalBaseUrl = nil;
28-
static NSString * internalGdprUrl = nil;
29-
static NSString * internalSubscriptionUrl = nil;
30-
static NSString * internalPurchaseVerificationUrl = nil;
29+
static NSString * internalUrlOverwrite = nil;
3130

3231
@implementation ADJAdjustFactory
3332

@@ -60,6 +59,14 @@ + (double)requestTimeout {
6059
return internalRequestTimeout;
6160
}
6261

62+
+ (NSNumber *)attStatus {
63+
return internalAttStatus;
64+
}
65+
66+
+ (NSString *)idfa {
67+
return internalIdfa;
68+
}
69+
6370
+ (NSTimeInterval)timerInterval {
6471
if (internalTimerInterval < 0) {
6572
return 60; // 1 minute
@@ -110,20 +117,8 @@ + (NSTimeInterval)maxDelayStart {
110117
return internalMaxDelayStart;
111118
}
112119

113-
+ (NSString *)baseUrl {
114-
return internalBaseUrl;
115-
}
116-
117-
+ (NSString *)gdprUrl {
118-
return internalGdprUrl;
119-
}
120-
121-
+ (NSString *)subscriptionUrl {
122-
return internalSubscriptionUrl;
123-
}
124-
125-
+ (NSString *)purchaseVerificationUrl {
126-
return internalPurchaseVerificationUrl;
120+
+ (NSString *)urlOverwrite {
121+
return internalUrlOverwrite;
127122
}
128123

129124
+ (void)setLogger:(id<ADJLogger>)logger {
@@ -137,6 +132,13 @@ + (void)setSessionInterval:(double)sessionInterval {
137132
+ (void)setSubsessionInterval:(double)subsessionInterval {
138133
intervalSubsessionInterval = subsessionInterval;
139134
}
135+
+ (void)setAttStatus:(NSNumber *)attStatus {
136+
internalAttStatus = attStatus;
137+
}
138+
139+
+ (void)setIdfa:(NSString *)idfa {
140+
internalIdfa = idfa;
141+
}
140142

141143
+ (void)setRequestTimeout:(double)requestTimeout {
142144
internalRequestTimeout = requestTimeout;
@@ -170,20 +172,8 @@ + (void)setMaxDelayStart:(NSTimeInterval)maxDelayStart {
170172
internalMaxDelayStart = maxDelayStart;
171173
}
172174

173-
+ (void)setBaseUrl:(NSString *)baseUrl {
174-
internalBaseUrl = baseUrl;
175-
}
176-
177-
+ (void)setGdprUrl:(NSString *)gdprUrl {
178-
internalGdprUrl = gdprUrl;
179-
}
180-
181-
+ (void)setSubscriptionUrl:(NSString *)subscriptionUrl {
182-
internalSubscriptionUrl = subscriptionUrl;
183-
}
184-
185-
+ (void)setPurchaseVerificationUrl:(NSString *)purchaseVerificationUrl {
186-
internalPurchaseVerificationUrl = purchaseVerificationUrl;
175+
+ (void)setUrlOverwrite:(NSString *)urlOverwrite {
176+
internalUrlOverwrite = urlOverwrite;
187177
}
188178

189179
+ (void)enableSigning {
@@ -240,15 +230,14 @@ + (void)teardown:(BOOL)deleteState {
240230
internalTimerInterval = -1;
241231
intervalTimerStart = -1;
242232
internalRequestTimeout = -1;
233+
internalAttStatus = nil;
234+
internalIdfa = nil;
243235
packageHandlerBackoffStrategy = nil;
244236
sdkClickHandlerBackoffStrategy = nil;
245237
installSessionBackoffStrategy = nil;
246238
internalTesting = NO;
247239
internalMaxDelayStart = -1;
248-
internalBaseUrl = nil;
249-
internalGdprUrl = nil;
250-
internalSubscriptionUrl = nil;
251-
internalPurchaseVerificationUrl = nil;
240+
internalUrlOverwrite = nil;
252241
internalAdServicesFrameworkEnabled = YES;
253242
}
254243
@end

‎Adjust/ADJPackageBuilder.h‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,16 @@
9494

9595
+ (BOOL)isAdServicesPackage:(ADJActivityPackage * _Nullable)activityPackage;
9696

97-
+ (void)addIdfaToParameters:(NSMutableDictionary * _Nullable)parameters
98-
withConfig:(ADJConfig * _Nullable)adjConfig
99-
logger:(id<ADJLogger> _Nullable)logger
100-
packageParams:(ADJPackageParams * _Nullable)packageParams;
97+
+ (void)addConsentDataToParameters:(NSMutableDictionary * _Nullable)parameters
98+
forActivityKind:(ADJActivityKind)activityKind
99+
withAttStatus:(NSString * _Nullable)attStatusString
100+
configuration:(ADJConfig * _Nullable)adjConfig
101+
packageParams:(ADJPackageParams * _Nullable)packageParams;
102+
103+
+ (void)removeConsentDataFromParameters:(nonnull NSMutableDictionary *)parameters;
104+
105+
+ (void)updateAttStatusInParameters:(nonnull NSMutableDictionary *)parameters;
106+
101107
@end
102108
// TODO change to ADJ...
103109
extern NSString * _Nullable const ADJAttributionTokenParameter;

0 commit comments

Comments
 (0)