diff --git a/AFNetworking/AFHTTPClient.m b/AFNetworking/AFHTTPClient.m index 0fbdc62844..17b9008906 100644 --- a/AFNetworking/AFHTTPClient.m +++ b/AFNetworking/AFHTTPClient.m @@ -24,6 +24,7 @@ #import "AFHTTPClient.h" #import "AFHTTPRequestOperation.h" +#import "AFJSONRequestOperation.h" #import @@ -118,19 +119,7 @@ - (id)initWithStringEncoding:(NSStringEncoding)encoding; } static NSString * AFJSONStringFromParameters(NSDictionary *parameters) { - NSString *JSONString = nil; - -#if USE_FOUNDATION_JSON - NSError *error = nil; - NSData *JSONData = [NSJSONSerialization dataWithJSONObject:parameters options:0 error:&error]; - if (!error) { - JSONString = [[[NSString alloc] initWithData:JSONData encoding:NSUTF8StringEncoding] autorelease]; - } -#else - JSONString = [parameters JSONString]; -#endif - - return JSONString; + return [AFNETWORKING_DEFAULT_JSON_OPERATION JSONStringWithDictionary:parameters]; } static NSString * AFPropertyListStringFromParameters(NSDictionary *parameters) { diff --git a/AFNetworking/AFJSONRequestOperation.h b/AFNetworking/AFJSONRequestOperation.h index ae26b9ee01..ed4458f251 100644 --- a/AFNetworking/AFJSONRequestOperation.h +++ b/AFNetworking/AFJSONRequestOperation.h @@ -89,6 +89,8 @@ */ + (id)decodeJSONObjectWithData:(NSData *)data error:(NSError **)error; ++ (NSString *)JSONStringWithDictionary:(NSDictionary *)dictionary; + @end #ifdef AF_INCLUDE_FOUNDATIONJSON diff --git a/AFNetworking/AFJSONRequestOperation.m b/AFNetworking/AFJSONRequestOperation.m index 72d398e7c3..1ede31934a 100644 --- a/AFNetworking/AFJSONRequestOperation.m +++ b/AFNetworking/AFJSONRequestOperation.m @@ -103,6 +103,11 @@ + (id) decodeJSONObjectWithData:(NSData *)data error:(NSError **)error { return nil; } ++ (NSString *)JSONStringWithDictionary:(NSDictionary *)dictionary { + [self doesNotRecognizeSelector: _cmd]; + return nil; +} + - (id)responseJSON { return self.decodedResponse; } @@ -138,6 +143,16 @@ + (id) decodeJSONObjectWithData:(NSData *)data error:(NSError **)error { } } + ++ (NSString *)JSONStringWithDictionary:(NSDictionary *)dictionary { + NSError *error = nil; + NSData *JSONData = [NSJSONSerialization dataWithJSONObject:dictionary options:0 error:&error]; + if (!error) { + return [[[NSString alloc] initWithData:JSONData encoding:NSUTF8StringEncoding] autorelease]; + } + return nil; +} + @end #endif @@ -154,6 +169,11 @@ + (id) decodeJSONObjectWithData:(NSData *)data error:(NSError **)error { } } ++ (NSString *)JSONStringWithDictionary:(NSDictionary *)dictionary { + return [dictionary JSONString]; +} + + @end #endif