Merge lp:~mikemc/ubuntuone-ios-files/delete-asset-on-main-queue into lp:ubuntuone-ios-files

[Mike McCracken]

- delete u1asset managed object on main queue to avoid using managed objects on multiple queues

- delete u1asset managed object on main queue to avoid using managed objects on multiple queues

The docs say 'don't do that'

[lp:~mikemc/ubuntuone-ios-files/delete-asset-on-main-queue]

79. By Mike McCracken on 2013-04-04

Poke LP to update diffs

[dobey (dobey)]

review: Approve

[Brian Curtin (brian.curtin)]

review: Approve

=== modified file 'Files/U1UploadOperation.m'
--- Files/U1UploadOperation.m	2013-03-29 22:48:22 +0000
+++ Files/U1UploadOperation.m	2013-04-04 18:13:24 +0000
@@ -104,8 +104,9 @@
 				{
 					self.error = magicUploadError;
 					// Asset is gone, delete U1Asset and potentially the Node, and stop running
+					// do this on the main context because self.fileNode was fetched there.
 					U1DataRepository *dataRepository = [U1DataRepository sharedDataRepository];
-					[dataRepository dispatchAsyncBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+					[dataRepository dispatchBlockWithMainContext:^(NSManagedObjectContext *context) {
 						U1Asset *assetToBeDeleted = self.fileNode.asset;
 						[context deleteObject:assetToBeDeleted];
 						if (self.fileNode.generation == nil)