Merge lp:~urbanape/ubuntuone-ios-files/uploads-view-drains-out into lp:ubuntuone-ios-files

[Zachery Bir]

This branch turns the "Camera Roll" view into an "Uploads" view, which shows the current queue of images to be uploaded, and drains down to empty.

Also fixes a bug with the way filenames were generated for uploads in the folder view.

[lp:~urbanape/ubuntuone-ios-files/uploads-view-drains-out]

26. By Zachery Bir on 2011-11-03

Updated the human-readableness to actually be human-readable, and upped the build number

[Jason Foreman (threeve)]

review: Approve

=== added file 'Assets/upload.png'
Binary files Assets/upload.png	1970-01-01 00:00:00 +0000 and Assets/upload.png	2011-11-03 18:34:27 +0000 differ
=== added file 'Assets/[e-mail]'
Binary files Assets/[e-mail]	1970-01-01 00:00:00 +0000 and Assets/[e-mail]	2011-11-03 18:34:27 +0000 differ
=== modified file 'Files.xcodeproj/project.pbxproj'
--- Files.xcodeproj/project.pbxproj	2011-11-01 17:13:15 +0000
+++ Files.xcodeproj/project.pbxproj	2011-11-03 18:34:27 +0000
@@ -18,15 +18,17 @@
 		916BF76B145A464E00D4FE06 /* settings.png in Resources */ = {isa = PBXBuildFile; fileRef = 916BF769145A464E00D4FE06 /* settings.png */; };
 		916BF76C145A464E00D4FE06 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 916BF76A145A464E00D4FE06 /* [e-mail] */; };
 		916BF77A145AF6B900D4FE06 /* Entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 916BF779145AF6B900D4FE06 /* Entitlements.plist */; };
-		916E0082143C9A3A0037F6D3 /* U1LocalAssetsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 916E0081143C9A390037F6D3 /* U1LocalAssetsViewController.m */; };
+		916E0082143C9A3A0037F6D3 /* U1UploadsPoolViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 916E0081143C9A390037F6D3 /* U1UploadsPoolViewController.m */; };
 		917ADEC71458954E00980FD4 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 917ADEC51458954E00980FD4 /* Icon.png */; };
 		917ADEC81458954E00980FD4 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 917ADEC61458954E00980FD4 /* [e-mail] */; };
-		9190AAF41444CA0A0063614A /* U1LocalAssetsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9190AAF31444CA0A0063614A /* U1LocalAssetsViewController.xib */; };
+		9190AAF41444CA0A0063614A /* U1UploadsPoolViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9190AAF31444CA0A0063614A /* U1UploadsPoolViewController.xib */; };
 		91A5E2DC142A70DF00EAAC2B /* U1LocalAssetsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 91A5E2DB142A70DF00EAAC2B /* U1LocalAssetsManager.m */; };
 		91A5E2DF142B727600EAAC2B /* U1AssetUploadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 91A5E2DE142B727500EAAC2B /* U1AssetUploadOperation.m */; };
 		91B3F2D5141E87F900939B3C /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91B3F2D4141E87F900939B3C /* AssetsLibrary.framework */; };
 		91B3F2DC141FDFAB00939B3C /* _U1Asset.m in Sources */ = {isa = PBXBuildFile; fileRef = 91B3F2DB141FDFAB00939B3C /* _U1Asset.m */; };
 		91B3F2DF141FDFBE00939B3C /* U1Asset.m in Sources */ = {isa = PBXBuildFile; fileRef = 91B3F2DE141FDFBE00939B3C /* U1Asset.m */; };
+		91D403621461ADE7005C66A8 /* upload.png in Resources */ = {isa = PBXBuildFile; fileRef = 91D403601461ADE7005C66A8 /* upload.png */; };
+		91D403631461ADE7005C66A8 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 91D403611461ADE7005C66A8 /* [e-mail] */; };
 		91EC184E145B8E3B00DF31F4 /* U1SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91EC184C145B8E3A00DF31F4 /* U1SettingsViewController.m */; };
 		91EC184F145B8E3B00DF31F4 /* U1SettingsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 91EC184D145B8E3B00DF31F4 /* U1SettingsViewController.xib */; };
 		91EC1851145F0A8F00DF31F4 /* default-settings.plist in Resources */ = {isa = PBXBuildFile; fileRef = 91EC1850145F0A8F00DF31F4 /* default-settings.plist */; };
