Merge lp:~threeve/ubuntuone-ios-files/polish-and-shine into lp:ubuntuone-ios-files

[Jason Foreman]

Fixing leaks and warning, small visual tweaks

[Zachery Bir (urbanape)]

I like it, once the conflict gets resolved. Replace 206-215 with:

   NSString *ext = [(id)UTTypeCopyPreferredTagWithClass((CFStringRef)[representation UTI], kUTTagClassFilenameExtension) autorelease];
   filename = [NSString stringWithFormat:@"IMG_%d.%@", [self nextPictureNumber], ext];

[lp:~threeve/ubuntuone-ios-files/polish-and-shine]

50. By Jason Foreman on 2011-12-13

Merge trunk

[Zachery Bir (urbanape)]

review: Approve

=== modified file 'Assets/ic_folder.png'
 Binary files Assets/ic_folder.png	2011-08-31 14:56:30 +0000 and Assets/ic_folder.png	2011-12-13 16:37:23 +0000 differ
=== modified file 'Assets/[e-mail]'
 Binary files Assets/[e-mail]	2011-08-31 14:56:30 +0000 and Assets/[e-mail]	2011-12-13 16:37:23 +0000 differ
=== added file 'Assets/u1_folder.png'
 Binary files Assets/u1_folder.png	1970-01-01 00:00:00 +0000 and Assets/u1_folder.png	2011-12-13 16:37:23 +0000 differ
=== added file 'Assets/[e-mail]'
 Binary files Assets/[e-mail]	1970-01-01 00:00:00 +0000 and Assets/[e-mail]	2011-12-13 16:37:23 +0000 differ
=== modified file 'Dependencies/RIButtonItem.m'
--- Dependencies/RIButtonItem.m	2011-10-31 17:16:15 +0000
+++ Dependencies/RIButtonItem.m	2011-12-13 16:37:23 +0000
@@ -24,5 +24,12 @@
     return newItem;
 }
 
+- (void)dealloc;
+{
+	[label release];
+	[action release];
+	[super dealloc];
+}
+
 @end
 
 
=== modified file 'Files.xcodeproj/project.pbxproj'
--- Files.xcodeproj/project.pbxproj	2011-12-09 20:31:25 +0000
+++ Files.xcodeproj/project.pbxproj	2011-12-13 16:37:23 +0000
@@ -79,6 +79,7 @@
 		96733B10140DFD510074D545 /* SFHFKeychainUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 96733B0F140DFD510074D545 /* SFHFKeychainUtils.m */; };
 		96733B12140DFD6D0074D545 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96733B11140DFD6D0074D545 /* Security.framework */; };
 		96733B15140E04940074D545 /* UIActionSheet+U1Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 96733B14140E04940074D545 /* UIActionSheet+U1Additions.m */; };
+		96754B6E1496A7F3001D2A64 /* U1LoginController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 96754B6D1496A7F3001D2A64 /* U1LoginController.xib */; };
 		969EF22913F8C10C00CEF6CB /* U1VolumesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 969EF22713F8C10C00CEF6CB /* U1VolumesViewController.m */; };
 		969EF22A13F8C10C00CEF6CB /* U1VolumesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 969EF22813F8C10C00CEF6CB /* U1VolumesViewController.xib */; };
 		96A1699C1430C95E00E4C990 /* 04-eye.png in Resources */ = {isa = PBXBuildFile; fileRef = 96A1699A1430C95E00E4C990 /* 04-eye.png */; };
@@ -91,6 +92,8 @@
 		96B20E6E145F6AAE00D8ED69 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 96B20E6C145F6AAE00D8ED69 /* [e-mail] */; };
 		96B20E78145F815500D8ED69 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 96B20E77145F815500D8ED69 /* Reachability.m */; };
 		96B20E7A145F819300D8ED69 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96B20E79145F819200D8ED69 /* SystemConfiguration.framework */; };
+		96B2B77B1497042D0078D952 /* u1_folder.png in Resources */ = {isa = PBXBuildFile; fileRef = 96B2B7791497042D0078D952 /* u1_folder.png */; };
+		96B2B77C1497042D0078D952 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 96B2B77A1497042D0078D952 /* [e-mail] */; };
 		96C12F0114842F6300E53FCA /* U1FilePreviewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 96C12EFF14842F6300E53FCA /* U1FilePreviewViewController.m */; };
 		96C12F0214842F6300E53FCA /* U1FilePreviewViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 96C12F0014842F6300E53FCA /* U1FilePreviewViewController.xib */; };
 		96CAD3C71457823B007A496C /* NSDictionary+U1Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 96CAD3C61457823B007A496C /* NSDictionary+U1Additions.m */; };
