From d87d8342ccc1d182e4be9805066e6884e159dd4e Mon Sep 17 00:00:00 2001 From: "Benjamin Scholtysik (Reimold)" Date: Mon, 18 Sep 2017 18:03:03 -0700 Subject: [PATCH] Remove pre-iOS8 base64 encoding helper methods --- Classes/BITAuthenticator.m | 2 +- Classes/BITHockeyHelper.h | 1 - Classes/BITHockeyHelper.m | 12 ------------ 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/Classes/BITAuthenticator.m b/Classes/BITAuthenticator.m index 54252874f9..4ff122b67f 100644 --- a/Classes/BITAuthenticator.m +++ b/Classes/BITAuthenticator.m @@ -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"]; } diff --git a/Classes/BITHockeyHelper.h b/Classes/BITHockeyHelper.h index 8d5bf60d67..e25f0d4a76 100644 --- a/Classes/BITHockeyHelper.h +++ b/Classes/BITHockeyHelper.h @@ -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); diff --git a/Classes/BITHockeyHelper.m b/Classes/BITHockeyHelper.m index b36f5509eb..47147ddc43 100644 --- a/Classes/BITHockeyHelper.m +++ b/Classes/BITHockeyHelper.m @@ -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