@@ -160,12 +162,12 @@
 		916BF769145A464E00D4FE06 /* settings.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = settings.png; path = Assets/settings.png; sourceTree = "<group>"; };
 		916BF76A145A464E00D4FE06 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[e-mail]"; path = "Assets/[e-mail]"; sourceTree = "<group>"; };
 		916BF779145AF6B900D4FE06 /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Entitlements.plist; sourceTree = "<group>"; };
-		916E0080143C9A390037F6D3 /* U1LocalAssetsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1LocalAssetsViewController.h; sourceTree = "<group>"; };
-		916E0081143C9A390037F6D3 /* U1LocalAssetsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1LocalAssetsViewController.m; sourceTree = "<group>"; };
+		916E0080143C9A390037F6D3 /* U1UploadsPoolViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1UploadsPoolViewController.h; sourceTree = "<group>"; };
+		916E0081143C9A390037F6D3 /* U1UploadsPoolViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1UploadsPoolViewController.m; sourceTree = "<group>"; };
 		917ADEC014585DC800980FD4 /* U1Files 1.0-9.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "U1Files 1.0-9.xcdatamodel"; sourceTree = "<group>"; };
 		917ADEC51458954E00980FD4 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
 		917ADEC61458954E00980FD4 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
-		9190AAF31444CA0A0063614A /* U1LocalAssetsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = U1LocalAssetsViewController.xib; sourceTree = "<group>"; };
+		9190AAF31444CA0A0063614A /* U1UploadsPoolViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = U1UploadsPoolViewController.xib; sourceTree = "<group>"; };
 		91A5E2DB142A70DF00EAAC2B /* U1LocalAssetsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1LocalAssetsManager.m; sourceTree = "<group>"; };
 		91A5E2DD142B727500EAAC2B /* U1AssetUploadOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1AssetUploadOperation.h; sourceTree = "<group>"; };
 		91A5E2DE142B727500EAAC2B /* U1AssetUploadOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1AssetUploadOperation.m; sourceTree = "<group>"; };
@@ -175,6 +177,8 @@
 		91B3F2DB141FDFAB00939B3C /* _U1Asset.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = _U1Asset.m; sourceTree = "<group>"; };
 		91B3F2DD141FDFBE00939B3C /* U1Asset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1Asset.h; sourceTree = "<group>"; };
 		91B3F2DE141FDFBE00939B3C /* U1Asset.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1Asset.m; sourceTree = "<group>"; };
+		91D403601461ADE7005C66A8 /* upload.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = upload.png; path = Assets/upload.png; sourceTree = "<group>"; };
+		91D403611461ADE7005C66A8 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[e-mail]"; path = "Assets/[e-mail]"; sourceTree = "<group>"; };
 		91EC184B145B8E3A00DF31F4 /* U1SettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1SettingsViewController.h; sourceTree = "<group>"; };
 		91EC184C145B8E3A00DF31F4 /* U1SettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1SettingsViewController.m; sourceTree = "<group>"; };
 		91EC184D145B8E3B00DF31F4 /* U1SettingsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = U1SettingsViewController.xib; sourceTree = "<group>"; };
@@ -480,6 +484,8 @@
 		96783E6513F8ABC70092C6A1 /* Assets */ = {
 			isa = PBXGroup;
 			children = (
+				91D403601461ADE7005C66A8 /* upload.png */,
+				91D403611461ADE7005C66A8 /* [e-mail] */,
 				9147FF98146052E10023028C /* camera.png */,
 				9147FF99146052E10023028C /* [e-mail] */,
 				9147FF9A146052E10023028C /* folder.png */,
@@ -628,9 +634,9 @@
 				965D7EB81429690C00E4754F /* U1NavigationBar.m */,
 				96A169A21430D53600E4C990 /* U1LocalFileInfo.h */,
 				96A169A31430D53600E4C990 /* U1LocalFileInfo.m */,
-				916E0080143C9A390037F6D3 /* U1LocalAssetsViewController.h */,
-				916E0081143C9A390037F6D3 /* U1LocalAssetsViewController.m */,
-				9190AAF31444CA0A0063614A /* U1LocalAssetsViewController.xib */,
+				916E0080143C9A390037F6D3 /* U1UploadsPoolViewController.h */,
+				916E0081143C9A390037F6D3 /* U1UploadsPoolViewController.m */,
+				9190AAF31444CA0A0063614A /* U1UploadsPoolViewController.xib */,
 				916BF75F1459EF9C00D4FE06 /* U1UTIMapper.h */,
 				916BF7601459EF9C00D4FE06 /* U1UTIMapper.m */,
 				91EC184B145B8E3A00DF31F4 /* U1SettingsViewController.h */,
@@ -876,7 +882,7 @@
 				96A1699D1430C95E00E4C990 /* [e-mail] in Resources */,
 				96A169A01430C9C900E4C990 /* 265-download.png in Resources */,
 				96A169A11430C9C900E4C990 /* [e-mail] in Resources */,
-				9190AAF41444CA0A0063614A /* U1LocalAssetsViewController.xib in Resources */,
+				9190AAF41444CA0A0063614A /* U1UploadsPoolViewController.xib in Resources */,
 				913A54AF1451EFE70081FD67 /* progress_view_background.png in Resources */,
 				913A54B01451EFE70081FD67 /* [e-mail] in Resources */,
 				917ADEC71458954E00980FD4 /* Icon.png in Resources */,
@@ -893,6 +899,8 @@
 				9147FF9D146052E10023028C /* [e-mail] in Resources */,
 				9147FF9E146052E10023028C /* folder.png in Resources */,
 				9147FF9F146052E10023028C /* [e-mail] in Resources */,
+				91D403621461ADE7005C66A8 /* upload.png in Resources */,
+				91D403631461ADE7005C66A8 /* [e-mail] in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1003,7 +1011,7 @@
 				91A5E2DF142B727600EAAC2B /* U1AssetUploadOperation.m in Sources */,
 				965D7EB91429690C00E4754F /* U1NavigationBar.m in Sources */,
 				96A169A41430D53700E4C990 /* U1LocalFileInfo.m in Sources */,
-				916E0082143C9A3A0037F6D3 /* U1LocalAssetsViewController.m in Sources */,
+				916E0082143C9A3A0037F6D3 /* U1UploadsPoolViewController.m in Sources */,
 				96CAD3C71457823B007A496C /* NSDictionary+U1Additions.m in Sources */,
 				916BF7611459EF9C00D4FE06 /* U1UTIMapper.m in Sources */,
 				91EC184E145B8E3B00DF31F4 /* U1SettingsViewController.m in Sources */,
@@ -1120,8 +1128,8 @@
 					armv6,
 					armv7,
 				);
-				CODE_SIGN_IDENTITY = "iPhone Developer: Zachery Bir (P7WDPDEFHU)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Zachery Bir (P7WDPDEFHU)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Files/Files-Prefix.pch";
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -1132,8 +1140,8 @@
 					"\"$(SRCROOT)/Dependencies/TestFlightSDK\"",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "9D31E6D0-194D-4310-9E89-CB404D06C116";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "3D867106-3B81-4625-A9C8-1E9BD85B7E75";
+				PROVISIONING_PROFILE = "";
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = "arm6 armv7";
 				WRAPPER_EXTENSION = app;
@@ -1159,8 +1167,8 @@
 					"\"$(SRCROOT)/Dependencies/TestFlightSDK\"",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "B93E008E-7980-4B68-961E-44E81643E70F";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "B93E008E-7980-4B68-961E-44E81643E70F";
+				PROVISIONING_PROFILE = "3C4AD499-6439-4E5B-97FB-56DA71DC1754";
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "3C4AD499-6439-4E5B-97FB-56DA71DC1754";
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = "arm6 armv7";
 				WRAPPER_EXTENSION = app;

=== modified file 'Files/Files-Info.plist'
--- Files/Files-Info.plist	2011-11-01 17:20:25 +0000
+++ Files/Files-Info.plist	2011-11-03 18:34:27 +0000
@@ -41,7 +41,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>17</string>
+	<string>18</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSMainNibFile</key>

=== modified file 'Files/FilesAppDelegate.m'
--- Files/FilesAppDelegate.m	2011-11-01 17:11:35 +0000
+++ Files/FilesAppDelegate.m	2011-11-03 18:34:27 +0000
@@ -25,7 +25,7 @@
 #import "U1FilePreviewViewController.h"
 #import "U1FilesClient.h"
 #import "U1LocalAssetsManager.h"
-#import "U1LocalAssetsViewController.h"
+#import "U1UploadsPoolViewController.h"
 #import "U1FolderNode.h"
 #import "U1FolderViewController.h"
 #import "U1LoginController.h"
@@ -193,7 +193,7 @@
 {
 	U1VolumesViewController *volumesViewController = [[[U1VolumesViewController alloc] init] autorelease];
 	[self.volumesNavController setViewControllers:[NSArray arrayWithObject:volumesViewController]];
-	U1LocalAssetsViewController *assetsViewController = [[[U1LocalAssetsViewController alloc] initWithNodeResourcePath:[self remoteUploadFolderPath]] autorelease];
+	U1UploadsPoolViewController *assetsViewController = [[[U1UploadsPoolViewController alloc] init] autorelease];
 	[self.cameraNavController setViewControllers:[NSArray arrayWithObject:assetsViewController]];
 	U1SettingsViewController *settingsViewController = [[U1SettingsViewController alloc] initWithNibName:@"U1SettingsViewController" bundle:nil];
 	[self.settingsNavController setViewControllers:[NSArray arrayWithObject:settingsViewController]];

=== modified file 'Files/U1FilesClient.m'
--- Files/U1FilesClient.m	2011-11-01 16:40:04 +0000
+++ Files/U1FilesClient.m	2011-11-03 18:34:27 +0000
@@ -202,13 +202,13 @@
 		{
 			[node updatePropertiesFromJSONDictionary:nodeInfo];
 		}
+		dispatch_async(dispatch_get_main_queue(), ^(void) {
+			NSError *error = nil;
+			completionBlock(node, error);
+			[node release];
+		});
 	}];
 