@@ -277,6 +280,7 @@
 		96733B11140DFD6D0074D545 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		96733B13140E04940074D545 /* UIActionSheet+U1Additions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIActionSheet+U1Additions.h"; sourceTree = "<group>"; };
 		96733B14140E04940074D545 /* UIActionSheet+U1Additions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIActionSheet+U1Additions.m"; sourceTree = "<group>"; };
+		96754B6D1496A7F3001D2A64 /* U1LoginController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = U1LoginController.xib; sourceTree = "<group>"; };
 		969EF22613F8C10C00CEF6CB /* U1VolumesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1VolumesViewController.h; sourceTree = "<group>"; };
 		969EF22713F8C10C00CEF6CB /* U1VolumesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1VolumesViewController.m; sourceTree = "<group>"; };
 		969EF22813F8C10C00CEF6CB /* U1VolumesViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = U1VolumesViewController.xib; sourceTree = "<group>"; };
@@ -294,6 +298,8 @@
 		96B20E76145F815500D8ED69 /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
 		96B20E77145F815500D8ED69 /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
 		96B20E79145F819200D8ED69 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
+		96B2B7791497042D0078D952 /* u1_folder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = u1_folder.png; path = Assets/u1_folder.png; sourceTree = "<group>"; };
+		96B2B77A1497042D0078D952 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[e-mail]"; path = "Assets/[e-mail]"; sourceTree = "<group>"; };
 		96C12EFE14842F6300E53FCA /* U1FilePreviewViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1FilePreviewViewController.h; sourceTree = "<group>"; };
 		96C12EFF14842F6300E53FCA /* U1FilePreviewViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1FilePreviewViewController.m; sourceTree = "<group>"; };
 		96C12F0014842F6300E53FCA /* U1FilePreviewViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = U1FilePreviewViewController.xib; sourceTree = "<group>"; };
@@ -495,6 +501,7 @@
 				96733AEF140DFAC60074D545 /* UOSSOCredentialsViewController.xib */,
 				96733AF0140DFAC60074D545 /* U1LoginController.h */,
 				96733AF1140DFAC60074D545 /* U1LoginController.m */,
+				96754B6D1496A7F3001D2A64 /* U1LoginController.xib */,
 				96733B0B140DFCCB0074D545 /* U1AccountManager.h */,
 				96733B0C140DFCCB0074D545 /* U1AccountManager.m */,
 			);
