Skip to content

Commit 8394f51

Browse files
committed
chore: cleanup and optimization
1 parent e2c4ace commit 8394f51

File tree

2 files changed

+10
-17
lines changed

2 files changed

+10
-17
lines changed

Adjust/Internal/ADJActivityHandler.m

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2937,16 +2937,13 @@ - (BOOL)shouldWaitForAttStatus {
29372937

29382938
// check current ATT status
29392939
int attStatus = [self attStatus];
2940-
// App Tracking Transparency framework usage is disabled
2941-
if (attStatus == -1) {
2942-
// Just in case it's there from the previous init where
2943-
// App Tracking Transparency framework usage was enabled,
2944-
// remove ATT Waiting related stuff.
2945-
[ADJUserDefaults removeAttWaitingRemainingSeconds];
2946-
return NO;
2947-
}
2948-
2949-
// return if the status is not ATTrackingManagerAuthorizationStatusNotDetermined
2940+
// if attStatus is !=0 means:
2941+
// - consent changed from ATTrackingManagerAuthorizationStatusNotDetermined ( attStatus > 0 )
2942+
// or
2943+
// - App Tracking Transparency framework usage is disabled ( attStatus == -1 )
2944+
// In these cases:
2945+
// 1. NO returned
2946+
// 2. ATT Waiting related stuff is removed from UserDefaults as irrelevant.
29502947
if (attStatus != 0) {
29512948
// Delete att_waiting_seconds key from UserDefaults.
29522949
[ADJUserDefaults removeAttWaitingRemainingSeconds];

Adjust/Internal/ADJRequestHandler.m

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,9 @@ - (nonnull NSString *)urlWithParams:(nonnull NSMutableDictionary *)params
189189

190190
// checking consent related parameters at the package creation moment
191191
NSString *attStatusString = [responseData.sdkPackage.parameters objectForKey:@"att_status"];
192-
BOOL wasConsentWhenCreated = NO;
193-
if (attStatusString != nil) {
194-
wasConsentWhenCreated = [ADJUtil shouldUseConsentParamsForActivityKind:responseData.activityKind
195-
andAttStatus:attStatusString.intValue];
196-
}
192+
int paramsAttStatus = (attStatusString != nil) ? attStatusString.intValue : -1;
193+
BOOL wasConsentWhenCreated = [ADJUtil shouldUseConsentParamsForActivityKind:responseData.activityKind
194+
andAttStatus:paramsAttStatus];
197195

198196
// checking consent related parameters at the package sending moment
199197
int attStatus = -1;
@@ -460,8 +458,6 @@ - (void)handleResponseWithData:(NSData *)data
460458
[self injectParameters:mergedParameters kvArray:kvParameters];
461459

462460
NSString *bodyString = [kvParameters componentsJoinedByString:@"&"];
463-
[self.logger verbose:@"Body (String) to send: [%@]", bodyString];
464-
465461
NSData *body = [NSData dataWithBytes:bodyString.UTF8String length:bodyString.length];
466462
[request setHTTPBody:body];
467463
return request;

0 commit comments

Comments
 (0)