Skip to content

Commit 3a19868

Browse files
authored
Merge pull request #676 from adjust/v4342
Version 4.34.2
2 parents f129fbc + 41294ac commit 3a19868

File tree

11 files changed

+36
-16
lines changed

11 files changed

+36
-16
lines changed

Adjust.podspec

Lines changed: 2 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.34.1"
3+
s.version = "4.34.2"
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.34.1" }
8+
s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.34.2" }
99
s.ios.deployment_target = '9.0'
1010
s.tvos.deployment_target = '9.0'
1111
s.framework = 'SystemConfiguration'

Adjust/ADJActivityHandler.m

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,12 @@ - (id)initWithConfig:(ADJConfig *)adjustConfig
142142
[ADJAdjustFactory.logger warn:@"AdServices info reading has been switched off"];
143143
}
144144

145+
// check if ATT consent delay has been configured
146+
if (adjustConfig.attConsentWaitingInterval > 0) {
147+
[ADJAdjustFactory.logger info:@"ATT consent waiting interval has been configured to %d",
148+
adjustConfig.attConsentWaitingInterval];
149+
}
150+
145151
self.adjustConfig = adjustConfig;
146152
self.savedPreLaunch = savedPreLaunch;
147153
self.adjustDelegate = adjustConfig.delegate;
@@ -3006,6 +3012,10 @@ - (BOOL)updateAttStatus:(int)readAttStatus {
30063012

30073013
- (void)setAppInActiveState:(BOOL)activeState {
30083014
dispatch_async(self.waitingForAttQueue, ^{
3015+
// skip in case active state didn't change
3016+
if (self.activeState == activeState) {
3017+
return;
3018+
}
30093019
self.activeState = activeState;
30103020
if (self.activeState) {
30113021
[self startWaitingForAttStatus];
@@ -3058,6 +3068,7 @@ - (BOOL)shouldWaitForAttStatus {
30583068

30593069
// We have to set the configured waiting timeout and start ATT status monitoring logic.
30603070
[ADJUserDefaults setAttWaitingRemainingSeconds:timeoutSec];
3071+
30613072
return YES;
30623073
}
30633074

@@ -3074,14 +3085,15 @@ - (void)checkAttStatusPeriodic {
30743085
// check current ATT status
30753086
int attStatus = [ADJUtil attStatus];
30763087
if (attStatus != 0) {
3088+
[self.activityHandler.logger info:@"ATT consent status udated to: %d", attStatus];
30773089
[ADJUserDefaults removeAttWaitingRemainingSeconds];
30783090
[self.activityHandler resumeActivityFromWaitingForAttStatus];
30793091
return;
30803092
}
30813093

30823094
NSUInteger seconds = [ADJUserDefaults getAttWaitingRemainingSeconds];
30833095
if (seconds == 0) {
3084-
[self.activityHandler.logger warn:@"ATT status waiting timeout elapsed - NO ATT STATUS FOUND"];
3096+
[self.activityHandler.logger warn:@"ATT status waiting timeout elapsed without receiving any consent status update"];
30853097
[self.activityHandler resumeActivityFromWaitingForAttStatus];
30863098
return;
30873099
}

Adjust/ADJPackageHandler.m

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,8 @@ - (void)updatePackagesI:(ADJPackageHandler *)selfI
300300
}
301301

302302
- (void)updatePackagesWithIdfaAndAttStatusI:(ADJPackageHandler *)selfI {
303-
304303
int attStatus = [ADJUtil attStatus];
305-
[selfI.logger debug:@"Updating package handler queue"];
306-
[selfI.logger verbose:@"ATT Status %ld", (long)attStatus];
307-
304+
[selfI.logger debug:@"Updating package queue with idfa and att_status: %d", (long)attStatus];
308305
// create package queue copy for new state of array
309306
NSMutableArray *packageQueueCopy = [NSMutableArray array];
310307

Adjust/ADJPurchaseVerificationHandler.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ - (void)sendNextPurchaseVerificationPackageI:(ADJPurchaseVerificationHandler *)s
174174

175175
- (void)updatePackagesWithIdfaAndAttStatusI:(ADJPurchaseVerificationHandler *)selfI {
176176
int attStatus = [ADJUtil attStatus];
177+
[selfI.logger debug:@"Updating purchase_verification queue with idfa and att_status: %d", attStatus];
177178
for (ADJActivityPackage *activityPackage in selfI.packageQueue) {
178179
[ADJPackageBuilder parameters:activityPackage.parameters
179180
setInt:attStatus

Adjust/ADJSdkClickHandler.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ - (void)sendNextSdkClickI:(ADJSdkClickHandler *)selfI {
195195
}
196196

197197
- (void)updatePackagesWithIdfaAndAttStatusI:(ADJSdkClickHandler *)selfI {
198-
199198
int attStatus = [ADJUtil attStatus];
199+
[selfI.logger debug:@"Updating sdk_click queue with idfa and att_status: %d", attStatus];
200200
for (ADJActivityPackage *activityPackage in selfI.packageQueue) {
201201
[ADJPackageBuilder parameters:activityPackage.parameters
202202
setInt:attStatus

Adjust/ADJUtil.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
static NSRegularExpression *shortUniversalLinkRegex = nil;
3636
static NSRegularExpression *excludedDeeplinkRegex = nil;
3737

38-
static NSString * const kClientSdk = @"ios4.34.1";
38+
static NSString * const kClientSdk = @"ios4.34.2";
3939
static NSString * const kDeeplinkParam = @"deep_link=";
4040
static NSString * const kSchemeDelimiter = @"://";
4141
static NSString * const kDefaultScheme = @"AdjustUniversalScheme";

Adjust/Adjust.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Adjust.h
33
// Adjust SDK
44
//
5-
// V4.34.1
5+
// V4.34.2
66
// Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
77
// Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
88
//

AdjustBridge/AdjustBridgeRegister.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ + (NSString *)adjust_js {
275275
if (this.sdkPrefix) {
276276
return this.sdkPrefix;
277277
} else {
278-
return 'web-bridge4.34.1';
278+
return 'web-bridge4.34.2';
279279
}
280280
},
281281
setTestOptions: function(testOptions) {

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
### Version 4.34.2 (6th September 2023)
2+
3+
#### Added
4+
- Added more logging around ATT delay timer feature to indicate that it's activated.
5+
6+
#### Fixed
7+
- Fixed issue where subsequent calls to active state callback would make ATT delay timer elapse sooner.
8+
9+
---
10+
111
### Version 4.34.1 (18th August 2023)
212
#### Fixed
313
- Fixed `ADJPurchase.h` file not found issue via SPM installation (https://github.com/adjust/ios_sdk/issues/673).

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.34.1
1+
4.34.2

0 commit comments

Comments
 (0)