File tree Expand file tree Collapse file tree
JSONModel/JSONModelNetworking Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -128,7 +128,7 @@ +(NSString*)urlEncode:(id<NSObject>)value
128128}
129129
130130#pragma mark - networking worker methods
131- +(NSData *)syncRequestDataFromURL : (NSURL *)url method : (NSString *)method requestBody : (NSData *)bodyData headers : (NSDictionary *)headers etag : ( NSString **) etag error : (JSONModelError**)err
131+ +(NSData *)syncRequestDataFromURL : (NSURL *)url method : (NSString *)method requestBody : (NSData *)bodyData headers : (NSDictionary *)headers error : (JSONModelError**)err
132132{
133133 NSMutableURLRequest *request = [[NSMutableURLRequest alloc ] initWithURL: url
134134 cachePolicy: defaultCachePolicy
@@ -203,7 +203,7 @@ +(NSData*)syncRequestDataFromURL:(NSURL*)url method:(NSString*)method requestBod
203203 return responseData;
204204}
205205
206- +(NSData *)syncRequestDataFromURL : (NSURL *)url method : (NSString *)method params : (NSDictionary *)params headers : (NSDictionary *)headers etag : ( NSString **) etag error : (JSONModelError**)err
206+ +(NSData *)syncRequestDataFromURL : (NSURL *)url method : (NSString *)method params : (NSDictionary *)params headers : (NSDictionary *)headers error : (JSONModelError**)err
207207{
208208 // create the request body
209209 NSMutableString * paramsString = nil ;
@@ -235,7 +235,6 @@ +(NSData*)syncRequestDataFromURL:(NSURL*)url method:(NSString*)method params:(NS
235235 method: method
236236 requestBody: [method isEqualToString: kHTTPMethodPOST ]?[paramsString dataUsingEncoding: NSUTF8StringEncoding]:nil
237237 headers: headers
238- etag: etag
239238 error: err];
240239}
241240
@@ -269,22 +268,19 @@ +(void)JSONFromURLWithString:(NSString*)urlString method:(NSString*)method param
269268 id jsonObject = nil ;
270269 JSONModelError* error = nil ;
271270 NSData * responseData = nil ;
272- NSString * etag = nil ;
273271
274272 @try {
275273 if (bodyData) {
276274 responseData = [self syncRequestDataFromURL: [NSURL URLWithString: urlString]
277275 method: method
278276 requestBody: bodyData
279277 headers: customHeaders
280- etag: &etag
281278 error: &error];
282279 } else {
283280 responseData = [self syncRequestDataFromURL: [NSURL URLWithString: urlString]
284281 method: method
285282 params: params
286283 headers: customHeaders
287- etag: &etag
288284 error: &error];
289285 }
290286 }
You can’t perform that action at this time.
0 commit comments