@@ -504,6 +511,8 @@
 		96783E6513F8ABC70092C6A1 /* Assets */ = {
 			isa = PBXGroup;
 			children = (
+				96B2B7791497042D0078D952 /* u1_folder.png */,
+				96B2B77A1497042D0078D952 /* [e-mail] */,
 				96327C041492A13100607EF3 /* navbar.png */,
 				96327C051492A13100607EF3 /* [e-mail] */,
 				91D403601461ADE7005C66A8 /* upload.png */,
@@ -824,9 +833,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		96E860B013F7251D0026783D /* Files */ = {
+		96E860B013F7251D0026783D /* U1Files */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 96E860EE13F7251D0026783D /* Build configuration list for PBXNativeTarget "Files" */;
+			buildConfigurationList = 96E860EE13F7251D0026783D /* Build configuration list for PBXNativeTarget "U1Files" */;
 			buildPhases = (
 				96E860AD13F7251D0026783D /* Sources */,
 				96E860AE13F7251D0026783D /* Frameworks */,
@@ -837,7 +846,7 @@
 			);
 			dependencies = (
 			);
-			name = Files;
+			name = U1Files;
 			productName = Files;
 			productReference = 96E860B113F7251D0026783D /* Files.app */;
 			productType = "com.apple.product-type.application";
@@ -881,7 +890,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				96E860B013F7251D0026783D /* Files */,
+				96E860B013F7251D0026783D /* U1Files */,
 				96E860D913F7251D0026783D /* FilesTests */,
 			);
 		};
@@ -937,6 +946,9 @@
 				96C12F0214842F6300E53FCA /* U1FilePreviewViewController.xib in Resources */,
 				96327C061492A13100607EF3 /* navbar.png in Resources */,
 				96327C071492A13100607EF3 /* [e-mail] in Resources */,
+				96754B6E1496A7F3001D2A64 /* U1LoginController.xib in Resources */,
+				96B2B77B1497042D0078D952 /* u1_folder.png in Resources */,
+				96B2B77C1497042D0078D952 /* [e-mail] in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1076,7 +1088,7 @@
 /* Begin PBXTargetDependency section */
 		96E860E113F7251D0026783D /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 96E860B013F7251D0026783D /* Files */;
+			target = 96E860B013F7251D0026783D /* U1Files */;
 			targetProxy = 96E860E013F7251D0026783D /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
@@ -1268,7 +1280,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		96E860EE13F7251D0026783D /* Build configuration list for PBXNativeTarget "Files" */ = {
+		96E860EE13F7251D0026783D /* Build configuration list for PBXNativeTarget "U1Files" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				96E860EF13F7251D0026783D /* Debug */,
 
=== modified file 'Files/Files-Info.plist'
--- Files/Files-Info.plist	2011-12-13 02:15:46 +0000
+++ Files/Files-Info.plist	2011-12-13 16:37:23 +0000
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-	<string>${PRODUCT_NAME}</string>
+	<string>U1 Files</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
 
=== modified file 'Files/FilesAppDelegate.m'
--- Files/FilesAppDelegate.m	2011-12-06 19:44:22 +0000
+++ Files/FilesAppDelegate.m	2011-12-13 16:37:23 +0000
@@ -156,7 +156,7 @@
 	[self.volumesNavController setViewControllers:[NSArray arrayWithObject:volumesViewController]];
 	U1UploadsPoolViewController *assetsViewController = [[[U1UploadsPoolViewController alloc] init] autorelease];
 	[self.cameraNavController setViewControllers:[NSArray arrayWithObject:assetsViewController]];
-	U1SettingsViewController *settingsViewController = [[U1SettingsViewController alloc] initWithNibName:@"U1SettingsViewController" bundle:nil];
+	U1SettingsViewController *settingsViewController = [[[U1SettingsViewController alloc] initWithNibName:@"U1SettingsViewController" bundle:nil] autorelease];
 	[self.settingsNavController setViewControllers:[NSArray arrayWithObject:settingsViewController]];
 }
 
 
=== modified file 'Files/U1AssetRepresenationDataProvider.m'
--- Files/U1AssetRepresenationDataProvider.m	2011-12-08 14:17:47 +0000
+++ Files/U1AssetRepresenationDataProvider.m	2011-12-13 16:37:23 +0000
@@ -51,7 +51,7 @@
 			if (block)
 			{
 				NSError *error = [NSError errorWithDomain:@"nonexistentAsset" code:1 userInfo:nil];
-				block(nil, nil, nil, error);
+				block(nil, nil, 0, error);
 			}
 		}
 		else
@@ -60,7 +60,7 @@
 			uint8_t *buffer = (uint8_t*)malloc(representation.size);
 			NSUInteger length = [representation getBytes:buffer fromOffset:0 length:representation.size error:nil];
 			NSData *imageData = [NSData dataWithBytesNoCopy:buffer length:length freeWhenDone:YES];
-			NSString *mimeType = (id)UTTypeCopyPreferredTagWithClass((CFStringRef)[representation UTI], kUTTagClassMIMEType);
+			NSString *mimeType = [(id)UTTypeCopyPreferredTagWithClass((CFStringRef)[representation UTI], kUTTagClassMIMEType) autorelease];
 			NSInputStream *dataStream = [NSInputStream inputStreamWithData:imageData];
 			if (block)
 				block(dataStream, mimeType, length, nil);
 
