Merge lp:~urbanape/ubuntuone-ios-files/fix-deleted-assets-crash into lp:ubuntuone-ios-files

[Zachery Bir]

This branch fixes the crashes that are caused by trying to deal with non-existent ALAssets during the re-queueing previous uploads step. Now, all asset fetch failures will be dealt with at the time of the upload operation. This isn't necessarily the best way, but right now, it at least prevents crashy failure.

[Jason Foreman (threeve)]

review: Approve

=== modified file 'Files/Files-Info.plist'
--- Files/Files-Info.plist	2011-12-09 20:45:10 +0000
+++ Files/Files-Info.plist	2011-12-12 18:04:37 +0000
@@ -41,7 +41,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>25</string>
+	<string>26</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSMainNibFile</key>

=== modified file 'Files/U1AutoUploadsManager.m'
--- Files/U1AutoUploadsManager.m	2011-12-09 19:56:28 +0000
+++ Files/U1AutoUploadsManager.m	2011-12-12 18:04:37 +0000
@@ -370,7 +370,6 @@
 																 matchingPredicate:p
 															   withSortDescriptors:[NSArray arrayWithObject:sortBy]
 																			 error:&error];
-	__block NSMutableArray *assetsDeletedFromLibrary = [NSMutableArray array];
 
 	[previouslyQueuedU1Assets enumerateObjectsUsingBlock:^(U1Asset *u1asset, NSUInteger idx, BOOL *stop) {
 		if (u1asset.fileNode.parent == self.remoteUploadFolder)
@@ -380,7 +379,6 @@
 									if (asset == nil)
 									{
 										NSLog(@"In the results block, but asset is nil!");
-										[assetsDeletedFromLibrary addObject:u1asset];
 									}
 									else
 									{
@@ -394,7 +392,6 @@
 									}
 								} failureBlock:^(NSError *error) {
 									NSLog(@"Error: %@", error);
-									[assetsDeletedFromLibrary addObject:u1asset];
 								}];
 		}
 		else
@@ -406,7 +403,6 @@
 									if (asset == nil)
 									{
 										NSLog(@"In the results block, but asset is nil!");
-										[assetsDeletedFromLibrary addObject:u1asset];
 									}
 									else
 									{
@@ -428,26 +424,9 @@
 									}
 								} failureBlock:^(NSError *error) {
 									NSLog(@"Error: %@", error);
-									[assetsDeletedFromLibrary addObject:u1asset];
 								}];
 		}
 	}];
-	
-	// Iterate over the assetsDeletedFromLibrary, and clean them up.
-	[self.dataRepository dispatchAsyncBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
-		for (int i = 0; i < [assetsDeletedFromLibrary count]; i++)
-		{
-			U1Asset *assetToBeDeleted = [assetsDeletedFromLibrary objectAtIndex:i];
-			U1FileNode *placeholderNode = assetToBeDeleted.fileNode;
-			[context deleteObject:assetToBeDeleted];
-			if (placeholderNode.generation == nil)
-			{
-				[context deleteObject:placeholderNode];
-			}
-			[self.dataRepository save:NULL];
-		}
-		[assetsDeletedFromLibrary release];
-	}];
 }
 
 - (NSString *)remoteUploadFolderPath;