-	dispatch_async(dispatch_get_main_queue(), ^(void) {
-		NSError *error = nil;
-		completionBlock(node, error);
-		[node release];
-	});
 
 	return nil;
 }

=== modified file 'Files/U1FolderViewController.m'
--- Files/U1FolderViewController.m	2011-11-01 01:17:53 +0000
+++ Files/U1FolderViewController.m	2011-11-03 18:34:27 +0000
@@ -196,7 +196,7 @@
 				   resultBlock:^(ALAsset *asset) {
 					   ALAssetRepresentation *representation = [asset defaultRepresentation];
 					   NSString *mimetype = [utiMapper MIMETypeForUTI:[representation UTI]];
-					   NSString *assetType = [asset valueForProperty:ALAssetPropertyType];
+					   NSString *assetType = [utiMapper humanReadableTypeForUTI:[representation UTI]];
 					   NSDate *assetDate = [asset valueForProperty:ALAssetPropertyDate];
 
 					   NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];

=== modified file 'Files/U1LocalAssetsManager.h'
--- Files/U1LocalAssetsManager.h	2011-11-01 17:12:25 +0000
+++ Files/U1LocalAssetsManager.h	2011-11-03 18:34:27 +0000
@@ -28,7 +28,7 @@
 - (int)numberOfAssets;
 - (int)numberOfAssetsUploaded;
 - (void)checkForNewAssets;
-- (BOOL)isResourceUploading:(NSString *)resourcePath;
+- (BOOL)isFilenameUploading:(NSString *)filename;
 - (void)thumbnailForNode:(U1FileNode *)fileNode completionBlock:(void(^)(CGImageRef thumbnail))completionBlock;
 - (BOOL)isOperating;
 @end

=== modified file 'Files/U1LocalAssetsManager.m'
--- Files/U1LocalAssetsManager.m	2011-11-01 17:12:25 +0000
+++ Files/U1LocalAssetsManager.m	2011-11-03 18:34:27 +0000
@@ -66,7 +66,7 @@
 	[defaultCenter addObserver:self selector:@selector(autoUploadSettingsChanged:) name:NSUserDefaultsDidChangeNotification object:[NSUserDefaults standardUserDefaults]];
 	dataRepository = [U1DataRepository sharedDataRepository];
 	uploadQueue = [[NSOperationQueue alloc] init];
-	[uploadQueue setMaxConcurrentOperationCount:4];
+	[uploadQueue setMaxConcurrentOperationCount:1];
 	self.localAssetsToUpload = [NSMutableSet set];
 	[defaultCenter addObserver:self selector:@selector(reachabilityChanged:) name:kReachabilityChangedNotification object:nil];
     return self;