=== modified file 'Files/U1AutoUploadsManager.m'
--- Files/U1AutoUploadsManager.m	2011-12-12 23:06:17 +0000
+++ Files/U1AutoUploadsManager.m	2011-12-13 16:37:23 +0000
@@ -410,9 +410,9 @@
 									else
 									{
 										ALAssetRepresentation *representation = [asset defaultRepresentation];
-										NSString *mimetype = (id)UTTypeCopyPreferredTagWithClass((CFStringRef)[representation UTI], kUTTagClassMIMEType);
+										NSString *mimetype = [(id)UTTypeCopyPreferredTagWithClass((CFStringRef)[representation UTI], kUTTagClassMIMEType) autorelease];
 										
-										U1AssetRepresenationDataProvider *provider = [[U1AssetRepresenationDataProvider alloc] init];
+										U1AssetRepresenationDataProvider *provider = [[[U1AssetRepresenationDataProvider alloc] init] autorelease];
 										provider.assetURL = imageURL;
 										
 										[self.filesClient uploadContentDataProvider:provider
@@ -457,7 +457,7 @@
 	}
 	else
 	{
-		NSString *ext = (id)UTTypeCopyPreferredTagWithClass((CFStringRef)[representation UTI], kUTTagClassFilenameExtension);
+		NSString *ext = [(id)UTTypeCopyPreferredTagWithClass((CFStringRef)[representation UTI], kUTTagClassFilenameExtension) autorelease];
 		filename = [NSString stringWithFormat:@"IMG_%d.%@", [self nextPictureNumber], ext];
 	}
 
@@ -512,7 +512,7 @@
 	
 	if ((![self isPending:assetToUpload.filename]) && (assetToUpload.generation == nil))
 	{
-		U1AssetRepresenationDataProvider *provider = [[U1AssetRepresenationDataProvider alloc] init];
+		U1AssetRepresenationDataProvider *provider = [[[U1AssetRepresenationDataProvider alloc] init] autorelease];
 		provider.assetURL = [NSURL URLWithString:assetToUpload.url];
 		
 		// Let's create an operation!
 
=== modified file 'Files/U1FilesClient.m'
--- Files/U1FilesClient.m	2011-12-09 19:56:28 +0000
+++ Files/U1FilesClient.m	2011-12-13 16:37:23 +0000
@@ -375,6 +375,8 @@
 	}
 	
 	U1UploadOperation *operation = [[U1UploadOperation alloc] init];
+	__block typeof(operation) operationRef = operation;
+
 	operation.dataProvider = dataProvider;
 	operation.fileNode = node;
 	operation.mimetype = contentType;
@@ -384,8 +386,8 @@
 		dispatch_async(dispatch_get_main_queue(), ^{
 
 			NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:
-									  operation.fileNode, @"node",
-									  operation.fileInfo, @"fileInfo",
+									  operationRef.fileNode, @"node",
+									  operationRef.fileInfo, @"fileInfo",
 									  nil];
 			[[NSNotificationCenter defaultCenter] postNotificationName:U1FilesClientNodeStatusChangedNotification object:self userInfo:userInfo];
 			
@@ -396,18 +398,17 @@
 			progressBlock(sent, total);
 		}
 	};
