Skip to content

Updated URL query encoding to not use a deprecated function #583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated URL query encoding to not use a deprecated function #583

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
476e264
Proper URL query encoding
Jan 4, 2022
d8c9035
Subtract characters form query allowed set to get the correct set
Jan 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions Adjust/ADJAdditions/NSString+ADJAdditions.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,14 @@ - (NSString *)adjTrim {
}

- (NSString *)adjUrlEncode {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
return (NSString *)CFBridgingRelease(CFURLCreateStringByAddingPercentEscapes(
NULL,
(CFStringRef)self,
NULL,
(CFStringRef)@"!*'\"();:@&=+$,/?%#[]% ",
CFStringConvertNSStringEncodingToEncoding(NSUTF8StringEncoding)));
#pragma clang diagnostic pop
// Alternative:
// return [self stringByAddingPercentEncodingWithAllowedCharacters:
// [NSCharacterSet characterSetWithCharactersInString:@"!*'\"();:@&=+$,/?%#[]% "]];
NSMutableCharacterSet *urlQueryKeyValueAllowedCharacterSet = [[NSCharacterSet URLQueryAllowedCharacterSet] mutableCopy];
[urlQueryKeyValueAllowedCharacterSet removeCharactersInString:@"!*'\"();:@&=+$,/?%#[]% "];

return [self stringByAddingPercentEncodingWithAllowedCharacters: urlQueryKeyValueAllowedCharacterSet];
}

- (NSString *)adjUrlDecode {
return (NSString *)CFBridgingRelease(CFURLCreateStringByReplacingPercentEscapes(
kCFAllocatorDefault,
(CFStringRef)self,
CFSTR("")));
return [self stringByRemovingPercentEncoding];
}

- (NSString *)adjSha256 {
Expand Down