@@ -261,9 +261,7 @@
 
 - (void)uploadRepresentation:(ALAssetRepresentation *)rep forAsset:(U1Asset *)asset withPriority:(NSOperationQueuePriority)priority;
 {
-	NSString *resourcePath = [self.remoteUploadFolder.resourcePath stringByAppendingPathComponent:asset.filename];
-	
-	if (![self isResourceUploading:resourcePath])
+	if (![self isFilenameUploading:asset.filename])
 	{
 		[self.localAssetsToUpload addObject:asset];
 		
@@ -281,7 +279,6 @@
 					[self.dataRepository save:NULL];
 					[self.localAssetsToUpload removeObject:asset];
 					[[NSNotificationCenter defaultCenter] postNotificationName:@"imageUploaded" object:nil];
-					// Fire a notification that our U1LocalAssetsViewController can subscribe to
 				}
 				else
 				{
@@ -326,12 +323,12 @@
 	return [self numberOfAssets] - [self.localAssetsToUpload count];
 }
 
-- (BOOL)isResourceUploading:(NSString *)resourcePath;
+- (BOOL)isFilenameUploading:(NSString *)filename;
 {
 	__block BOOL isUploading = NO;
 
 	[[self.uploadQueue operations] enumerateObjectsUsingBlock:^(U1AssetUploadOperation *operation, NSUInteger idx, BOOL *stop) {
-		if ([operation.filename isEqualToString:[resourcePath lastPathComponent]] && [operation isExecuting])
+		if ([operation.filename isEqualToString:filename] && [operation isExecuting])
 		{
 			isUploading = YES;
 			*stop = YES;

=== modified file 'Files/U1UTIMapper.h'
--- Files/U1UTIMapper.h	2011-11-01 14:22:20 +0000
+++ Files/U1UTIMapper.h	2011-11-03 18:34:27 +0000
@@ -17,6 +17,7 @@
 
 @interface U1UTIMapper : NSObject
 + (U1UTIMapper *)sharedU1UTIMapper;
+- (NSString *)humanReadableTypeForUTI:(NSString *)uti;
 - (NSString *)extensionForUTI:(NSString *)uti;
 - (NSString *)MIMETypeForUTI:(NSString *)uti;
 @end

=== modified file 'Files/U1UTIMapper.m'
--- Files/U1UTIMapper.m	2011-11-01 14:22:20 +0000
+++ Files/U1UTIMapper.m	2011-11-03 18:34:27 +0000
@@ -50,6 +50,11 @@
     [super dealloc];
 }
 
+- (NSString *)humanReadableTypeForUTI:(NSString *)uti;
+{
+	return [[self.mappings objectForKey:uti] objectForKey:@"type"];
+}
+
 - (NSString *)extensionForUTI:(NSString *)uti;
 {
 	return [[self.mappings objectForKey:uti] objectForKey:@"extension"];

=== renamed file 'Files/U1LocalAssetsViewController.h' => 'Files/U1UploadsPoolViewController.h'
--- Files/U1LocalAssetsViewController.h	2011-11-01 14:22:20 +0000
+++ Files/U1UploadsPoolViewController.h	2011-11-03 18:34:27 +0000
@@ -19,25 +19,15 @@
 
 @class U1FilesClient, U1Node;
 
-@protocol U1LocalAssetsViewControllerDelegate;
-
-
-@interface U1LocalAssetsViewController : PullRefreshTableViewController
+@interface U1UploadsPoolViewController : PullRefreshTableViewController
 
 @property (nonatomic, retain, readonly) IBOutlet UITableViewCell *loadingCell;
 @property (nonatomic, retain) IBOutlet UIView *progressView;
-@property (nonatomic, retain) IBOutlet UIProgressView *progressBar;
 @property (nonatomic, retain) IBOutlet UILabel *progressLabel;
-
-@property (assign) id<U1LocalAssetsViewControllerDelegate> delegate;
+@property (nonatomic, retain) IBOutlet UIView *autoUploadToggleView;
+@property (nonatomic, retain) IBOutlet UISwitch *autoUploadToggle;
 @property (retain) U1FilesClient *filesClient;
 
-- (id)initWithNodeResourcePath:(NSString*)resourcePath;
-
-@end
-
-
-@protocol U1LocalAssetsViewControllerDelegate <NSObject>
-@required
-- (void)localAssetsController:(U1LocalAssetsViewController*)localAssetsController didSelectNode:(U1Node*)node;
+- (IBAction)enableAutoUpload:(id)sender;
+
 @end

=== renamed file 'Files/U1LocalAssetsViewController.m' => 'Files/U1UploadsPoolViewController.m'
--- Files/U1LocalAssetsViewController.m	2011-11-01 17:12:52 +0000
+++ Files/U1UploadsPoolViewController.m	2011-11-03 18:34:27 +0000
@@ -13,55 +13,48 @@
 //  You should have received a copy of the GNU Affero General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "U1LocalAssetsViewController.h"
+#import "U1UploadsPoolViewController.h"
 
-#import "U1ByteSizeValueTransformer.h"
 #import "U1FileNode.h"
 #import "U1FilePreviewViewController.h"
 #import "U1FilesClient.h"
 #import "U1FolderItemCell.h"
 #import "U1FolderNode.h"
+#import "U1Asset.h"
 #import "U1Node.h"
 #import "UIActionSheet+U1Additions.h"
 #import "U1LocalAssetsManager.h"
 #import "U1DataRepository.h"
 
-@interface U1LocalAssetsViewController () <U1LocalAssetsViewControllerDelegate, UINavigationControllerDelegate, UIImagePickerControllerDelegate, NSFetchedResultsControllerDelegate>
-@property (copy) NSString *resourcePath;
-@property (retain) U1ByteSizeValueTransformer *byteSizeTransformer;
-@property (retain) NSIndexPath *pendingIndexPath;
-@property (retain) U1FolderNode *node;
-@property (retain) NSMutableArray *nodes;
+@interface U1UploadsPoolViewController () <UINavigationControllerDelegate, UIImagePickerControllerDelegate, NSFetchedResultsControllerDelegate>
 @property (retain) NSFetchedResultsController *resultsController;
 @property (retain) U1LocalAssetsManager *localAssetsManager;
 - (void)updateFeedback:(id)sender;
-- (void)loadInfoForNode;
+- (void)loadCurrentUploads;
+- (void)reloadTableData:(id)sender;
+- (UIView *)preparedAutoUploadToggleView;
+- (void)takePicture:(id)sender;
 @end
 
-
-@implementation U1LocalAssetsViewController
-
-@synthesize loadingCell, progressView, progressBar, progressLabel;
-@synthesize delegate, filesClient, node, resourcePath;
-@synthesize byteSizeTransformer, pendingIndexPath, nodes, resultsController, localAssetsManager;
-
-- (id)initWithNodeResourcePath:(NSString*)theResourcePath;
+@implementation U1UploadsPoolViewController
+
+@synthesize loadingCell;
+@synthesize progressView, progressLabel;
+@synthesize autoUploadToggleView, autoUploadToggle;
+@synthesize filesClient;
+@synthesize resultsController, localAssetsManager;
+
+- (id)init;
 {
-	self = [super initWithNibName:@"U1LocalAssetsViewController" bundle:nil];
+	self = [super initWithNibName:@"U1UploadsPoolViewController" bundle:nil];
 	if (!self)
 		return nil;
-	self.title = NSLocalizedString(@"Camera Roll", @"");
-	self.resourcePath = theResourcePath;
-	self.byteSizeTransformer = [[U1ByteSizeValueTransformer new] autorelease];
-	self.delegate = self; // ???
+	self.title = NSLocalizedString(@"Uploads", @"");
 	filesClient = [U1FilesClient sharedFilesClient];
 	localAssetsManager = [U1LocalAssetsManager sharedLocalAssetsManager];
+	[[NSNotificationCenter defaultCenter] addObserver:self
+											 selector:@selector(reloadTableData:) name:NSUserDefaultsDidChangeNotification object:nil];
 
-	// This button should use a camera icon and go to the image picker to take a new photo.
-	UIBarButtonItem *cameraButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCamera target:self action:@selector(takePicture:)];
-	[self.navigationItem setRightBarButtonItem:cameraButton];
-	[cameraButton release];
-	
 	UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 100, 20)];
 	// TODO: Ubuntu font
 	[titleLabel setFont:[UIFont boldSystemFontOfSize:18.f]];
@@ -81,13 +74,13 @@
 
 - (void)dealloc;
 {
+	[[NSNotificationCenter defaultCenter] removeObserver:self name:NSUserDefaultsDidChangeNotification object:nil];
 	[loadingCell release];
-	[resourcePath release];
-	[node release];
-	[byteSizeTransformer release];
-	[pendingIndexPath release];
-	[nodes release];
 	[resultsController release];
+	[autoUploadToggleView release];
+	[autoUploadToggle release];
+	[progressView release];
+	[progressLabel release];
 	[super dealloc];
 }
 
@@ -97,10 +90,6 @@
 	[self updateFeedback:nil];
 	[self refresh];
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateFeedback:) name:@"imageUploaded" object:nil];
-	UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longPress:)];
-	[longPress setMinimumPressDuration:1.f];
-	[self.tableView addGestureRecognizer:longPress];
-	[longPress release];
 }
 
 - (void)viewDidUnload;
@@ -116,60 +105,16 @@
 	[self.tableView deselectRowAtIndexPath:[self.tableView indexPathForSelectedRow] animated:YES];
 }
 
