ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-21 19:49:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove pre-iOS8 base64 encoding helper methods

Browse Source
This commit is contained in:
Benjamin Scholtysik (Reimold)
2017-09-18 18:03:03 -07:00
parent bd8f15fc3d
commit d87d8342cc
3 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Classes/BITAuthenticator.m
View File

@@ -526,7 +526,7 @@ static unsigned char kBITPNGEndChunk[4] = {0x49, 0x45, 0x4e, 0x44};
if (BITAuthenticatorIdentificationTypeHockeyAppUser == self.identificationType) {
NSString *authStr = [NSString stringWithFormat:@"%@:%@", email, password];
NSData *authData = [authStr dataUsingEncoding:NSUTF8StringEncoding];
NSString *authValue = [NSString stringWithFormat:@"Basic %@", bit_base64String(authData, authData.length)];
NSString *authValue = [NSString stringWithFormat:@"Basic %@", [authData base64EncodedStringWithOptions:0]];
[request setValue:authValue forHTTPHeaderField:@"Authorization"];
}

1
Classes/BITHockeyHelper.h
View File

@@ -76,7 +76,6 @@ BOOL bit_isDebuggerAttached(void);
/* NSString helpers */
NSString *bit_URLEncodedString(NSString *inputString);
NSString *bit_base64String(NSData * data, unsigned long length);
/* Context helpers */
NSString *bit_utcDateString(NSDate *date);

12
Classes/BITHockeyHelper.m
View File

@@ -366,18 +366,6 @@ NSString *bit_URLEncodedString(NSString *inputString) {
return [inputString stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet characterSetWithCharactersInString:@"!*'();:@&=+$,/?%#[] {}"].invertedSet];
}
NSString *bit_base64String(NSData * data, unsigned long __unused length) {
SEL base64EncodingSelector = NSSelectorFromString(@"base64EncodedStringWithOptions:");
if ([data respondsToSelector:base64EncodingSelector]) {
return [data base64EncodedStringWithOptions:0];
} else {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
return [data base64Encoding];
#pragma clang diagnostic pop
}
}
#pragma mark Context helpers
// Return ISO 8601 string representation of the date