Merge lp:~mikemc/ubuntuone-ios-files/main-queue-callback-refactor into lp:ubuntuone-ios-files

[Mike McCracken]

- rename methods to clarify that a completionBlock param will be run on the main thread, and remove redundant dispatches

- refactor: make clearer what code is running on what queue

Rename several methods with completionBlock parameters to clarify that the passed-in block is going to be run on the main queue. In most cases, the block is passed along un-executed until it is finally run by U1FilesService -execute:toURL:requestBody... etc

Also change behavior of uploadContentData to guarantee running its block arg on the main queue, and rename to reflect that.

This change makes it easier to audit calling code's use of NSManagedObjects (which have to be thread-confined) and any UI calls, which have to be on the main thread. As a result I've also removed some redundant dispatch blocks that were probably added because it wasn't clear earlier what was being run where.

[dobey (dobey)]

Lots of conflict markers showing in the diff.

review: Needs Fixing

[lp:~mikemc/ubuntuone-ios-files/main-queue-callback-refactor]

79. By Mike McCracken on 2013-04-04

poke LP again

[Brian Curtin (brian.curtin)]

Conflict markers remain

review: Needs Fixing

[lp:~mikemc/ubuntuone-ios-files/main-queue-callback-refactor]

80. By Mike McCracken on 2013-04-04

merge with trunk

81. By Mike McCracken on 2013-04-04

merge with trunk

[dobey (dobey)]

review: Approve

[Brian Curtin (brian.curtin)]

review: Approve

=== modified file 'Files/U1AutoUploadOperation.m'
--- Files/U1AutoUploadOperation.m	2013-03-29 22:44:58 +0000
+++ Files/U1AutoUploadOperation.m	2013-04-04 21:20:29 +0000
@@ -86,22 +86,19 @@
 		
 		[[U1FilesClient sharedFilesClient] uploadAssetURL:self.assetURL toFolder:folder withResourceName:self.filename withPriority:self.priority progressBlock:^(long long bytesUploaded, long long totalBytes) {
 			
-		} completionBlock:^(U1FileNode *fileNode, NSError *error) {
+		} completionBlockOnMainQueue:^(U1FileNode *fileNode, NSError *error) {
 			if (error != nil)
 			{
 				NSLog(@"U1AutoUploadOperation: auto-upload failed: %@", error);
 			}
-			
-			dispatch_async(dispatch_get_main_queue(), ^(void) {
-				
-				asset.generation = asset.fileNode.generation;
-				NSError *err = NULL;
-				BOOL success = [dataRepository save:&err];
-				if(!success){
-					CLS_LOG(@"U1AutoUploadOperation: failed to save to repository: %@", err);
-				}
-				[self finishExecuting];
-			});
+						
+			asset.generation = asset.fileNode.generation;
+			NSError *err = NULL;
+			BOOL success = [dataRepository save:&err];
+			if(!success){
+				CLS_LOG(@"U1AutoUploadOperation: failed to save to repository: %@", err);
+			}
+			[self finishExecuting];
 		}];
 		
 	}];
 