-- (void)longPress:(UILongPressGestureRecognizer*)longPress;
+- (void)updateFeedback:(id)sender;
 {
-	if (longPress.state == UIGestureRecognizerStateBegan)
-	{
-		CGPoint p = [longPress locationInView:self.tableView];
-		NSIndexPath *indexPath = [self.tableView indexPathForRowAtPoint:p];
-		U1Node *childNode = [self.nodes objectAtIndex:indexPath.row];
-		
-		UIActionSheet *actionSheet = [UIActionSheet new];
-		
-		[actionSheet setTitle:[[childNode path] lastPathComponent]];
-		// TODO: rename
-		NSInteger publishButtonIndex = -1;
-		NSInteger copyURLButtonIndex = -1;
-		if ([childNode isFile])
-		{
-			U1FileNode *fileNode = (id)childNode;
-			if ([[fileNode isPublic] boolValue])
-			{
-				publishButtonIndex = [actionSheet addButtonWithTitle:@"Unpublish"];
-				copyURLButtonIndex = [actionSheet addButtonWithTitle:@"Copy Public URL"];
-			}
-			else
-			{
-				publishButtonIndex = [actionSheet addButtonWithTitle:@"Publish"];
-			}
-		}
-		[actionSheet setCancelButtonIndex:[actionSheet addButtonWithTitle:@"Cancel"]];
-		
-		self.pendingIndexPath = indexPath;
-		[actionSheet showInView:self.view withCompletionBlock:^(NSInteger buttonIndex) {
-			if (buttonIndex == publishButtonIndex)
-			{
-				U1FileNode *fileNode = (id)childNode;
-				if ([[fileNode isPublic] boolValue])
-					[self.filesClient unpublishNode:fileNode completionBlock:^(U1FileNode *updatedNode, NSError *error) {
-					}];
-				else
-					[self.filesClient publishNode:fileNode completionBlock:^(U1FileNode *updatedNode, NSError *error) {
-					}];
-			}
-			else if (buttonIndex == copyURLButtonIndex)
-			{
-				U1FileNode *fileNode = (id)childNode;
-				NSArray *types = UIPasteboardTypeListString;
-				[[UIPasteboard generalPasteboard] setValue:[fileNode publicURLString] forPasteboardType:[types lastObject]];
-			}
-			else if (buttonIndex == [actionSheet cancelButtonIndex])
-			{
-				//				NSLog(@"cancel");
-			}
-			self.pendingIndexPath = nil;
-		}];
-	}
+	// Update the label and the progress bar
+	// progressLabel = (numberOfAssets - assetsPendingUpload) / numberOfAssets
+	dispatch_async(dispatch_get_main_queue(), ^{
+		U1LocalAssetsManager *localAssets = [U1LocalAssetsManager sharedLocalAssetsManager];
+		int assetsToUpload = [localAssets.localAssetsToUpload count];
+		self.progressLabel.text = [NSString stringWithFormat:@"%d remaining", assetsToUpload];
+		[self.tableView reloadData];
+	});
 }
 
 - (void)takePicture:(id)sender;
