Merge lp:~mikemc/ubuntuone-ios-files/ignore-null-sized-nodes into lp:ubuntuone-ios-files

[Mike McCracken]

- Match android app behavior by ignoring nodes with null size

- Match android app behavior by ignoring nodes with null size

Later display code in folderviewcontroller wasn't handling this cleanly anyway.

[dobey (dobey)]

6 -// Copyright 2011 Canonical Ltd.
7 +// Copyright 2013 Canonical Ltd.

Again with 2011-2013 instead. And this also seems to have a lot of the same changes as the quiet-crashlytics and separate-hasher branches.

review: Needs Fixing

[Mike McCracken (mikemc)]

r 101..102 fix criss-cross merge issues

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

No proposals found for merge of https://code.launchpad.net/~mikemc/ubuntuone-ios-files/quiet-crashlytics into https://code.launchpad.net/~ubuntuone-ios-client-team/ubuntuone-ios-files/trunk.

[Ubuntu One Auto Pilot (otto-pilot)]

No proposals found for merge of https://code.launchpad.net/~mikemc/ubuntuone-ios-files/quiet-crashlytics into https://code.launchpad.net/~ubuntuone-ios-client-team/ubuntuone-ios-files/trunk.

=== modified file 'Files/U1FilesClient.m'
--- Files/U1FilesClient.m	2013-05-25 00:05:33 +0000
+++ Files/U1FilesClient.m	2013-05-25 00:05:33 +0000
@@ -262,6 +262,11 @@
 			NSUInteger batchCounter = 0;
 			for (NSDictionary *childInfo in childInfos)
 			{
+				// Ignore nodes with no contentblob:
+				if ([childInfo objectForKey:@"size"] == [NSNull null]) {
+					continue;
+				}
+			
 				NSString *childResourcePath = [childInfo objectForKey:@"resource_path"];
 				NSString *kind = [childInfo objectForKey:@"kind"];
 				NSPredicate *p = [NSPredicate predicateWithFormat:@"resourcePath = %@", childResourcePath];