=== modified file 'Files/U1AutoUploadsManager.m'
--- Files/U1AutoUploadsManager.m	2013-04-03 23:07:08 +0000
+++ Files/U1AutoUploadsManager.m	2013-04-04 21:20:29 +0000
@@ -177,7 +177,7 @@
 			creatingUploadVolume = YES;
 			
 			[self.filesClient createVolumeAtPath:[self remoteUploadFolderPath]
-								 completionBlock:^(U1Volume *volume, NSError *error) {
+					  completionBlockOnMainQueue:^(U1Volume *volume, NSError *error) {
 									 creatingUploadVolume = NO;
 									 if (error == nil)
 									 {
 
=== modified file 'Files/U1FileDetailsViewController.m'
--- Files/U1FileDetailsViewController.m	2013-04-03 23:01:10 +0000
+++ Files/U1FileDetailsViewController.m	2013-04-04 21:20:29 +0000
@@ -229,12 +229,10 @@
 	if (![sender isOn] && [self.node isPublicValue])
 	{
 		[self.publishStatusLabel setText:NSLocalizedString(@"Unpublishing file...", nil)];
-		[self.filesClient unpublishNode:self.node completionBlock:^(U1FileNode *node, NSError *error) {
-			dispatch_async(dispatch_get_main_queue(), ^(void) {
-				[sender setEnabled:YES];
-				[self.publishStatusLabel setText:nil];
-				[self.actionsTableView deleteRowsAtIndexPaths:publishStatusIndexPath withRowAnimation:UITableViewRowAnimationFade];
-			});
+		[self.filesClient unpublishNode:self.node completionBlockOnMainQueue:^(U1FileNode *node, NSError *error) {
+			[sender setEnabled:YES];
+			[self.publishStatusLabel setText:nil];
+			[self.actionsTableView deleteRowsAtIndexPaths:publishStatusIndexPath withRowAnimation:UITableViewRowAnimationFade];
 		}];
 	}
 	else if ([sender isOn] && ![self.node isPublicValue])
@@ -243,14 +241,12 @@
 		[self.publishStatusLabel setText:NSLocalizedString(@"Publishing file...", nil)];
 		[self.actionsTableView insertRowsAtIndexPaths:publishStatusIndexPath withRowAnimation:UITableViewRowAnimationNone];
 		[self.actionsTableView endUpdates];
-		[self.filesClient publishNode:self.node completionBlock:^(U1FileNode *node, NSError *error) {
-			dispatch_async(dispatch_get_main_queue(), ^(void) {
-				[sender setEnabled:YES];
-				[self.actionsTableView beginUpdates];
-				[self.publishStatusLabel setText:[self.node publicURLString]];
-				[self.actionsTableView reloadRowsAtIndexPaths:publishStatusIndexPath withRowAnimation:UITableViewRowAnimationNone];
-				[self.actionsTableView endUpdates];
-			});
+		[self.filesClient publishNode:self.node completionBlockOnMainQueue:^(U1FileNode *node, NSError *error) {
+			[sender setEnabled:YES];
+			[self.actionsTableView beginUpdates];
+			[self.publishStatusLabel setText:[self.node publicURLString]];
+			[self.actionsTableView reloadRowsAtIndexPaths:publishStatusIndexPath withRowAnimation:UITableViewRowAnimationNone];
+			[self.actionsTableView endUpdates];
 		}];
 	}
 }
@@ -394,11 +390,11 @@
 	if (!newName)
 		return;
 
-	[[U1FilesClient sharedFilesClient] renameNode:self.node toName:newName completionBlock:^(U1Node *newNode, NSError *error) {
+	[[U1FilesClient sharedFilesClient] renameNode:self.node toName:newName completionBlockOnMainQueue:^(U1Node *newNode, NSError *error) {
 		
 		if (!error)
 		{
-			self.title = [node.path lastPathComponent];
+			self.title = [newNode.path lastPathComponent];
 			UILabel *titleLabel = (UILabel*)[self.navigationItem titleView];
 			[titleLabel setText:self.title];
 			[titleLabel sizeToFit];
 
=== modified file 'Files/U1FilesClient.h'
--- Files/U1FilesClient.h	2012-08-07 14:18:15 +0000
+++ Files/U1FilesClient.h	2013-04-04 21:20:29 +0000
@@ -36,13 +36,13 @@
 - (id)volumesWithResultsBlock:(void(^)(U1Volume *rootVolume, NSFetchedResultsController *cloudFoldersResultsController, U1DataSourceType resultsDataSourceType))resultsBlock errorBlock:(void(^)(NSError *error))errorBlock;
 - (id)fetchFolderWithResourcePath:(NSString*)nodePath resultsBlock:(void(^)(U1Node *node, NSFetchedResultsController *childrenResultsController, U1DataSourceType resultsDataSourceType))resultsBlock errorBlock:(void(^)(NSError *error))errorBlock;
 - (id)fetchFileWithResourcePath:(NSString*)nodePath completionBlock:(void(^)(U1Node *node, NSError *error))completionBlock;
-- (id)renameNode:(U1Node*)node toName:(NSString*)newName completionBlock:(void(^)(U1Node *node, NSError *error))completionBlock;
+- (id)renameNode:(U1Node*)node toName:(NSString*)newName completionBlockOnMainQueue:(void(^)(U1Node *node, NSError *error))completionBlock;
 - (id)deleteNode:(U1Node*)node completionBlock:(void(^)(NSError *error))completionBlock;
-- (id)uploadAssetURL:(NSURL*)assetURL toFolder:(U1FolderNode*)folderNode withResourceName:(NSString*)resourceName withPriority:(NSOperationQueuePriority)priority progressBlock:(void(^)(long long bytesUploaded, long long totalBytes))progressBlock completionBlock:(void(^)(U1FileNode *updatedNode, NSError *error))completionBlock;
-- (id)publishNode:(U1FileNode*)node completionBlock:(void(^)(U1FileNode *node, NSError *error))completionBlock;
-- (id)unpublishNode:(U1FileNode*)node completionBlock:(void(^)(U1FileNode *node, NSError *error))completionBlock;
-- (id)createFolderNamed:(NSString*)name inFolder:(U1FolderNode*)folderNode completionBlock:(void(^)(U1FolderNode *newFolderNode, NSError *error))completionBlock;
-- (id)createVolumeAtPath:(NSString*)folderPath completionBlock:(void(^)(U1Volume *volume, NSError *error))completionBlock;
+- (id)uploadAssetURL:(NSURL*)assetURL toFolder:(U1FolderNode*)folderNode withResourceName:(NSString*)resourceName withPriority:(NSOperationQueuePriority)priority progressBlock:(void(^)(long long bytesUploaded, long long totalBytes))progressBlock completionBlockOnMainQueue:(void(^)(U1FileNode *updatedNode, NSError *error))completionBlock;
+- (id)publishNode:(U1FileNode*)node completionBlockOnMainQueue:(void(^)(U1FileNode *node, NSError *error))completionBlock;
+- (id)unpublishNode:(U1FileNode*)node completionBlockOnMainQueue:(void(^)(U1FileNode *node, NSError *error))completionBlock;
+- (id)createFolderNamed:(NSString*)name inFolder:(U1FolderNode*)folderNode completionBlockOnMainQueue:(void(^)(U1FolderNode *newFolderNode, NSError *error))completionBlock;
+- (id)createVolumeAtPath:(NSString*)folderPath completionBlockOnMainQueue:(void(^)(U1Volume *volume, NSError *error))completionBlock;
 - (BOOL)isNodeSavedLocally:(U1FileNode*)node;
 - (U1LocalFileInfo*)localInfoForNode:(U1FileNode*)node;
 - (U1LocalFileInfo*)downloadFileForNode:(U1FileNode*)node completionBlock:(void(^)(NSError *error))completionBlock;
 
=== modified file 'Files/U1FilesClient.m'
--- Files/U1FilesClient.m	2013-03-29 22:44:58 +0000
+++ Files/U1FilesClient.m	2013-04-04 21:20:29 +0000
@@ -106,7 +106,7 @@
 
 - (id)accountInfoWithCompletionBlock:(void(^)(NSDictionary *accountInfo, NSError *error))completionBlock;
 {
-	return [self.filesService accountInfoWithCompletionBlock:completionBlock];
+	return [self.filesService accountInfoWithCompletionBlockOnMainQueue:completionBlock];
 }
 
 - (id)volumesWithResultsBlock:(void(^)(U1Volume *rootVolume, NSFetchedResultsController *cloudFoldersResultsController, U1DataSourceType resultsDataSourceType))resultsBlock errorBlock:(void(^)(NSError *error))errorBlock;
@@ -142,7 +142,7 @@
 	
 	resultsBlock(rootVolume, cloudFoldersResultsController, U1DataSourceLocal);
 	
-	[self.filesService volumeInfoWithCompletionBlock:^(NSArray *volumeInfos, NSError *error) {
+	[self.filesService volumeInfoWithCompletionBlockOnMainQueue:^(NSArray *volumeInfos, NSError *error) {
 		
 		[self.dataRepository dispatchBlockWithMainContext:^(NSManagedObjectContext *context) {
 			
@@ -236,11 +236,11 @@
 	
 	resultsBlock(node, resultsController, U1DataSourceLocal);
 	
-	[self.filesService infoForNodeAtResourcePath:node.resourcePath includeChildren:YES completionBlock:^(NSDictionary *nodeInfo, NSError *error) {
+	[self.filesService infoForNodeAtResourcePath:node.resourcePath includeChildren:YES completionBlockOnMainQueue:^(NSDictionary *nodeInfo, NSError *error) {
 
 		if (error)
 		{
-			CLS_LOG(@"error from call to filesService infoForNodeAtResourcePath:...");
+			CLS_LOG(@"error from call to filesService infoForNodeAtResourcePath:. %@", error);
 			errorBlock(error);
 			return;
 		}
@@ -334,7 +334,7 @@
 	}
 	
 	
-	[self.filesService infoForNodeAtResourcePath:node.resourcePath includeChildren:NO completionBlock:^(NSDictionary *nodeInfo, NSError *error) {
+	[self.filesService infoForNodeAtResourcePath:node.resourcePath includeChildren:NO completionBlockOnMainQueue:^(NSDictionary *nodeInfo, NSError *error) {
 		if (error == nil)
 		{
 			[node updatePropertiesFromJSONDictionary:nodeInfo];
@@ -350,14 +350,14 @@
 	return nil;
 }
 
-- (id)renameNode:(U1Node*)node toName:(NSString*)newName completionBlock:(void(^)(U1Node *node, NSError *error))completionBlock;
+- (id)renameNode:(U1Node*)node toName:(NSString*)newName completionBlockOnMainQueue:(void(^)(U1Node *node, NSError *error))completionBlock;
 {
 	NSParameterAssert(node != nil);
 	NSParameterAssert(newName != nil);
 	NSParameterAssert(completionBlock != NULL);
 	
 	NSString *newPath = [[node.path stringByDeletingLastPathComponent] stringByAppendingPathComponent:newName];
-	return [self.filesService moveNodeAtResourcePath:node.resourcePath toPath:newPath withCompletionBlock:^(NSDictionary *nodeInfo, NSError *error) {
+	return [self.filesService moveNodeAtResourcePath:node.resourcePath toPath:newPath withCompletionBlockOnMainQueue:^(NSDictionary *nodeInfo, NSError *error) {
 		if (!error)
 		{
 			[node updatePropertiesFromJSONDictionary:nodeInfo];
@@ -368,7 +368,7 @@
 
 - (id)deleteNode:(U1Node*)node completionBlock:(void(^)(NSError *error))completionBlock;
 {
-	return [self.filesService deleteNodeAtResourcePath:node.resourcePath completionBlock:^(NSError *error) {
+	return [self.filesService deleteNodeAtResourcePath:node.resourcePath completionBlockOnMainQueue:^(NSError *error) {
 		if (!error)
 		{
 			[self.dataRepository dispatchBlockWithMainContext:^(NSManagedObjectContext *context) {
@@ -380,10 +380,10 @@
 	}];
 }
 
-- (id)uploadAssetURL:(NSURL*)assetURL toFolder:(U1FolderNode *)folderNode withResourceName:(NSString *)resourceName withPriority:(NSOperationQueuePriority)priority progressBlock:(void (^)(long long, long long))progressBlock completionBlock:(void (^)(U1FileNode *, NSError *))completionBlock;
+- (id)uploadAssetURL:(NSURL*)assetURL toFolder:(U1FolderNode *)folderNode withResourceName:(NSString *)resourceName withPriority:(NSOperationQueuePriority)priority progressBlock:(void (^)(long long, long long))progressBlock completionBlockOnMainQueue:(void (^)(U1FileNode *, NSError *))completionBlock;
 {
 	NSString *resourcePath = [folderNode.resourcePath stringByAppendingPathComponent:resourceName];
-	U1FileNode *node = (id)[self.dataRepository nodeWithResourcePath:resourcePath];
+	U1FileNode *node = (id)[self.dataRepository nodeWithResourcePath:resourcePath]; // node will be from main context , on main Q
 	if (!node)
 	{
 		[self.dataRepository dispatchBlockWithMainContext:^(NSManagedObjectContext *context) {
@@ -442,17 +442,17 @@
 	return operation;
 }
 
-- (id)publishNode:(U1FileNode*)node completionBlock:(void(^)(U1FileNode *node, NSError *error))completionBlock;
-{
-	return [self.filesService publishNode:node completionBlock:completionBlock];
-}
-
-- (id)unpublishNode:(U1FileNode*)node completionBlock:(void(^)(U1FileNode *node, NSError *error))completionBlock;
-{
-	return [self.filesService unpublishNode:node completionBlock:completionBlock];
-}
-
-- (id)createFolderNamed:(NSString*)name inFolder:(U1FolderNode*)folderNode completionBlock:(void(^)(U1FolderNode *newFolderNode, NSError *error))completionBlock;
+- (id)publishNode:(U1FileNode*)node completionBlockOnMainQueue:(void(^)(U1FileNode *node, NSError *error))completionBlock;
+{
+	return [self.filesService publishNode:node completionBlockOnMainQueue:completionBlock];
+}
+
+- (id)unpublishNode:(U1FileNode*)node completionBlockOnMainQueue:(void(^)(U1FileNode *node, NSError *error))completionBlock;
+{
+	return [self.filesService unpublishNode:node completionBlockOnMainQueue:completionBlock];
+}
+
+- (id)createFolderNamed:(NSString*)name inFolder:(U1FolderNode*)folderNode completionBlockOnMainQueue:(void(^)(U1FolderNode *newFolderNode, NSError *error))completionBlock;
 {
 	NSString *resourcePath = folderNode.resourcePath;
 	resourcePath = [resourcePath stringByAppendingPathComponent:name];
@@ -471,7 +471,7 @@
 		node = (id)[self.dataRepository nodeWithResourcePath:resourcePath];
 	}
 	
-	return [self.filesService createFolderAtPath:resourcePath completionBlock:^(NSDictionary *nodeInfo, NSError *error) {
+	return [self.filesService createFolderAtPath:resourcePath completionBlockOnMainQueue:^(NSDictionary *nodeInfo, NSError *error) {
 		if (!error)
 		{
 			[node updatePropertiesFromJSONDictionary:nodeInfo];
@@ -480,9 +480,9 @@
 	}];
 }
 
-- (id)createVolumeAtPath:(NSString*)folderPath completionBlock:(void(^)(U1Volume *volume, NSError *error))completionBlock;
+- (id)createVolumeAtPath:(NSString*)folderPath completionBlockOnMainQueue:(void(^)(U1Volume *volume, NSError *error))completionBlock;
 {
-	return [self.filesService createVolumeAtPath:folderPath completionBlock:^(NSDictionary *volumeInfo, NSError *error) {
+	return [self.filesService createVolumeAtPath:folderPath completionBlockOnMainQueue:^(NSDictionary *volumeInfo, NSError *error) {
 		[self.dataRepository dispatchBlockWithMainContext:^(NSManagedObjectContext *context) {
 			U1Volume *volume = [U1Volume insertInManagedObjectContext:context];
 			if (!error)
 
=== modified file 'Files/U1FilesService.h'
--- Files/U1FilesService.h	2012-08-07 14:19:47 +0000
+++ Files/U1FilesService.h	2013-04-04 21:20:29 +0000
@@ -28,17 +28,17 @@
 
 + (U1FilesService *)sharedFilesService;
 
-- (id)accountInfoWithCompletionBlock:(void(^)(NSDictionary *accountInfo, NSError *error))completionBlock;
-- (id)volumeInfoWithCompletionBlock:(void(^)(NSArray *volumeInfos, NSError *error))completionBlock;
-- (id)infoForNodeAtResourcePath:(NSString*)resourcePath includeChildren:(BOOL)includeChildren completionBlock:(void(^)(NSDictionary *node, NSError *error))completionBlock;
-- (id)infoForNode:(U1Node*)node includeChildren:(BOOL)includeChildren completionBlock:(void(^)(NSDictionary *node, NSError *error))completionBlock;
+- (id)accountInfoWithCompletionBlockOnMainQueue:(void(^)(NSDictionary *accountInfo, NSError *error))completionBlock;
+- (id)volumeInfoWithCompletionBlockOnMainQueue:(void(^)(NSArray *volumeInfos, NSError *error))completionBlock;
+- (id)infoForNodeAtResourcePath:(NSString*)resourcePath includeChildren:(BOOL)includeChildren completionBlockOnMainQueue:(void(^)(NSDictionary *node, NSError *error))completionBlock;
+- (id)infoForNode:(U1Node*)node includeChildren:(BOOL)includeChildren completionBlockOnMainQueue:(void(^)(NSDictionary *node, NSError *error))completionBlock;
 - (id)contentForNode:(U1FileNode*)node progressBlock:(void(^)(long long bytesReceived, long long bytesExpected))progressBlock completionBlock:(void(^)(NSURL *contentURL))completionBlock;
-- (id)uploadContentData:(id<U1UploadDataProvider>)contentData forNode:(U1FileNode*)node progressBlock:(void(^)(long long bytesUploaded, long long totalBytes))progressBlock completionBlock:(void(^)(NSDictionary *updatedNodeInfo, NSError *error))completionBlock;
-- (id)moveNodeAtResourcePath:(NSString*)resourcePath toPath:(NSString*)newPath withCompletionBlock:(void(^)(NSDictionary *nodeInfo, NSError *error))completionBlock;
-- (id)deleteNodeAtResourcePath:(NSString*)resourcePath completionBlock:(void(^)(NSError *error))completionBlock;
-- (id)publishNode:(U1FileNode*)node completionBlock:(void(^)(U1FileNode *node, NSError *error))completionBlock;
-- (id)unpublishNode:(U1FileNode*)node completionBlock:(void(^)(U1FileNode *node, NSError *error))completionBlock;
-- (id)createFolderAtPath:(NSString*)folderPath completionBlock:(void(^)(NSDictionary *nodeInfo, NSError *error))completionBlock;
-- (id)createVolumeAtPath:(NSString*)folderPath completionBlock:(void(^)(NSDictionary *volumeInfo, NSError *error))completionBlock;
+- (id)uploadContentData:(id<U1UploadDataProvider>)contentData forNode:(U1FileNode*)node progressBlock:(void(^)(long long bytesUploaded, long long totalBytes))progressBlock completionBlockOnMainQueue:(void(^)(NSDictionary *updatedNodeInfo, NSError *error))completionBlock;
+- (id)moveNodeAtResourcePath:(NSString*)resourcePath toPath:(NSString*)newPath withCompletionBlockOnMainQueue:(void(^)(NSDictionary *nodeInfo, NSError *error))completionBlock;
+- (id)deleteNodeAtResourcePath:(NSString*)resourcePath completionBlockOnMainQueue:(void(^)(NSError *error))completionBlock;
+- (id)publishNode:(U1FileNode*)node completionBlockOnMainQueue:(void(^)(U1FileNode *node, NSError *error))completionBlock;
+- (id)unpublishNode:(U1FileNode*)node completionBlockOnMainQueue:(void(^)(U1FileNode *node, NSError *error))completionBlock;
+- (id)createFolderAtPath:(NSString*)folderPath completionBlockOnMainQueue:(void(^)(NSDictionary *nodeInfo, NSError *error))completionBlock;
+- (id)createVolumeAtPath:(NSString*)folderPath completionBlockOnMainQueue:(void(^)(NSDictionary *volumeInfo, NSError *error))completionBlock;
 
 @end
 
=== modified file 'Files/U1FilesService.m'
--- Files/U1FilesService.m	2013-04-04 19:10:31 +0000
+++ Files/U1FilesService.m	2013-04-04 21:20:29 +0000
@@ -37,8 +37,8 @@
 - (NSURL*)URLForVolumeWithPath:(NSString*)volumePath;
 - (NSURL*)URLForNode:(NSString*)nodePath includeChildren:(BOOL)includeChildren;
 - (NSURL*)contentURLForNode:(NSString*)nodePath;
-- (id)execute:(NSString*)method toURL:(NSURL*)url requestBody:(NSString*)body parseResponseBody:(BOOL)parseResponseBody completionBlock:(void(^)(id results, NSError *error))completionBlock;
-- (id)execute:(NSString*)method toURL:(NSURL*)url requestBody:(id)bodyData contentType:(NSString*)contentType contentLength:(NSUInteger)contentLength parseResponseBody:(BOOL)parseResponseBody completionBlock:(void(^)(id results, NSError *error))completionBlock;
+- (id)execute:(NSString*)method toURL:(NSURL*)url requestBody:(NSString*)body parseResponseBody:(BOOL)parseResponseBody completionBlockOnMainQueue:(void(^)(id results, NSError *error))completionBlock;
+- (id)execute:(NSString*)method toURL:(NSURL*)url requestBody:(id)bodyData contentType:(NSString*)contentType contentLength:(NSUInteger)contentLength parseResponseBody:(BOOL)parseResponseBody completionBlockOnMainQueue:(void(^)(id results, NSError *error))completionBlock;
 
 @end
 
@@ -81,38 +81,38 @@
 	[super dealloc];
 }
 
-- (id)accountInfoWithCompletionBlock:(void(^)(NSDictionary *accountInfo, NSError *error))completionBlock;
+- (id)accountInfoWithCompletionBlockOnMainQueue:(void(^)(NSDictionary *accountInfo, NSError *error))completionBlock;
 {
 	NSMutableString *urlString = [NSMutableString stringWithString:U1FilesServiceAPIBase];
 	[urlString appendString:U1FilesServiceAPIPath];
 	[urlString appendString:U1FilesServiceAPIVersion1];
 	NSURL *rootURL = [NSURL URLWithString:urlString];
-	return [self execute:@"GET" toURL:rootURL requestBody:nil parseResponseBody:YES completionBlock:^(id results, NSError *error) {
+	return [self execute:@"GET" toURL:rootURL requestBody:nil parseResponseBody:YES completionBlockOnMainQueue:^(id results, NSError *error) {
 		completionBlock(results, error);
 	}];
 }
 
-- (id)volumeInfoWithCompletionBlock:(void(^)(NSArray *volumeInfos, NSError *error))completionBlock;
+- (id)volumeInfoWithCompletionBlockOnMainQueue:(void(^)(NSArray *volumeInfos, NSError *error))completionBlock;
 {
 	NSURL *volumesURL = [self URLForNode:@"/volumes" includeChildren:NO];
-	return [self execute:@"GET" toURL:volumesURL requestBody:nil parseResponseBody:YES completionBlock:^(id results, NSError *error) {
+	return [self execute:@"GET" toURL:volumesURL requestBody:nil parseResponseBody:YES completionBlockOnMainQueue:^(id results, NSError *error) {
 		completionBlock(results, error);
 	}];
 }
 
-- (id)infoForNodeAtResourcePath:(NSString*)resourcePath includeChildren:(BOOL)includeChildren completionBlock:(void(^)(NSDictionary *node, NSError *error))completionBlock;
+- (id)infoForNodeAtResourcePath:(NSString*)resourcePath includeChildren:(BOOL)includeChildren completionBlockOnMainQueue:(void(^)(NSDictionary *node, NSError *error))completionBlock;
 {
 	NSURL *nodeURL = [self URLForNode:resourcePath includeChildren:includeChildren];
 
-	return [self execute:@"GET" toURL:nodeURL requestBody:nil parseResponseBody:YES completionBlock:^(id result, NSError *error) {
+	return [self execute:@"GET" toURL:nodeURL requestBody:nil parseResponseBody:YES completionBlockOnMainQueue:^(id result, NSError *error) {
 		
 		completionBlock(result, error);
 	}];
 }
 
-- (id)infoForNode:(U1Node*)node includeChildren:(BOOL)includeChildren completionBlock:(void(^)(NSDictionary *node, NSError *error))completionBlock;
+- (id)infoForNode:(U1Node*)node includeChildren:(BOOL)includeChildren completionBlockOnMainQueue:(void(^)(NSDictionary *node, NSError *error))completionBlock;
 {
-	return [self infoForNodeAtResourcePath:node.resourcePath includeChildren:includeChildren completionBlock:completionBlock];
+	return [self infoForNodeAtResourcePath:node.resourcePath includeChildren:includeChildren completionBlockOnMainQueue:completionBlock];
 }
 
 - (id)contentForNode:(U1FileNode*)node progressBlock:(void(^)(long long bytesReceived, long long bytesExpected))progressBlock completionBlock:(void(^)(NSURL *contentURL))completionBlock;
@@ -170,7 +170,7 @@
 	return nil;
 }
 
-- (id)uploadContentData:(id<U1UploadDataProvider>)contentData forNode:(U1FileNode*)node progressBlock:(void(^)(long long bytesUploaded, long long totalBytes))progressBlock completionBlock:(void(^)(NSDictionary *updatedNodeInfo, NSError *error))completionBlock;
+- (id)uploadContentData:(id<U1UploadDataProvider>)contentData forNode:(U1FileNode*)node progressBlock:(void(^)(long long bytesUploaded, long long totalBytes))progressBlock completionBlockOnMainQueue:(void(^)(NSDictionary *updatedNodeInfo, NSError *error))completionBlock;
 {
 	NSString *resourcePath = node.resourcePath;
 	NSURL *requestURL = [contentData isMagic] ? [self URLForNode:resourcePath includeChildren:NO] : [self contentURLForNode:resourcePath];
@@ -179,14 +179,16 @@
 		
 		if (error)
 		{
-			completionBlock(nil, error);
+			dispatch_async(dispatch_get_main_queue(), ^{
+				completionBlock(nil, error);
+			});
 			return;
 		}
 		
 		U1ReportingInputStream *stream = [U1ReportingInputStream inputStreamWithSourceStream:dataStream];
 		stream.progressBlock = progressBlock;
 		stream.dataLength = length;
-		[self execute:@"PUT" toURL:requestURL requestBody:stream contentType:mimeType contentLength:length parseResponseBody:YES completionBlock:^(id results, NSError *error) {
+		[self execute:@"PUT" toURL:requestURL requestBody:stream contentType:mimeType contentLength:length parseResponseBody:YES completionBlockOnMainQueue:^(id results, NSError *error) {
 			completionBlock(results, error);
 		}];
 	}];
@@ -194,7 +196,7 @@
 	return nil;
 }
 
-- (id)moveNodeAtResourcePath:(NSString*)resourcePath toPath:(NSString*)newPath withCompletionBlock:(void(^)(NSDictionary *nodeInfo, NSError *error))completionBlock;
+- (id)moveNodeAtResourcePath:(NSString*)resourcePath toPath:(NSString*)newPath withCompletionBlockOnMainQueue:(void(^)(NSDictionary *nodeInfo, NSError *error))completionBlock;
 {
 	NSParameterAssert(resourcePath != nil);
 	NSParameterAssert(newPath != nil);
@@ -202,65 +204,65 @@
 	
 	NSURL *nodeURL = [self URLForNode:resourcePath includeChildren:NO];
 	NSString *body = [NSString stringWithFormat:@"{\"path\": \"%@\"}", newPath];
-	return [self execute:@"PUT" toURL:nodeURL requestBody:body parseResponseBody:YES completionBlock:^(id results, NSError *error) {
+	return [self execute:@"PUT" toURL:nodeURL requestBody:body parseResponseBody:YES completionBlockOnMainQueue:^(id results, NSError *error) {
 		completionBlock(results, error);
 	}];
 }
 
-- (id)deleteNodeAtResourcePath:(NSString*)resourcePath completionBlock:(void(^)(NSError *error))completionBlock;
+- (id)deleteNodeAtResourcePath:(NSString*)resourcePath completionBlockOnMainQueue:(void(^)(NSError *error))completionBlock;
 {
 	NSURL *nodeURL = [self URLForNode:resourcePath includeChildren:NO];
-	return [self execute:@"DELETE" toURL:nodeURL requestBody:nil parseResponseBody:NO completionBlock:^(id result, NSError *error) {
+	return [self execute:@"DELETE" toURL:nodeURL requestBody:nil parseResponseBody:NO completionBlockOnMainQueue:^(id result, NSError *error) {
 		completionBlock(error);
 	}];
 }
 
-- (id)publishNode:(U1FileNode*)node completionBlock:(void(^)(U1FileNode *node, NSError *error))completionBlock;
-{
-	NSString *nodePath = node.resourcePath;
-	NSURL *nodeURL = [self URLForNode:(NSString*)nodePath includeChildren:NO];
-	return [self execute:@"PUT" toURL:nodeURL requestBody:@"{\"is_public\": true}" parseResponseBody:YES completionBlock:^(id result, NSError *error) {
-
-		if (!error)
-		{
-			[node updatePropertiesFromJSONDictionary:result];
-		}
-		completionBlock(node, error);
-	}];
-}
-
-- (id)unpublishNode:(U1FileNode*)node completionBlock:(void(^)(U1FileNode *node, NSError *error))completionBlock;
-{
-	NSString *nodePath = node.resourcePath;
-	NSURL *nodeURL = [self URLForNode:(NSString*)nodePath includeChildren:NO];
-	return [self execute:@"PUT" toURL:nodeURL requestBody:@"{\"is_public\": false}" parseResponseBody:YES completionBlock:^(id result, NSError *error) {
-
-		if (!error)
-		{
-			[node updatePropertiesFromJSONDictionary:result];
-		}
-		completionBlock(node, error);
-	}];
-}
-
-- (id)createFolderAtPath:(NSString*)folderPath completionBlock:(void(^)(NSDictionary *nodeInfo, NSError *error))completionBlock;
+- (id)publishNode:(U1FileNode*)node completionBlockOnMainQueue:(void(^)(U1FileNode *node, NSError *error))completionBlock;
+{
+	NSString *nodePath = node.resourcePath;
+	NSURL *nodeURL = [self URLForNode:(NSString*)nodePath includeChildren:NO];
+	return [self execute:@"PUT" toURL:nodeURL requestBody:@"{\"is_public\": true}" parseResponseBody:YES completionBlockOnMainQueue:^(id result, NSError *error) {
+
+		if (!error)
+		{
+			[node updatePropertiesFromJSONDictionary:result];
+		}
+		completionBlock(node, error);
+	}];
+}
+
+- (id)unpublishNode:(U1FileNode*)node completionBlockOnMainQueue:(void(^)(U1FileNode *node, NSError *error))completionBlock;
+{
+	NSString *nodePath = node.resourcePath;
+	NSURL *nodeURL = [self URLForNode:(NSString*)nodePath includeChildren:NO];
+	return [self execute:@"PUT" toURL:nodeURL requestBody:@"{\"is_public\": false}" parseResponseBody:YES completionBlockOnMainQueue:^(id result, NSError *error) {
+
+		if (!error)
+		{
+			[node updatePropertiesFromJSONDictionary:result];
+		}
+		completionBlock(node, error);
+	}];
+}
+
+- (id)createFolderAtPath:(NSString*)folderPath completionBlockOnMainQueue:(void(^)(NSDictionary *nodeInfo, NSError *error))completionBlock;
 {
 	NSParameterAssert(folderPath != nil);
 	NSParameterAssert(completionBlock != NULL);
 	
 	NSURL *nodeURL = [self URLForNode:folderPath includeChildren:NO];
-	return [self execute:@"PUT" toURL:nodeURL requestBody:@"{\"kind\": \"directory\"}" parseResponseBody:YES completionBlock:^(id results, NSError *error) {
+	return [self execute:@"PUT" toURL:nodeURL requestBody:@"{\"kind\": \"directory\"}" parseResponseBody:YES completionBlockOnMainQueue:^(id results, NSError *error) {
 		completionBlock(results, error);
 	}];
 }
 
-- (id)createVolumeAtPath:(NSString*)volumePath completionBlock:(void(^)(NSDictionary *volumeInfo, NSError *error))completionBlock;
+- (id)createVolumeAtPath:(NSString*)volumePath completionBlockOnMainQueue:(void(^)(NSDictionary *volumeInfo, NSError *error))completionBlock;
 {
 	NSParameterAssert(volumePath != nil);
 	NSParameterAssert(completionBlock != NULL);
 	
 	NSURL *volumeURL = [self URLForVolumeWithPath:volumePath];
-	return [self execute:@"PUT" toURL:volumeURL requestBody:@"" parseResponseBody:YES completionBlock:^(id results, NSError *error) {
+	return [self execute:@"PUT" toURL:volumeURL requestBody:@"" parseResponseBody:YES completionBlockOnMainQueue:^(id results, NSError *error) {
 		completionBlock(results, error);
 	}];
 }
@@ -301,13 +303,13 @@
 	return [NSURL URLWithString:finalString];
 }
 
-- (id)execute:(NSString*)method toURL:(NSURL*)url requestBody:(NSString*)body parseResponseBody:(BOOL)parseResponseBody completionBlock:(void(^)(id results, NSError *error))completionBlock;
+- (id)execute:(NSString*)method toURL:(NSURL*)url requestBody:(NSString*)body parseResponseBody:(BOOL)parseResponseBody completionBlockOnMainQueue:(void(^)(id results, NSError *error))completionBlock;
 {
 	NSData *bodyData = [body dataUsingEncoding:NSUTF8StringEncoding];
-	return [self execute:method toURL:url requestBody:bodyData contentType:@"application/json" contentLength:[bodyData length] parseResponseBody:parseResponseBody completionBlock:completionBlock];
+	return [self execute:method toURL:url requestBody:bodyData contentType:@"application/json" contentLength:[bodyData length] parseResponseBody:parseResponseBody completionBlockOnMainQueue:completionBlock];
 }
 
-- (id)execute:(NSString*)method toURL:(NSURL*)url requestBody:(id)bodyData contentType:(NSString*)contentType contentLength:(NSUInteger)contentLength parseResponseBody:(BOOL)parseResponseBody completionBlock:(void(^)(id results, NSError *error))completionBlock;
+- (id)execute:(NSString*)method toURL:(NSURL*)url requestBody:(id)bodyData contentType:(NSString*)contentType contentLength:(NSUInteger)contentLength parseResponseBody:(BOOL)parseResponseBody completionBlockOnMainQueue:(void(^)(id results, NSError *error))completionBlock;
 {
 
 	OAToken *token = [[U1AccountManager sharedAccountManager] oauthToken];
 
=== modified file 'Files/U1UploadOperation.m'
--- Files/U1UploadOperation.m	2013-04-03 22:52:01 +0000
+++ Files/U1UploadOperation.m	2013-04-04 21:20:29 +0000
@@ -96,7 +96,7 @@
 		[filesService uploadContentData:dataProvider
 								forNode:self.fileNode
 						  progressBlock:^(long long uploaded, long long totalLength) {}
-						completionBlock:^(NSDictionary *updatedNodeInfo, NSError *magicUploadError) {
+						completionBlockOnMainQueue:^(NSDictionary *updatedNodeInfo, NSError *magicUploadError) {
 			
 			if (magicUploadError != nil)
 			{
@@ -134,17 +134,16 @@
 						
 						if (self.progressBlock)
 							self.progressBlock(uploaded, totalLength);
-					} completionBlock:^(NSDictionary *updatedNodeInfo, NSError *regularUploadError) {
+						
+					} completionBlockOnMainQueue:^(NSDictionary *updatedNodeInfo, NSError *regularUploadError) {
 						if (regularUploadError != nil)
 						{
 							self.error = regularUploadError;
 						}
 
-						dispatch_async(dispatch_get_main_queue(), ^{
-							[self.fileInfo setUploadPercentage:1.0];
-							[self.fileInfo setUploading:NO];
-							[self.fileInfo setUploaded:YES];
-						});
+						[self.fileInfo setUploadPercentage:1.0];
+						[self.fileInfo setUploading:NO];
+						[self.fileInfo setUploaded:YES];
 						
 						[self.fileNode updatePropertiesFromJSONDictionary:updatedNodeInfo];
 						[self finishExecuting];
@@ -153,11 +152,9 @@
 			}
 			else
 			{
-				dispatch_async(dispatch_get_main_queue(), ^{
-					[self.fileInfo setUploadPercentage:1.0];
-					[self.fileInfo setUploading:NO];
-					[self.fileInfo setUploaded:YES];
-				});
+				[self.fileInfo setUploadPercentage:1.0];
+				[self.fileInfo setUploading:NO];
+				[self.fileInfo setUploaded:YES];
 				
 				[self.fileNode updatePropertiesFromJSONDictionary:updatedNodeInfo];
 				[self finishExecuting];