@@ -182,32 +127,13 @@
 
 - (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info;
 {
-	// TODO: check for jpg/png
-	// TODO: handle videos (stream)
-	
 	[picker dismissModalViewControllerAnimated:YES];
 	
-	//	NSURL *imageURL = [info objectForKey:UIImagePickerControllerReferenceURL];
 	UIImage *image = [info objectForKey:UIImagePickerControllerOriginalImage];
 	
 	UIImageWriteToSavedPhotosAlbum(image, self, nil, nil);
 }
 
-- (void)updateFeedback:(id)sender;
-{
-	// Update the label and the progress bar
-	// progressLabel = (numberOfAssets - assetsPendingUpload) / numberOfAssets
-	dispatch_async(dispatch_get_main_queue(), ^{
-		U1LocalAssetsManager *localAssets = [U1LocalAssetsManager sharedLocalAssetsManager];
-		int totalAssets = [localAssets numberOfAssets];
-		int assetsUploaded = [localAssets numberOfAssetsUploaded];
-		float percentDone = (float)assetsUploaded / (float)totalAssets;
-		self.progressLabel.text = [NSString stringWithFormat:@"%d of %d uploaded", assetsUploaded, totalAssets];
-		self.progressBar.progress = percentDone;
-		[self.tableView reloadData];
-	});
-}
-
 #pragma mark UITableViewDataSource Methods
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section;
@@ -220,9 +146,13 @@
 
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section;
 {
-	if (section == 0 && [self.localAssetsManager isOperating])
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	
+	if (section == 0 &&
+		([self.localAssetsManager isOperating] ||
+		 ![defaults boolForKey:@"auto_upload"]))
 	{
-		return 66.0f;
+		return 54.0f;
 	}
 	
 	return 0.0f;
@@ -230,9 +160,18 @@
 
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section;
 {
-	if (section == 0 && [self.localAssetsManager isOperating])
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	
+	if (section == 0)
 	{
-		return self.progressView;
+		if ([self.localAssetsManager isOperating])
+		{
+			return self.progressView;
+		}
+		else if (![defaults boolForKey:@"auto_upload"])
+		{
+			return [self preparedAutoUploadToggleView];
+		}
 	}
 	
 	return nil;
@@ -247,94 +186,77 @@
 	
 	U1FolderItemCell *cell = [U1FolderItemCell cellForTableView:tableView];
 	
-	U1Node *childNode = [self.resultsController objectAtIndexPath:indexPath];
-	cell.nameLabel.text = [childNode.resourcePath lastPathComponent];
-	NSString *detailString = @"Pending";
-//  TODO: get this thumbnail loading happening inside an operation queue, tied to visible rows
+	U1Asset *asset = [self.resultsController objectAtIndexPath:indexPath];
+	[cell setAccessoryType:UITableViewCellAccessoryNone];
+	cell.nameLabel.text = asset.filename;
+	cell.nameLabel.textColor = [UIColor blackColor];
+	NSString *detailString = NSLocalizedString(@"Pending", @"");
+
+	//  TODO: get this thumbnail loading happening inside an operation queue, tied to visible rows
 //	[self.localAssetsManager thumbnailForNode:childNode completionBlock:^(CGImageRef thumbnail) {
 //		cell.iconImageView.image = [UIImage imageWithCGImage:thumbnail];
 //	}];
 	
-	BOOL hasChildren = [[childNode hasChildren] boolValue];
-	[cell setAccessoryType:(hasChildren ? UITableViewCellAccessoryDisclosureIndicator : UITableViewCellAccessoryNone)];
+
 	
-	if (childNode.generation == nil)
+	// query the local assets manager to see if this childNode's corresponding asset is actually in the upload operation queue
+	BOOL isUploading = [self.localAssetsManager isFilenameUploading:asset.filename];
+	if (isUploading)
 	{
-		cell.nameLabel.textColor = [UIColor grayColor];
-		// query the local assets manager to see if this childNode's corresponding asset is actually in the upload operation queue
-		BOOL isUploading = [self.localAssetsManager isResourceUploading:childNode.resourcePath];
-		if (isUploading)
-		{
-			[cell.uploadIndicator setHidden:NO];
-			[cell.uploadIndicator startAnimating];
-			detailString = @"Uploading";
-		}
-		else {
-			[cell.uploadIndicator setHidden:YES];
-			[cell.uploadIndicator stopAnimating];
-		}
+		[cell.uploadIndicator setHidden:NO];
+		[cell.uploadIndicator startAnimating];
+		detailString = NSLocalizedString(@"Uploading", @"");
 	}
-	else
-	{
-		cell.nameLabel.textColor = [UIColor blackColor];
-		[cell.detailLabel setHidden:NO];
+	else {
 		[cell.uploadIndicator setHidden:YES];
 		[cell.uploadIndicator stopAnimating];
 	}
-	
-	[cell.imageView setImage:nil];
-	if ([childNode isFolder])
-	{
-		[cell.imageView setImage:[UIImage imageNamed:@"ic_folder"]];
-		detailString = [childNode.modificationDate description];
-	}
-	else
-	{
-		NSString *contentPath = childNode.contentPath;
-		NSURL *contentURL = [NSURL fileURLWithPath:contentPath];
-		UIDocumentInteractionController *docController = [UIDocumentInteractionController interactionControllerWithURL:contentURL];
-		[cell.imageView setImage:[docController.icons objectAtIndex:0]];
-		NSNumber *size = [childNode valueForKey:@"size"];
-		NSString *sizeString = [self.byteSizeTransformer transformedValue:size];
-		if (childNode.generation != nil)
-		{
-			detailString = [sizeString stringByAppendingFormat:@", modified %@", childNode.modificationDate];
-		}
-	}
-	
+
+	UIDocumentInteractionController *docController = [UIDocumentInteractionController interactionControllerWithURL:[NSURL fileURLWithPath:asset.filename]];
+	[cell.imageView setImage:[docController.icons objectAtIndex:0]];
 	[cell.detailLabel setText:detailString];
+
 	return cell;
 }
 
 
 #pragma mark UITableViewDelegate Methods
 
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath;
-{
-	U1Node *childNode = [self.resultsController objectAtIndexPath:indexPath];
-	[self.delegate localAssetsController:self didSelectNode:childNode];
-}
-
 - (void)refresh;
 {
-	[self loadInfoForNode];
+	[self loadCurrentUploads];
 }
 
+- (void)reloadTableData:(id)sender;
+{
+	[self.tableView reloadData];
+}
 
 #pragma mark Private Methods
 
-- (void)loadInfoForNode;
+- (void)loadCurrentUploads;
 {
-	NSParameterAssert(self.resourcePath != nil);
+	[[U1DataRepository sharedDataRepository] dispatchBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+		
+		NSFetchRequest *request = [[NSFetchRequest alloc] init];
+		[request setEntity:[U1Asset entityInManagedObjectContext:context]];
+		NSPredicate *p = [NSPredicate predicateWithFormat:@"generation = %@", nil];
+		[request setPredicate:p];
+		NSArray *sortDescriptors = [NSArray arrayWithObjects:
+									[NSSortDescriptor sortDescriptorWithKey:@"filename" ascending:YES selector:@selector(localizedStandardCompare:)],
+									nil];
+		[request setSortDescriptors:sortDescriptors];
+		self.resultsController = [[NSFetchedResultsController alloc] initWithFetchRequest:request managedObjectContext:context sectionNameKeyPath:nil cacheName:nil];
+		[request release];
+	}];
 	
-	[self.filesClient fetchFolderWithResourcePath:self.resourcePath completionBlock:^(U1Node *theNode, NSFetchedResultsController *childrenResultsController, NSError *error) {
-		
-		self.node = (id)theNode;
-		self.resultsController = childrenResultsController;
+	dispatch_async(dispatch_get_main_queue(), ^(void) {
+		NSError *error = nil;
+		[self.resultsController performFetch:&error];
 		[self.resultsController setDelegate:self];
 		[self stopLoading];
 		[self.tableView reloadData];
-	}];
+	});
 }
 
 #pragma mark NSFetchedResultsControllerDelegate Methods
@@ -405,16 +327,17 @@
 	[self.tableView endUpdates];
 }
 
-#pragma mark U1LocalAssetsViewControllerDelegate Methods
+- (UIView *)preparedAutoUploadToggleView;
+{
+	self.autoUploadToggle.on = [[NSUserDefaults standardUserDefaults] boolForKey:@"auto_upload"];
+	return self.autoUploadToggleView;
+}
 
-- (void)localAssetsController:(U1LocalAssetsViewController *)localAssetsController didSelectNode:(U1Node *)aNode
+- (void)enableAutoUpload:(id)sender;
 {
-	if ([aNode isFile])
-	{
-		U1FilePreviewViewController *fileController = [[U1FilePreviewViewController alloc] initWithNode:(id)node];
-		[self.navigationController pushViewController:fileController animated:YES];
-		[fileController release];
-	}
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	[defaults setBool:((UISwitch *)sender).on forKey:@"auto_upload"];
+	[self.tableView reloadData];
 }
 
 @end

=== renamed file 'Files/U1LocalAssetsViewController.xib' => 'Files/U1UploadsPoolViewController.xib'
--- Files/U1LocalAssetsViewController.xib	2011-10-26 20:25:30 +0000
+++ Files/U1UploadsPoolViewController.xib	2011-11-03 18:34:27 +0000
@@ -12,9 +12,9 @@
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBProxyObject</string>
-			<string>IBUIProgressView</string>
+			<string>IBUIImageView</string>
 			<string>IBUILabel</string>
-			<string>IBUIImageView</string>
+			<string>IBUISwitch</string>
 			<string>IBUIActivityIndicatorView</string>
 			<string>IBUITableView</string>
 			<string>IBUITableViewCell</string>
@@ -43,34 +43,22 @@
 					<object class="IBUIImageView" id="135648369">
 						<reference key="NSNextResponder" ref="824354941"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrameSize">{320, 66}</string>
+						<string key="NSFrameSize">{320, 54}</string>
 						<reference key="NSSuperview" ref="824354941"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="129966493"/>
+						<reference key="NSNextKeyView" ref="54616486"/>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<object class="NSCustomResource" key="IBUIImage">
+						<object class="NSCustomResource" key="IBUIImage" id="525630367">
 							<string key="NSClassName">NSImage</string>
 							<string key="NSResourceName">progress_view_background.png</string>
 						</object>
 					</object>
-					<object class="IBUIProgressView" id="129966493">
-						<reference key="NSNextResponder" ref="824354941"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{60, 20}, {200, 9}}</string>
-						<reference key="NSSuperview" ref="824354941"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="54616486"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<float key="IBUIProgress">0.5</float>
-					</object>
 					<object class="IBUILabel" id="54616486">
 						<reference key="NSNextResponder" ref="824354941"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{60, 37}, {200, 16}}</string>
