evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changing AFHTTPRequestOperation internal designated initializer from -initWithURLRequest: to -init

Browse source
This commit is contained in:
Mattt Thompson 2011-09-26 10:10:48 -05:00
parent 1ec555dde5
commit 665bbc541a
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
AFNetworking/AFHTTPRequestOperation.m
View file

@ -91,7 +91,6 @@ static inline BOOL AFHTTPOperationStateTransitionIsValid(AFHTTPOperationState fr
@property (readwrite, nonatomic, copy) AFHTTPRequestOperationProgressBlock downloadProgress; @property (readwrite, nonatomic, copy) AFHTTPRequestOperationProgressBlock downloadProgress;
@property (readwrite, nonatomic, copy) AFHTTPRequestOperationCompletionBlock completion; @property (readwrite, nonatomic, copy) AFHTTPRequestOperationCompletionBlock completion;
- (id)initWithRequest:(NSURLRequest *)urlRequest;
- (void)operationDidStart; - (void)operationDidStart;
- (void)finish; - (void)finish;
@end @end
@ -136,7 +135,8 @@ static NSThread *_networkRequestThread = nil;
+ (AFHTTPRequestOperation *)operationWithRequest:(NSURLRequest *)urlRequest + (AFHTTPRequestOperation *)operationWithRequest:(NSURLRequest *)urlRequest
completion:(void (^)(NSURLRequest *request, NSHTTPURLResponse *response, NSData *data, NSError *error))completion completion:(void (^)(NSURLRequest *request, NSHTTPURLResponse *response, NSData *data, NSError *error))completion
{ {
AFHTTPRequestOperation *operation = [[[self alloc] initWithRequest:urlRequest] autorelease]; AFHTTPRequestOperation *operation = [[[self alloc] init] autorelease];
operation.request = urlRequest;
operation.completion = completion; operation.completion = completion;
return operation; return operation;
@ -166,16 +166,14 @@ static NSThread *_networkRequestThread = nil;
return operation; return operation;
} }
- (id)initWithRequest:(NSURLRequest *)urlRequest { - (id)init {
self = [super init]; self = [super init];
if (!self) { if (!self) {
return nil; return nil;
} }
self.request = urlRequest;
self.runLoopModes = [NSSet setWithObject:NSRunLoopCommonModes]; self.runLoopModes = [NSSet setWithObject:NSRunLoopCommonModes];
self.state = AFHTTPOperationReadyState; self.state = AFHTTPOperationReadyState;
return self; return self;
@ -330,7 +328,9 @@ didReceiveResponse:(NSURLResponse *)response
if (self.outputStream) { if (self.outputStream) {
[self.outputStream open]; [self.outputStream open];
} else { } else {
NSUInteger capacity = MIN(MAX(abs(response.expectedContentLength), kAFHTTPMinimumInitialDataCapacity), kAFHTTPMaximumInitialDataCapacity);
NSUInteger maxCapacity = MAX((NSUInteger)llabs(response.expectedContentLength), kAFHTTPMinimumInitialDataCapacity);
NSUInteger capacity = MIN(maxCapacity, kAFHTTPMaximumInitialDataCapacity);
self.dataAccumulator = [NSMutableData dataWithCapacity:capacity]; self.dataAccumulator = [NSMutableData dataWithCapacity:capacity];
} }
} }
@ -350,7 +350,7 @@ didReceiveResponse:(NSURLResponse *)response
} }
if (self.downloadProgress) { if (self.downloadProgress) {
self.downloadProgress(self.totalBytesRead, self.response.expectedContentLength); self.downloadProgress(self.totalBytesRead, (NSUInteger)self.response.expectedContentLength);
} }
} }