ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-17 20:00:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #85: Replace kNilOptions with 0

Browse Source 
Thanks to Jonathan!
This commit is contained in:
Andreas Linde 2014-01-10 02:27:51 +01:00
parent 6a07ee6a60
commit a0bfdfbaec
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Classes/BITFeedbackManager.m
View File

@ -881,7 +881,7 @@
if (responseString && [responseString dataUsingEncoding:NSUTF8StringEncoding]) { if (responseString && [responseString dataUsingEncoding:NSUTF8StringEncoding]) {
NSError *error = NULL; NSError *error = NULL;
NSDictionary *feedDict = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:[responseString dataUsingEncoding:NSUTF8StringEncoding] options:kNilOptions error:&error]; NSDictionary *feedDict = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:[responseString dataUsingEncoding:NSUTF8StringEncoding] options:0 error:&error];
// server returned empty response? // server returned empty response?
if (error) { if (error) {

2
Classes/BITStoreUpdateManager.m
View File

@ -273,7 +273,7 @@
NSData *data = [responseString dataUsingEncoding:NSUTF8StringEncoding]; NSData *data = [responseString dataUsingEncoding:NSUTF8StringEncoding];
NSError *error = nil; NSError *error = nil;
NSDictionary *json = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:&error]; NSDictionary *json = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
if (error) { if (error) {
BITHockeyLog(@"ERROR: Invalid JSON string. %@", [error localizedDescription]); BITHockeyLog(@"ERROR: Invalid JSON string. %@", [error localizedDescription]);

2
Classes/BITUpdateManager.m
View File

@ -844,7 +844,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
} }
NSError *error = nil; NSError *error = nil;
NSDictionary *json = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:[responseString dataUsingEncoding:NSUTF8StringEncoding] options:kNilOptions error:&error]; NSDictionary *json = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:[responseString dataUsingEncoding:NSUTF8StringEncoding] options:0 error:&error];
self.trackerConfig = (([self checkForTracker] && [[json valueForKey:@"tracker"] isKindOfClass:[NSDictionary class]]) ? [json valueForKey:@"tracker"] : nil); self.trackerConfig = (([self checkForTracker] && [[json valueForKey:@"tracker"] isKindOfClass:[NSDictionary class]]) ? [json valueForKey:@"tracker"] : nil);
self.companyName = (([[json valueForKey:@"company"] isKindOfClass:[NSString class]]) ? [json valueForKey:@"company"] : nil); self.companyName = (([[json valueForKey:@"company"] isKindOfClass:[NSString class]]) ? [json valueForKey:@"company"] : nil);

2
Support/HockeySDKTests/BITAuthenticatorTests.m
View File

@ -77,7 +77,7 @@ static void *kInstallationIdentification = &kInstallationIdentification;
NSData *data = [dataString dataUsingEncoding:NSUTF8StringEncoding]; NSData *data = [dataString dataUsingEncoding:NSUTF8StringEncoding];
NSError *error = nil; NSError *error = nil;
NSDictionary *json = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:&error]; NSDictionary *json = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
return json; return json;
} }

2
Support/HockeySDKTests/BITHockeyAppClientTests.m
View File

@ -50,7 +50,7 @@
NSData *data = [dataString dataUsingEncoding:NSUTF8StringEncoding]; NSData *data = [dataString dataUsingEncoding:NSUTF8StringEncoding];
NSError *error = nil; NSError *error = nil;
NSDictionary *json = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:&error]; NSDictionary *json = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
return json; return json;
} }

2
Support/HockeySDKTests/BITStoreUpdateManagerTests.m
View File

@ -61,7 +61,7 @@
NSData *data = [dataString dataUsingEncoding:NSUTF8StringEncoding]; NSData *data = [dataString dataUsingEncoding:NSUTF8StringEncoding];
NSError *error = nil; NSError *error = nil;
NSDictionary *json = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:&error]; NSDictionary *json = (NSDictionary *)[NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
return json; return json;
} }