+						<string key="NSFrame">{{60, 19}, {200, 16}}</string>
 						<reference key="NSSuperview" ref="824354941"/>
-						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<int key="IBUIContentMode">7</int>
@@ -96,9 +84,8 @@
 						</object>
 					</object>
 				</array>
-				<string key="NSFrameSize">{320, 66}</string>
+				<string key="NSFrameSize">{320, 54}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="135648369"/>
 				<object class="NSColor" key="IBUIBackgroundColor" id="590472223">
 					<int key="NSColorSpace">3</int>
@@ -111,7 +98,7 @@
 				<int key="NSvFlags">274</int>
 				<string key="NSFrameSize">{320, 480}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
 					<bytes key="NSWhite">MQA</bytes>
@@ -139,7 +126,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{136, 17}, {75, 21}}</string>
 								<reference key="NSSuperview" ref="783165177"/>
-								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
 								<int key="IBUIContentMode">7</int>
@@ -156,7 +143,7 @@
 									<int key="traits">0</int>
 									<double key="pointSize">17</double>
 								</object>
-								<object class="NSFont" key="IBUIFont">
+								<object class="NSFont" key="IBUIFont" id="862430175">
 									<string key="NSName">Helvetica</string>
 									<double key="NSSize">17</double>
 									<int key="NSfFlags">16</int>
@@ -167,7 +154,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{108, 18}, {20, 20}}</string>
 								<reference key="NSSuperview" ref="783165177"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="131881887"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -178,7 +164,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 53}</string>
 						<reference key="NSSuperview" ref="1003077660"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1037320153"/>
 						<reference key="IBUIBackgroundColor" ref="590472223"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -190,7 +175,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 54}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="783165177"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
@@ -199,6 +183,66 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<reference key="IBUIContentView" ref="783165177"/>
 			</object>
+			<object class="IBUIView" id="534137793">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">292</int>
+				<array class="NSMutableArray" key="NSSubviews">
+					<object class="IBUIImageView" id="204698816">
+						<reference key="NSNextResponder" ref="534137793"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrameSize">{320, 54}</string>
+						<reference key="NSSuperview" ref="534137793"/>
+						<reference key="NSNextKeyView" ref="592945301"/>
+						<bool key="IBUIUserInteractionEnabled">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<reference key="IBUIImage" ref="525630367"/>
+					</object>
+					<object class="IBUISwitch" id="830315920">
+						<reference key="NSNextResponder" ref="534137793"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrame">{{209, 13}, {94, 27}}</string>
+						<reference key="NSSuperview" ref="534137793"/>
+						<reference key="NSNextKeyView"/>
+						<bool key="IBUIOpaque">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+					</object>
+					<object class="IBUILabel" id="592945301">
+						<reference key="NSNextResponder" ref="534137793"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrame">{{20, 16}, {196, 21}}</string>
+						<reference key="NSSuperview" ref="534137793"/>
+						<reference key="NSNextKeyView" ref="830315920"/>
+						<bool key="IBUIOpaque">NO</bool>
+						<bool key="IBUIClipsSubviews">YES</bool>
+						<int key="IBUIContentMode">7</int>
+						<bool key="IBUIUserInteractionEnabled">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<string key="IBUIText">Auto-Upload Camera Roll</string>
+						<reference key="IBUITextColor" ref="943202549"/>
+						<nil key="IBUIHighlightedColor"/>
+						<int key="IBUIBaselineAdjustment">1</int>
+						<float key="IBUIMinimumFontSize">10</float>
+						<object class="IBUIFontDescription" key="IBUIFontDescription">
+							<int key="type">1</int>
+							<double key="pointSize">17</double>
+						</object>
+						<reference key="IBUIFont" ref="862430175"/>
+					</object>
+				</array>
+				<string key="NSFrameSize">{320, 54}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSNextKeyView" ref="204698816"/>
+				<object class="NSColor" key="IBUIBackgroundColor">
+					<int key="NSColorSpace">3</int>
+					<bytes key="NSWhite">MQA</bytes>
+					<object class="NSColorSpace" key="NSCustomColorSpace">
+						<int key="NSID">2</int>
+					</object>
+				</object>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<array class="NSMutableArray" key="connectionRecords">
@@ -236,11 +280,28 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">progressBar</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="129966493"/>
-					</object>
-					<int key="connectionID">18</int>
+						<string key="label">autoUploadToggleView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="534137793"/>
+					</object>
+					<int key="connectionID">23</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">autoUploadToggle</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="830315920"/>
+					</object>
+					<int key="connectionID">24</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">enableAutoUpload:</string>
+						<reference key="source" ref="830315920"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">13</int>
+					</object>
+					<int key="connectionID">27</int>
 				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -291,9 +352,8 @@
 						<int key="objectID">5</int>
 						<reference key="object" ref="824354941"/>
 						<array class="NSMutableArray" key="children">
+							<reference ref="135648369"/>
 							<reference ref="54616486"/>
-							<reference ref="129966493"/>
-							<reference ref="135648369"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -303,28 +363,51 @@
 						<reference key="parent" ref="824354941"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="129966493"/>
-						<reference key="parent" ref="824354941"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">19</int>
 						<reference key="object" ref="135648369"/>
 						<reference key="parent" ref="824354941"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">20</int>
+						<reference key="object" ref="534137793"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="204698816"/>
+							<reference ref="830315920"/>
+							<reference ref="592945301"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">21</int>
+						<reference key="object" ref="830315920"/>
+						<reference key="parent" ref="534137793"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">22</int>
+						<reference key="object" ref="592945301"/>
+						<reference key="parent" ref="534137793"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">26</int>
+						<reference key="object" ref="204698816"/>
+						<reference key="parent" ref="534137793"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.CustomClassName">U1LocalAssetsViewController</string>
+				<string key="-1.CustomClassName">U1UploadsPoolViewController</string>
 				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="-2.CustomClassName">UIResponder</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
