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

Merge pull request #220 from kirsplatrick/master

Browse source 
Made the batch operation completion block and progress block return on the main thread by default.
This commit is contained in:
Mattt Thompson 2012-02-28 17:59:19 -08:00
commit 9dec7d71e4
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
AFNetworking/AFHTTPClient.m
View file

@ -442,7 +442,9 @@ static void AFReachabilityCallback(SCNetworkReachabilityRef __unused target, SCN
{ {
NSBlockOperation *batchedOperation = [NSBlockOperation blockOperationWithBlock:^{ NSBlockOperation *batchedOperation = [NSBlockOperation blockOperationWithBlock:^{
if (completionBlock) { if (completionBlock) {
completionBlock(operations); dispatch_async(dispatch_get_main_queue(), ^{
completionBlock(operations);
});
} }
}]; }];
@ -454,7 +456,9 @@ static void AFReachabilityCallback(SCNetworkReachabilityRef __unused target, SCN
AFCompletionBlock originalCompletionBlock = [[operation.completionBlock copy] autorelease]; AFCompletionBlock originalCompletionBlock = [[operation.completionBlock copy] autorelease];
operation.completionBlock = ^{ operation.completionBlock = ^{
if (progressBlock) { if (progressBlock) {
progressBlock([[batchedOperation.dependencies filteredArrayUsingPredicate:finishedOperationPredicate] count], [batchedOperation.dependencies count]); dispatch_async(dispatch_get_main_queue(), ^{
progressBlock([[batchedOperation.dependencies filteredArrayUsingPredicate:finishedOperationPredicate] count], [batchedOperation.dependencies count]);
});
} }
if (originalCompletionBlock) { if (originalCompletionBlock) {