-	
 	[operation setQueuePriority:priority];
 	[operation setCompletionBlock:^{
 		dispatch_async(dispatch_get_main_queue(), ^(void) {
-			if (operation.error == nil) // or the error is somehow unrecoverable (e.g., over quota)
+			if (operationRef.error == nil) // or the error is somehow unrecoverable (e.g., over quota)
 			{
 				[[NSNotificationCenter defaultCenter] postNotificationName:@"imageUploaded" object:nil];
-				completionBlock(operation.fileNode, nil);
+				completionBlock(operationRef.fileNode, nil);
 			}
 			else
 			{
-				NSLog(@"Error trying to upload %@: %@", resourceName, operation.error);
+				NSLog(@"Error trying to upload %@: %@", resourceName, operationRef.error);
 				// Try it again (this is brittle if the error isn't recoverable (e.g. over quota)
 				[self uploadContentDataProvider:dataProvider
 									   toFolder:folderNode
 
=== modified file 'Files/U1FilesService.m'
--- Files/U1FilesService.m	2011-12-09 19:56:28 +0000
+++ Files/U1FilesService.m	2011-12-13 16:37:23 +0000
@@ -357,11 +357,12 @@
 	U1HTTPRequestOperation *httpOperation = [[U1HTTPRequestOperation alloc] initWithRequest:request dataCollector:collector];
 	[request release];
 	
+	__block typeof(httpOperation) operationRef = httpOperation;
 	[httpOperation setCompletionBlock:^(void) {
 			
 		id result = nil;
-		NSHTTPURLResponse *response = httpOperation.response;
-		NSError *error = httpOperation.error;
+		NSHTTPURLResponse *response = operationRef.response;
+		NSError *error = operationRef.error;
 		
 		if ([response statusCode] == 401)
 		{
 
=== modified file 'Files/U1FolderViewController.m'
--- Files/U1FolderViewController.m	2011-12-09 20:31:25 +0000
+++ Files/U1FolderViewController.m	2011-12-13 16:37:23 +0000
@@ -217,7 +217,7 @@
 				   resultBlock:^(ALAsset *asset) {
 					   ALAssetRepresentation *representation = [asset defaultRepresentation];
 					   CFStringRef uti = (CFStringRef)[representation UTI];
-					   NSString *mimetype = (id)UTTypeCopyPreferredTagWithClass(uti, kUTTagClassMIMEType);
+					   NSString *mimetype = [(id)UTTypeCopyPreferredTagWithClass(uti, kUTTagClassMIMEType) autorelease];
 					   NSString *assetType = nil;
 					   if (UTTypeConformsTo(uti, kUTTypeImage))
 					   {
@@ -237,7 +237,7 @@
 					   [dateFormatter setDateStyle:NSDateFormatterMediumStyle];
 					   [dateFormatter setTimeStyle:NSDateFormatterMediumStyle];
 					   
-					   NSString *ext = (id)UTTypeCopyPreferredTagWithClass(uti, kUTTagClassFilenameExtension);
+					   NSString *ext = [(id)UTTypeCopyPreferredTagWithClass(uti, kUTTagClassFilenameExtension) autorelease];
 					   NSString *filename = [NSString stringWithFormat:@"%@ %@.%@", assetType, [dateFormatter stringFromDate:assetDate], ext];
 					   [dateFormatter release];
 					   
 
=== modified file 'Files/U1LoginController.m'
--- Files/U1LoginController.m	2011-12-06 18:38:47 +0000
+++ Files/U1LoginController.m	2011-12-13 16:37:23 +0000
@@ -31,7 +31,8 @@
 
 
 @interface U1LoginController ()
-@property (retain) UIViewController *loginViewController;
+@property (retain) IBOutlet UIViewController *loginViewController;
+@property (retain) IBOutlet UOSSOCredentialsViewController *rootController;
 @property (retain) NSOperationQueue *operationQueue;
 - (void)loginWithUsername:(NSString*)username password:(NSString*)password;
 - (void)handleError:(NSError*)error;
@@ -40,14 +41,15 @@
 
 @implementation U1LoginController
 
-@synthesize delegate, loginViewController, operationQueue;
+@synthesize delegate, loginViewController, rootController, operationQueue;
 
 - (id)init;
 {
 	if (!(self = [super init]))
 		return nil;
 	
-	UOSSOCredentialsViewController *rootController = [[[UOSSOCredentialsViewController alloc] initWithNibName:@"UOSSOCredentialsViewController" bundle:nil] autorelease];
+//	UOSSOCredentialsViewController *rootController = [[[UOSSOCredentialsViewController alloc] initWithNibName:@"UOSSOCredentialsViewController" bundle:nil] autorelease];
+	[[UINib nibWithNibName:@"U1LoginController" bundle:nil] instantiateWithOwner:self options:nil];
 	rootController.title = NSLocalizedString(@"Log In to Ubuntu One", @"");
 	
 	__block id this = self;
@@ -56,10 +58,10 @@
 		[this loginWithUsername:username password:password];
 	};
 	
-	UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:rootController];
+//	UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:rootController];
 //	navController.navigationBar.barStyle = UIBarStyleBlack;
 //	navController.navigationBarHidden = YES;
-	loginViewController = navController;
+//	loginViewController = navController;
 	
 	operationQueue = [[NSOperationQueue alloc] init];
 	
@@ -70,6 +72,7 @@
 {
 	delegate = nil;
 	[loginViewController release];
+	[rootController release];
 	[operationQueue release];
     [super dealloc];
 }
 
=== added file 'Files/U1LoginController.xib'
--- Files/U1LoginController.xib	1970-01-01 00:00:00 +0000
+++ Files/U1LoginController.xib	2011-12-13 16:37:23 +0000
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1280</int>
+		<string key="IBDocument.SystemVersion">10K549</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
+		<string key="IBDocument.AppKitVersion">1038.36</string>
+		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+			<string key="NS.object.0">933</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBUINavigationItem</string>
+			<string>IBUIViewController</string>
+			<string>IBUINavigationBar</string>
+			<string>IBUINavigationController</string>
+			<string>IBProxyObject</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="IBProxyObject" id="841351856">
+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBProxyObject" id="371349661">
+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBUINavigationController" id="497033572">
+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+					<int key="IBUIInterfaceOrientation">1</int>
+					<int key="interfaceOrientation">1</int>
+				</object>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+				<bool key="IBUIHorizontal">NO</bool>
+				<object class="IBUINavigationBar" key="IBUINavigationBar" id="18568225">
+					<nil key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<string key="NSFrameSize">{0, 0}</string>
+					<bool key="IBUIOpaque">NO</bool>
+					<bool key="IBUIClipsSubviews">YES</bool>
+					<bool key="IBUIMultipleTouchEnabled">YES</bool>
+					<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+				</object>
+				<array class="NSMutableArray" key="IBUIViewControllers">
+					<object class="IBUIViewController" id="357211705">
+						<object class="IBUINavigationItem" key="IBUINavigationItem" id="866999870">
+							<reference key="IBUINavigationBar"/>
+							<string key="IBUITitle"/>
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						</object>
+						<reference key="IBUIParentViewController" ref="497033572"/>
+						<string key="IBUINibName">UOSSOCredentialsViewController</string>
+						<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+							<int key="IBUIInterfaceOrientation">1</int>
+							<int key="interfaceOrientation">1</int>
+						</object>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<bool key="IBUIHorizontal">NO</bool>
+					</object>
+				</array>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">loginViewController</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="497033572"/>
+					</object>
+					<int key="connectionID">6</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">rootController</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="357211705"/>
+					</object>
+					<int key="connectionID">7</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="841351856"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="371349661"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2</int>
+						<reference key="object" ref="497033572"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="18568225"/>
+							<reference ref="357211705"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3</int>
+						<reference key="object" ref="18568225"/>
+						<reference key="parent" ref="497033572"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="357211705"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="866999870"/>
+						</array>
+						<reference key="parent" ref="497033572"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="866999870"/>
+						<reference key="parent" ref="357211705"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.CustomClassName">U1LoginController</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="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="3.CustomClassName">U1NavigationBar</string>
+				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="4.CustomClassName">UOSSOCredentialsViewController</string>
+				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">7</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">U1LoginController</string>
+					<string key="superclassName">NSObject</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="loginViewController">UIViewController</string>
+						<string key="rootController">UOSSOCredentialsViewController</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="loginViewController">
+							<string key="name">loginViewController</string>
+							<string key="candidateClassName">UIViewController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="rootController">
+							<string key="name">rootController</string>
+							<string key="candidateClassName">UOSSOCredentialsViewController</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/U1LoginController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">U1NavigationBar</string>
+					<string key="superclassName">UINavigationBar</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/U1NavigationBar.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UOSSOCredentialsViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">logIn:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">logIn:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">logIn:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="emailField">UITextField</string>
+						<string key="loginButton">UIButton</string>
+						<string key="passwordField">UITextField</string>
+						<string key="patternView">UIView</string>
+						<string key="spinner">UIActivityIndicatorView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="emailField">
+							<string key="name">emailField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="loginButton">
+							<string key="name">loginButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="passwordField">
+							<string key="name">passwordField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="patternView">
+							<string key="name">patternView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="spinner">
+							<string key="name">spinner</string>
+							<string key="candidateClassName">UIActivityIndicatorView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UOSSOCredentialsViewController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<string key="IBCocoaTouchPluginVersion">933</string>
+	</data>
+</archive>
 
=== modified file 'Files/U1SettingsViewController.m'
--- Files/U1SettingsViewController.m	2011-12-09 20:31:25 +0000
+++ Files/U1SettingsViewController.m	2011-12-13 16:37:23 +0000
@@ -219,6 +219,7 @@
 					NSString *usedString = [byteSizeTransformer transformedValue:[self.accountInfo objectForKey:@"used_bytes"]];
 					NSString *totalString = [byteSizeTransformer transformedValue:[self.accountInfo objectForKey:@"max_bytes"]];
 					[cell.detailTextLabel setText:[NSString stringWithFormat:storageFormat, usedString, totalString]];
+					[byteSizeTransformer release];
 					break;
 				}
 			}
 
=== modified file 'Files/U1VolumesViewController.m'
--- Files/U1VolumesViewController.m	2011-12-09 20:31:25 +0000
+++ Files/U1VolumesViewController.m	2011-12-13 16:37:23 +0000
@@ -106,9 +106,13 @@
 		cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:@"U1FolderCell"] autorelease];
 		[cell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator];
 		[cell setSelectionStyle:UITableViewCellSelectionStyleGray];
-		[cell.imageView setImage:[UIImage imageNamed:@"ic_folder"]];
 	}
 	U1Volume *volume = [self.cloudFoldersFetchController objectAtIndexPath:indexPath];
+	[cell.imageView setImage:[UIImage imageNamed:@"ic_folder"]];
+	if ([volume.kind isEqualToString:@"root"])
+	{
+		[cell.imageView setImage:[UIImage imageNamed:@"u1_folder"]];
+	}
 	NSString *volumePath = volume.path;
 	if ([@"~/.ubuntuone/Purchased from Ubuntu One" isEqualToString:volumePath])
 		volumePath = @"Purchased Music";