@@ -332,52 +415,9 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">19</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">PullRefreshTableViewController</string>
-					<string key="superclassName">UITableViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/PullRefreshTableViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">U1LocalAssetsViewController</string>
-					<string key="superclassName">PullRefreshTableViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="loadingCell">UITableViewCell</string>
-						<string key="progressBar">UIProgressView</string>
-						<string key="progressLabel">UILabel</string>
-						<string key="progressView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="loadingCell">
-							<string key="name">loadingCell</string>
-							<string key="candidateClassName">UITableViewCell</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="progressBar">
-							<string key="name">progressBar</string>
-							<string key="candidateClassName">UIProgressView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="progressLabel">
-							<string key="name">progressLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="progressView">
-							<string key="name">progressView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/U1LocalAssetsViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+			<int key="maxID">27</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>

=== modified file 'Files/iPhone/en.lproj/MainWindow_iPhone.xib'
--- Files/iPhone/en.lproj/MainWindow_iPhone.xib	2011-11-01 17:13:15 +0000
+++ Files/iPhone/en.lproj/MainWindow_iPhone.xib	2011-11-03 18:34:27 +0000
@@ -68,12 +68,12 @@
 				</object>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<bool key="IBUIHorizontal">NO</bool>
-				<object class="IBUINavigationController" key="IBUISelectedViewController" id="175250829">
-					<object class="IBUITabBarItem" key="IBUITabBarItem" id="1047769425">
-						<string key="IBUITitle">Files</string>
+				<object class="IBUINavigationController" key="IBUISelectedViewController" id="941272465">
+					<object class="IBUITabBarItem" key="IBUITabBarItem" id="463875161">
+						<string key="IBUITitle">Uploads</string>
 						<object class="NSCustomResource" key="IBUIImage">
 							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">folder.png</string>
+							<string key="NSResourceName">upload.png</string>
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
@@ -85,7 +85,7 @@
 					</object>
 					<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					<bool key="IBUIHorizontal">NO</bool>
-					<object class="IBUINavigationBar" key="IBUINavigationBar" id="131246382">
+					<object class="IBUINavigationBar" key="IBUINavigationBar" id="499706903">
 						<nil key="NSNextResponder"/>
 						<int key="NSvFlags">256</int>
 						<string key="NSFrameSize">{0, 0}</string>
@@ -100,12 +100,12 @@
 					</object>
 					<object class="NSMutableArray" key="IBUIViewControllers">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="IBUIViewController" id="852027692">
-							<object class="IBUINavigationItem" key="IBUINavigationItem" id="570921376">
+						<object class="IBUIViewController" id="743143347">
+							<object class="IBUINavigationItem" key="IBUINavigationItem" id="374575231">
 								<string key="IBUITitle">Root View Controller</string>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 							</object>
-							<reference key="IBUIParentViewController" ref="175250829"/>
+							<reference key="IBUIParentViewController" ref="941272465"/>
 							<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
 								<int key="IBUIInterfaceOrientation">1</int>
 								<int key="interfaceOrientation">1</int>
@@ -117,13 +117,12 @@
 				</object>
 				<object class="NSMutableArray" key="IBUIViewControllers">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<reference ref="175250829"/>
-					<object class="IBUINavigationController" id="941272465">
-						<object class="IBUITabBarItem" key="IBUITabBarItem" id="463875161">
-							<string key="IBUITitle">Camera Roll</string>
+					<object class="IBUINavigationController" id="175250829">
+						<object class="IBUITabBarItem" key="IBUITabBarItem" id="1047769425">
+							<string key="IBUITitle">Files</string>
 							<object class="NSCustomResource" key="IBUIImage">
 								<string key="NSClassName">NSImage</string>
-								<string key="NSResourceName">camera.png</string>
+								<string key="NSResourceName">folder.png</string>
 							</object>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
@@ -135,7 +134,7 @@
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<bool key="IBUIHorizontal">NO</bool>
-						<object class="IBUINavigationBar" key="IBUINavigationBar" id="499706903">
+						<object class="IBUINavigationBar" key="IBUINavigationBar" id="131246382">
 							<nil key="NSNextResponder"/>
 							<int key="NSvFlags">256</int>
 							<string key="NSFrameSize">{0, 0}</string>
@@ -150,12 +149,12 @@
 						</object>
 						<object class="NSMutableArray" key="IBUIViewControllers">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBUIViewController" id="743143347">
-								<object class="IBUINavigationItem" key="IBUINavigationItem" id="374575231">
+							<object class="IBUIViewController" id="852027692">
+								<object class="IBUINavigationItem" key="IBUINavigationItem" id="570921376">
 									<string key="IBUITitle">Root View Controller</string>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								</object>
-								<reference key="IBUIParentViewController" ref="941272465"/>
+								<reference key="IBUIParentViewController" ref="175250829"/>
 								<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
 									<int key="IBUIInterfaceOrientation">1</int>
 									<int key="interfaceOrientation">1</int>
@@ -165,6 +164,7 @@
 							</object>
 						</object>
 					</object>
+					<reference ref="941272465"/>
 					<object class="IBUINavigationController" id="631281359">
 						<object class="IBUITabBarItem" key="IBUITabBarItem" id="460599548">
 							<string key="IBUITitle">Settings</string>
@@ -535,9 +535,9 @@
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<object class="NSArray" key="dict.sortedKeys">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>camera.png</string>
 				<string>folder.png</string>
 				<string>settings.png</string>
+				<string>upload.png</string>
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>

=== modified file 'Files/uti-mappings.plist'
--- Files/uti-mappings.plist	2011-10-28 03:41:49 +0000
+++ Files/uti-mappings.plist	2011-11-03 18:34:27 +0000
@@ -8,6 +8,8 @@
 		<string>JPG</string>
 		<key>mimetype</key>
 		<string>image/jpeg</string>
+		<key>type</key>
+		<string>Image</string>
 	</dict>
 	<key>public.png</key>
 	<dict>
@@ -15,6 +17,8 @@
 		<string>PNG</string>
 		<key>mimetype</key>
 		<string>image/png</string>
+		<key>type</key>
+		<string>Image</string>
 	</dict>
 	<key>com.compuserve.gif</key>
 	<dict>
@@ -22,6 +26,8 @@
 		<string>GIF</string>
 		<key>mimetype</key>
 		<string>image/gif</string>
+		<key>type</key>
+		<string>Image</string>
 	</dict>
 	<key>public.mpeg-4</key>
 	<dict>
@@ -29,6 +35,8 @@
 		<string>M4V</string>
 		<key>mimetype</key>
 		<string>video/x-m4v</string>
+		<key>type</key>
+		<string>Movie</string>
 	</dict>
 </dict>
 </plist>