Merge lp:~urbanape/ubuntuone-ios-files/background-processing into lp:~threeve/ubuntuone-ios-files/background-processing

[Zachery Bir]

This branch adds checks to protect attempts to upload ALAssets that have been deleted in the interval. We don't re-queue them on start, but if it's in the queue already, we also check when the operation is underway.

[Jason Foreman (threeve)]

review: Approve

=== modified file 'Files.xcodeproj/project.pbxproj'
--- Files.xcodeproj/project.pbxproj	2011-12-07 22:53:01 +0000
+++ Files.xcodeproj/project.pbxproj	2011-12-08 14:24:32 +0000
@@ -19,6 +19,7 @@
 		916BF76C145A464E00D4FE06 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 916BF76A145A464E00D4FE06 /* [e-mail] */; };
 		916BF77A145AF6B900D4FE06 /* Entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 916BF779145AF6B900D4FE06 /* Entitlements.plist */; };
 		916E0082143C9A3A0037F6D3 /* U1UploadsPoolViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 916E0081143C9A390037F6D3 /* U1UploadsPoolViewController.m */; };
+		9172C870148FA4F600FC7737 /* U1TopPinningLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9172C86F148FA4F600FC7737 /* U1TopPinningLabel.m */; };
 		917692C7148DB50500316986 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 917692C6148DB50500316986 /* MobileCoreServices.framework */; };
 		917ADEC71458954E00980FD4 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 917ADEC51458954E00980FD4 /* Icon.png */; };
 		917ADEC81458954E00980FD4 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 917ADEC61458954E00980FD4 /* [e-mail] */; };
@@ -170,6 +171,8 @@
 		916BF779145AF6B900D4FE06 /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Entitlements.plist; 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; lineEnding = 0; path = U1UploadsPoolViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		9172C86E148FA4F600FC7737 /* U1TopPinningLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1TopPinningLabel.h; sourceTree = "<group>"; };
+		9172C86F148FA4F600FC7737 /* U1TopPinningLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1TopPinningLabel.m; sourceTree = "<group>"; };
 		917692C6148DB50500316986 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
 		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>"; };
@@ -667,6 +670,8 @@
 				91EC184D145B8E3B00DF31F4 /* U1SettingsViewController.xib */,
 				9623AE6014868F7000ACDF1C /* U1ReportingInputStream.h */,
 				9623AE6114868F7000ACDF1C /* U1ReportingInputStream.m */,
+				9172C86E148FA4F600FC7737 /* U1TopPinningLabel.h */,
+				9172C86F148FA4F600FC7737 /* U1TopPinningLabel.m */,
 			);
 			path = Files;
 			sourceTree = "<group>";
@@ -1054,6 +1059,7 @@
 				910393E81475B118004DE69D /* U1AutoUploadOperation.m in Sources */,
 				9623AE6214868F7000ACDF1C /* U1ReportingInputStream.m in Sources */,
 				96D1A8E0148DB9F800B210E7 /* U1TransparentToolbar.m in Sources */,
+				9172C870148FA4F600FC7737 /* U1TopPinningLabel.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

=== modified file 'Files/Files-Info.plist'
--- Files/Files-Info.plist	2011-12-05 19:53:10 +0000
+++ Files/Files-Info.plist	2011-12-08 14:24:32 +0000
@@ -41,11 +41,13 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>23</string>
+	<string>24</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSMainNibFile</key>
 	<string>MainWindow_iPhone</string>
+	<key>UIPrerenderedIcon</key>
+	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

=== modified file 'Files/U1AssetRepresenationDataProvider.m'
--- Files/U1AssetRepresenationDataProvider.m	2011-12-07 22:53:01 +0000
+++ Files/U1AssetRepresenationDataProvider.m	2011-12-08 14:24:32 +0000
@@ -46,14 +46,25 @@
 {
 	[library assetForURL:self.assetURL resultBlock:^(ALAsset *asset) {
 		
-		ALAssetRepresentation *representation = [asset defaultRepresentation];
-		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);
-		NSInputStream *dataStream = [NSInputStream inputStreamWithData:imageData];
-		if (block)
-			block(dataStream, mimeType, length, nil);
+		if (asset == nil)
+		{
+			if (block)
+			{
+				NSError *error = [NSError errorWithDomain:@"nonexistentAsset" code:1 userInfo:nil];
+				block(nil, nil, nil, error);
+			}
+		}
+		else
+		{
+			ALAssetRepresentation *representation = [asset defaultRepresentation];
+			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);
+			NSInputStream *dataStream = [NSInputStream inputStreamWithData:imageData];
+			if (block)
+				block(dataStream, mimeType, length, nil);
+		}
 		
 	} failureBlock:^(NSError *error) {
 		if (block)
@@ -61,13 +72,4 @@
 	}];
 }
 
-- (NSData *)serializeData;
-{
-//	Byte *buffer = (Byte*)malloc(self.representation.size);
-//	NSUInteger length = [self.representation getBytes:buffer fromOffset:0 length:self.representation.size error:nil];
-//	NSData *assetData = [NSData dataWithBytesNoCopy:buffer length:length freeWhenDone:YES];
-//	return assetData;
-	return nil;
-}
-
 @end

=== modified file 'Files/U1AutoUploadOperation.m'
--- Files/U1AutoUploadOperation.m	2011-12-07 22:53:01 +0000
+++ Files/U1AutoUploadOperation.m	2011-12-08 14:24:32 +0000
@@ -55,7 +55,14 @@
 	self.executing = YES;
 	[self didChangeValueForKey:@"isExecuting"];
 	
-	[self beginUpload];
+	if ([self isCancelled])
+	{
+		[self finishExecuting];
+	}
+	else
+	{
+		[self beginUpload];
+	}
 }
 
 - (void)dealloc

=== modified file 'Files/U1AutoUploadsManager.m'
--- Files/U1AutoUploadsManager.m	2011-12-07 22:53:01 +0000
+++ Files/U1AutoUploadsManager.m	2011-12-08 14:24:32 +0000
@@ -18,6 +18,7 @@
 
 #import "Reachability.h"
 
+#import "U1AccountManager.h"
 #import "U1Asset.h"
 #import "U1AssetRepresenationDataProvider.h"
 #import "U1AutoUploadOperation.h"
@@ -77,6 +78,7 @@
 	dataRepository = [U1DataRepository sharedDataRepository];
 	[defaultCenter addObserver:self selector:@selector(reachabilityChanged:) name:kReachabilityChangedNotification object:nil];
 	[defaultCenter addObserver:self selector:@selector(volumesFetched:) name:@"volumesFetched" object:nil];
+	[defaultCenter addObserver:self selector:@selector(didSignOut:) name:U1AccountManagerDidSignOut object:nil];
     return self;
 }
 
@@ -157,8 +159,16 @@
 		}
 		if (!found)
 		{
+			static BOOL creatingUploadVolume = NO;
+			
+			if (creatingUploadVolume)
+				return;
+			
+			creatingUploadVolume = YES;
+			
 			[self.filesClient createVolumeAtPath:[self remoteUploadFolderPath]
 								 completionBlock:^(U1Volume *volume, NSError *error) {
+									 creatingUploadVolume = NO;
 									 if (error == nil)
 									 {
 										 self.remoteUploadFolder = volume.rootFolder;
@@ -181,6 +191,11 @@
 	// We received a list of volumes. If our upload folder is not among them, prime it.
 }
 
+- (void)didSignOut:(NSNotification*)notification;
+{
+	[self.autoUploadPreparationQueue cancelAllOperations];
+}
+
 - (void)fetchRemoteUploadFolderContents;
 {
 	// fetch the remote upload folder contents, and stash the children objects somewhere locally.
@@ -348,54 +363,91 @@
 - (void)queuePreviousUploads;
 {
 	// We should poll our data repository for all U1Assets which have generation=nil. They *should* all have U1FileNodes associated with them. If the U1FileNode's parent equals our autoUploadsManager's remoteUploadFolder, then it's an auto-upload, and we let the LAM handle it. Otherwise, kick it off immediately to the FilesClient and get it back in the queue.
-		NSPredicate *p = [NSPredicate predicateWithFormat:@"generation = %@", nil];
-		NSError *error = nil;
-		NSSortDescriptor *sortBy = [NSSortDescriptor sortDescriptorWithKey:@"filename" ascending:YES];
-		NSArray *previouslyQueuedU1Assets = [self.dataRepository resultsForEntityClass:[U1Asset class]
-																	 matchingPredicate:p
-																   withSortDescriptors:[NSArray arrayWithObject:sortBy]
-																				 error:&error];
-		[previouslyQueuedU1Assets enumerateObjectsUsingBlock:^(U1Asset *u1asset, NSUInteger idx, BOOL *stop) {
-			if (u1asset.fileNode.parent == self.remoteUploadFolder)
-			{
-				[self.assetsLibrary assetForURL:[NSURL URLWithString:u1asset.url]
-									resultBlock:^(ALAsset *asset) {
+	NSPredicate *p = [NSPredicate predicateWithFormat:@"generation = %@", nil];
+	NSError *error = nil;
+	NSSortDescriptor *sortBy = [NSSortDescriptor sortDescriptorWithKey:@"filename" ascending:YES];
+	NSArray *previouslyQueuedU1Assets = [self.dataRepository resultsForEntityClass:[U1Asset class]
+																 matchingPredicate:p
+															   withSortDescriptors:[NSArray arrayWithObject:sortBy]
+																			 error:&error];
+	__block NSMutableArray *assetsDeletedFromLibrary = [NSMutableArray array];
+
+	[previouslyQueuedU1Assets enumerateObjectsUsingBlock:^(U1Asset *u1asset, NSUInteger idx, BOOL *stop) {
+		if (u1asset.fileNode.parent == self.remoteUploadFolder)
+		{
+			[self.assetsLibrary assetForURL:[NSURL URLWithString:u1asset.url]
+								resultBlock:^(ALAsset *asset) {
+									if (asset == nil)
+									{
+										NSLog(@"In the results block, but asset is nil!");
+										[assetsDeletedFromLibrary addObject:u1asset];
+									}
+									else
+									{
 										ALAssetRepresentation *rep = [asset defaultRepresentation];
 										// Belongs to LAM, could punt and let it get picked up by checkForNewAssets
 										NSOperation *op = [self queueAutoUploadForAsset:u1asset andRepresentation:rep];
 										if (op)
+										{
 											[self.autoUploadPreparationQueue addOperation:op];
-									} failureBlock:^(NSError *error) {
-										NSLog(@"Error: %@", error);
-										// TODO: delete asset
-									}];
-			}
-			else
+										}
+									}
+								} failureBlock:^(NSError *error) {
+									NSLog(@"Error: %@", error);
+									[assetsDeletedFromLibrary addObject:u1asset];
+								}];
+		}
+		else
+		{
+			NSURL *imageURL = [NSURL URLWithString:u1asset.url];
+			
+			[self.assetsLibrary assetForURL:imageURL
+								resultBlock:^(ALAsset *asset) {
+									if (asset == nil)
+									{
+										NSLog(@"In the results block, but asset is nil!");
+										[assetsDeletedFromLibrary addObject:u1asset];
+									}
+									else
+									{
+										ALAssetRepresentation *representation = [asset defaultRepresentation];
+										NSString *mimetype = (id)UTTypeCopyPreferredTagWithClass((CFStringRef)[representation UTI], kUTTagClassMIMEType);
+										
+										U1AssetRepresenationDataProvider *provider = [[U1AssetRepresenationDataProvider alloc] init];
+										provider.assetURL = imageURL;
+										
+										[self.filesClient uploadContentDataProvider:provider
+																		   toFolder:u1asset.fileNode.parent
+																   withResourceName:u1asset.filename
+																	withContentType:mimetype
+																	   withPriority:NSOperationQueuePriorityVeryHigh
+																	  progressBlock:^(long long bytesUploaded, long long totalBytes) {}
+																	completionBlock:^(U1FileNode *updatedNode, NSError *error) {
+																		u1asset.generation = updatedNode.generation;
+																	}];
+									}
+								} failureBlock:^(NSError *error) {
+									NSLog(@"Error: %@", error);
+									[assetsDeletedFromLibrary addObject:u1asset];
+								}];
+		}
+	}];
+	
+	// Iterate over the assetsDeletedFromLibrary, and clean them up.
+	[self.dataRepository dispatchAsyncBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+		for (int i = 0; i < [assetsDeletedFromLibrary count]; i++)
+		{
+			U1Asset *assetToBeDeleted = [assetsDeletedFromLibrary objectAtIndex:i];
+			U1FileNode *placeholderNode = assetToBeDeleted.fileNode;
+			[context deleteObject:assetToBeDeleted];
+			if (placeholderNode.generation == nil)
 			{
-				NSURL *imageURL = [NSURL URLWithString:u1asset.url];
-				
-				[self.assetsLibrary assetForURL:imageURL
-							   resultBlock:^(ALAsset *asset) {
-								   ALAssetRepresentation *representation = [asset defaultRepresentation];
-								   NSString *mimetype = (id)UTTypeCopyPreferredTagWithClass((CFStringRef)[representation UTI], kUTTagClassMIMEType);
-								   
-								   U1AssetRepresenationDataProvider *provider = [[U1AssetRepresenationDataProvider alloc] init];
-								   provider.assetURL = imageURL;
-								   
-								   [self.filesClient uploadContentDataProvider:provider
-																	  toFolder:u1asset.fileNode.parent
-															  withResourceName:u1asset.filename
-															   withContentType:mimetype
-																  withPriority:NSOperationQueuePriorityVeryHigh
-																 progressBlock:^(long long bytesUploaded, long long totalBytes) {}
-															   completionBlock:^(U1FileNode *updatedNode, NSError *error) {
-																   u1asset.generation = updatedNode.generation;
-															   }];
-							   } failureBlock:^(NSError *error) {
-								   NSLog(@"Error: %@", error);
-							   }];
+				[context deleteObject:placeholderNode];
 			}
-		}];
+			[self.dataRepository save:NULL];
+		}
+		[assetsDeletedFromLibrary release];
+	}];
 }
 
 - (NSString *)remoteUploadFolderPath;

=== modified file 'Files/U1FileDetailsViewController.h'
--- Files/U1FileDetailsViewController.h	2011-11-28 21:01:34 +0000
+++ Files/U1FileDetailsViewController.h	2011-12-08 14:24:32 +0000
@@ -21,6 +21,7 @@
 @interface U1FileDetailsViewController : UIViewController <UITextFieldDelegate, UITableViewDataSource, UITableViewDelegate>
 
 @property (nonatomic, retain, readonly) IBOutlet UIView *loadingContainerView;
+@property (nonatomic, retain, readonly) IBOutlet UIView *fileAncillaryDetailsView;
 @property (nonatomic, retain, readonly) IBOutlet UIImageView *iconImageView;
 @property (nonatomic, retain, readonly) IBOutlet UILabel *nameLabel;
 @property (nonatomic, retain, readonly) IBOutlet UIActivityIndicatorView *loadingActivityView;

=== modified file 'Files/U1FileDetailsViewController.m'
--- Files/U1FileDetailsViewController.m	2011-11-28 22:44:42 +0000
+++ Files/U1FileDetailsViewController.m	2011-12-08 14:24:32 +0000
@@ -57,7 +57,7 @@
 
 @implementation U1FileDetailsViewController
 
-@synthesize loadingContainerView, iconImageView, nameLabel, loadingActivityView, sizeLabel, createdLabel, modifiedLabel, toolbar, publicURLLabel, renameTextField, sectionOneCells, sectionTwoCells, actionsTableView, publishSwitch, publishStatusLabel;
+@synthesize loadingContainerView, fileAncillaryDetailsView, iconImageView, nameLabel, loadingActivityView, sizeLabel, createdLabel, modifiedLabel, toolbar, publicURLLabel, renameTextField, sectionOneCells, sectionTwoCells, actionsTableView, publishSwitch, publishStatusLabel;
 @synthesize node, docController, filesClient, contentURL, fileInfo;
 
 NSDateFormatter *modificationDateFormatter(void)
@@ -111,6 +111,7 @@
 - (void)dealloc;
 {
 	[loadingContainerView release];
+	[fileAncillaryDetailsView release];
 	[iconImageView release];
 	[nameLabel release];
 	[loadingActivityView release];
@@ -160,6 +161,15 @@
 	[self.publishStatusLabel setText:[self.node publicURLString]];
 	self.fileInfo = [self.filesClient localInfoForNode:self.node];
 	[self.iconImageView setImage:[self.docController.icons lastObject]];
+	// Set the fileAncillaryDetailsView's frame's origin.Y to be self.nameLabel's frame's height + 1
+    CGSize expectedLabelSize = [self.title sizeWithFont:self.nameLabel.font 
+                                constrainedToSize:self.nameLabel.frame.size
+                                    lineBreakMode:UILineBreakModeWordWrap];
+	
+	[self.fileAncillaryDetailsView setFrame:CGRectMake(self.fileAncillaryDetailsView.frame.origin.x,
+								(self.nameLabel.frame.origin.y + expectedLabelSize.height + 1), 
+								self.fileAncillaryDetailsView.frame.size.width,
+								self.fileAncillaryDetailsView.frame.size.height)];
 }
 
 - (void)viewDidUnload;

=== modified file 'Files/U1FileDetailsViewController.xib'
--- Files/U1FileDetailsViewController.xib	2011-11-28 22:44:42 +0000
+++ Files/U1FileDetailsViewController.xib	2011-12-08 14:24:32 +0000
@@ -93,8 +93,8 @@
 												<int key="IBUIContentMode">7</int>
 												<bool key="IBUIUserInteractionEnabled">NO</bool>
 												<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-												<string key="IBUIText"/>
-												<object class="NSColor" key="IBUITextColor">
+												<string key="IBUIText">File.png</string>
+												<object class="NSColor" key="IBUITextColor" id="425813574">
 													<int key="NSColorSpace">3</int>
 													<bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes>
 												</object>
@@ -120,7 +120,7 @@
 												<string key="NSFrame">{{105, 20}, {195, 48}}</string>
 												<reference key="NSSuperview" ref="346642923"/>
 												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="591885325"/>
+												<reference key="NSNextKeyView" ref="12890828"/>
 												<bool key="IBUIOpaque">NO</bool>
 												<bool key="IBUIClipsSubviews">YES</bool>
 												<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -147,15 +147,128 @@
 													<int key="NSfFlags">16</int>
 												</object>
 											</object>
+											<object class="IBUIView" id="12890828">
+												<reference key="NSNextResponder" ref="346642923"/>
+												<int key="NSvFlags">292</int>
+												<array class="NSMutableArray" key="NSSubviews">
+													<object class="IBUILabel" id="723802363">
+														<reference key="NSNextResponder" ref="12890828"/>
+														<int key="NSvFlags">292</int>
+														<string key="NSFrame">{{40, 0}, {155, 20}}</string>
+														<reference key="NSSuperview" ref="12890828"/>
+														<reference key="NSWindow"/>
+														<reference key="NSNextKeyView" ref="759648964"/>
+														<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">192KB</string>
+														<reference key="IBUITextColor" ref="425813574"/>
+														<nil key="IBUIHighlightedColor"/>
+														<int key="IBUIBaselineAdjustment">1</int>
+														<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
+														<float key="IBUIMinimumFontSize">10</float>
+														<object class="IBUIFontDescription" key="IBUIFontDescription" id="769395091">
+															<string key="name">HelveticaNeue-Medium</string>
+															<string key="family">Helvetica Neue</string>
+															<int key="traits">0</int>
+															<double key="pointSize">14</double>
+														</object>
+														<object class="NSFont" key="IBUIFont" id="395422269">
+															<string key="NSName">HelveticaNeue-Medium</string>
+															<double key="NSSize">14</double>
+															<int key="NSfFlags">16</int>
+														</object>
+													</object>
+													<object class="IBUILabel" id="568016573">
+														<reference key="NSNextResponder" ref="12890828"/>
+														<int key="NSvFlags">292</int>
+														<string key="NSFrame">{{0, 1}, {32, 18}}</string>
+														<reference key="NSSuperview" ref="12890828"/>
+														<reference key="NSWindow"/>
+														<reference key="NSNextKeyView" ref="215006113"/>
+														<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">Size:</string>
+														<reference key="IBUITextColor" ref="425813574"/>
+														<nil key="IBUIHighlightedColor"/>
+														<int key="IBUIBaselineAdjustment">1</int>
+														<float key="IBUIMinimumFontSize">10</float>
+														<object class="IBUIFontDescription" key="IBUIFontDescription" id="420297569">
+															<string key="name">HelveticaNeue-Bold</string>
+															<string key="family">Helvetica Neue</string>
+															<int key="traits">2</int>
+															<double key="pointSize">14</double>
+														</object>
+														<object class="NSFont" key="IBUIFont" id="362501816">
+															<string key="NSName">HelveticaNeue-Bold</string>
+															<double key="NSSize">14</double>
+															<int key="NSfFlags">16</int>
+														</object>
+													</object>
+													<object class="IBUILabel" id="215006113">
+														<reference key="NSNextResponder" ref="12890828"/>
+														<int key="NSvFlags">292</int>
+														<string key="NSFrame">{{0, 21}, {63, 18}}</string>
+														<reference key="NSSuperview" ref="12890828"/>
+														<reference key="NSWindow"/>
+														<reference key="NSNextKeyView" ref="723802363"/>
+														<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">Modified:</string>
+														<reference key="IBUITextColor" ref="425813574"/>
+														<nil key="IBUIHighlightedColor"/>
+														<int key="IBUIBaselineAdjustment">1</int>
+														<float key="IBUIMinimumFontSize">10</float>
+														<reference key="IBUIFontDescription" ref="420297569"/>
+														<reference key="IBUIFont" ref="362501816"/>
+													</object>
+													<object class="IBUILabel" id="759648964">
+														<reference key="NSNextResponder" ref="12890828"/>
+														<int key="NSvFlags">292</int>
+														<string key="NSFrame">{{71, 21}, {124, 19}}</string>
+														<reference key="NSSuperview" ref="12890828"/>
+														<reference key="NSWindow"/>
+														<reference key="NSNextKeyView" ref="591885325"/>
+														<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">about 5 minutes ago</string>
+														<reference key="IBUITextColor" ref="425813574"/>
+														<nil key="IBUIHighlightedColor"/>
+														<int key="IBUIBaselineAdjustment">1</int>
+														<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
+														<float key="IBUIMinimumFontSize">10</float>
+														<reference key="IBUIFontDescription" ref="769395091"/>
+														<reference key="IBUIFont" ref="395422269"/>
+													</object>
+												</array>
+												<string key="NSFrame">{{105, 76}, {195, 59}}</string>
+												<reference key="NSSuperview" ref="346642923"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="568016573"/>
+												<object class="NSColor" key="IBUIBackgroundColor" id="436719790">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MCAwAA</bytes>
+												</object>
+												<bool key="IBUIOpaque">NO</bool>
+												<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+											</object>
 										</array>
 										<string key="NSFrameSize">{320, 104}</string>
 										<reference key="NSSuperview" ref="149170707"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="749932571"/>
-										<object class="NSColor" key="IBUIBackgroundColor" id="436719790">
-											<int key="NSColorSpace">3</int>
-											<bytes key="NSWhite">MCAwAA</bytes>
-										</object>
+										<reference key="IBUIBackgroundColor" ref="436719790"/>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 									</object>
 								</array>
@@ -640,6 +753,30 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">fileAncillaryDetailsView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="12890828"/>
+					</object>
+					<int key="connectionID">102</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">sizeLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="723802363"/>
+					</object>
+					<int key="connectionID">104</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">modifiedLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="759648964"/>
+					</object>
+					<int key="connectionID">106</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">delegate</string>
 						<reference key="source" ref="1038751454"/>
 						<reference key="destination" ref="372490531"/>
@@ -761,6 +898,7 @@
 							<reference ref="675538218"/>
 							<reference ref="749932571"/>
 							<reference ref="1038751454"/>
+							<reference ref="12890828"/>
 						</array>
 						<reference key="parent" ref="149170707"/>
 					</object>
@@ -863,6 +1001,39 @@
 						<reference key="object" ref="827181736"/>
 						<reference key="parent" ref="502759082"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">97</int>
+						<reference key="object" ref="12890828"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="723802363"/>
+							<reference ref="759648964"/>
+							<reference ref="215006113"/>
+							<reference ref="568016573"/>
+						</array>
+						<reference key="parent" ref="346642923"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">91</int>
+						<reference key="object" ref="723802363"/>
+						<reference key="parent" ref="12890828"/>
+						<string key="objectName">Size Label</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">93</int>
+						<reference key="object" ref="759648964"/>
+						<reference key="parent" ref="12890828"/>
+						<string key="objectName">Last Modified Label</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">101</int>
+						<reference key="object" ref="215006113"/>
+						<reference key="parent" ref="12890828"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">98</int>
+						<reference key="object" ref="568016573"/>
+						<reference key="parent" ref="12890828"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -871,6 +1042,8 @@
 				<string key="-2.CustomClassName">UIResponder</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="101.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="17.CustomClassName">U1TopPinningLabel</string>
 				<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="32.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -893,12 +1066,16 @@
 				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="86.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="87.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="91.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="93.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="97.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="98.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">90</int>
+			<int key="maxID">106</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -908,6 +1085,7 @@
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="actionsTableView">UITableView</string>
 						<string key="createdLabel">UILabel</string>
+						<string key="fileAncillaryDetailsView">UIView</string>
 						<string key="iconImageView">UIImageView</string>
 						<string key="loadingActivityView">UIActivityIndicatorView</string>
 						<string key="loadingContainerView">UIView</string>
@@ -929,6 +1107,10 @@
 							<string key="name">createdLabel</string>
 							<string key="candidateClassName">UILabel</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="fileAncillaryDetailsView">
+							<string key="name">fileAncillaryDetailsView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="iconImageView">
 							<string key="name">iconImageView</string>
 							<string key="candidateClassName">UIImageView</string>
@@ -991,6 +1173,14 @@
 						<string key="minorKey">./Classes/U1FileDetailsViewController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">U1TopPinningLabel</string>
+					<string key="superclassName">UILabel</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/U1TopPinningLabel.h</string>
+					</object>
+				</object>
 			</array>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>

=== modified file 'Files/U1FilesClient.m'
--- Files/U1FilesClient.m	2011-12-07 22:53:01 +0000
+++ Files/U1FilesClient.m	2011-12-08 14:24:32 +0000
@@ -19,6 +19,7 @@
 
 #import "Reachability.h"
 
+#import "U1AccountManager.h"
 #import "U1DataRepository.h"
 #import "U1FilesService.h"
 #import "U1FileNode.h"
@@ -65,12 +66,14 @@
 	[self.uploadsQueue setMaxConcurrentOperationCount:1];
 	NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter];
 	[defaultCenter addObserver:self selector:@selector(reachabilityChanged:) name:kReachabilityChangedNotification object:nil];
+	[defaultCenter addObserver:self selector:@selector(didSignOut:) name:U1AccountManagerDidSignOut object:nil];
 	return self;
 }
 
 - (void)dealloc;
 {
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
+	[uploadsQueue cancelAllOperations];
 	[uploadsQueue release];
 	[super dealloc];
 }
@@ -95,6 +98,11 @@
 	}
 }
 
+- (void)didSignOut:(NSNotification*)notification;
+{
+	[self.uploadsQueue cancelAllOperations];
+}
+
 - (id)accountInfoWithCompletionBlock:(void(^)(NSDictionary *accountInfo, NSError *error))completionBlock;
 {
 	return [self.filesService accountInfoWithCompletionBlock:completionBlock];

=== modified file 'Files/U1FilesService.h'
--- Files/U1FilesService.h	2011-12-07 22:53:01 +0000
+++ Files/U1FilesService.h	2011-12-08 14:24:32 +0000
@@ -20,7 +20,6 @@
 
 @protocol U1UploadDataProvider <NSObject>
 - (void)prepareDataStreamWithBlock:(void(^)(NSInputStream *dataStream, NSString *mimeType, NSUInteger length, NSError *error))block;
-- (NSData *)serializeData;
 @end
 
 

=== modified file 'Files/U1FilesService.m'
--- Files/U1FilesService.m	2011-12-07 22:53:01 +0000
+++ Files/U1FilesService.m	2011-12-08 14:24:32 +0000
@@ -363,6 +363,13 @@
 			id result = nil;
 			NSHTTPURLResponse *response = httpOperation.response;
 			NSError *error = httpOperation.error;
+			
+			if ([response statusCode] == 401)
+			{
+				[[U1AccountManager sharedAccountManager] removeCredentials];
+				return;
+			}
+			
 			if (!error &&
 				![[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(200, 100)] containsIndex:[response statusCode]])
 			{

=== modified file 'Files/U1FolderNode.h'
--- Files/U1FolderNode.h	2011-09-08 16:59:34 +0000
+++ Files/U1FolderNode.h	2011-12-08 14:24:32 +0000
@@ -19,5 +19,5 @@
 
 
 @interface U1FolderNode : _U1FolderNode
-
+@property (nonatomic, readonly) NSNumber *size;
 @end

=== modified file 'Files/U1FolderNode.m'
--- Files/U1FolderNode.m	2011-10-26 03:39:52 +0000
+++ Files/U1FolderNode.m	2011-12-08 14:24:32 +0000
@@ -29,4 +29,9 @@
 	return YES;
 }
 
+- (NSNumber*)size;
+{
+	return 0;
+}
+
 @end

=== modified file 'Files/U1FolderViewController.h'
--- Files/U1FolderViewController.h	2011-09-08 16:59:34 +0000
+++ Files/U1FolderViewController.h	2011-12-08 14:24:32 +0000
@@ -25,7 +25,6 @@
 @interface U1FolderViewController : PullRefreshTableViewController
 
 @property (nonatomic, retain, readonly) IBOutlet UITableViewCell *loadingCell;
-
 @property (assign) id<U1FolderViewControllerDelegate> delegate;
 @property (retain) U1FilesClient *filesClient;
 

=== modified file 'Files/U1FolderViewController.m'
--- Files/U1FolderViewController.m	2011-12-07 22:53:01 +0000
+++ Files/U1FolderViewController.m	2011-12-08 14:24:32 +0000
@@ -384,6 +384,28 @@
 	[self loadInfoForNode];
 }
 
+- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section;
+{
+	UILabel *footerLabel = [[[UILabel alloc] initWithFrame:CGRectMake(0, 0, 320, 22)] autorelease];
+	footerLabel.backgroundColor = [[UIColor lightGrayColor] colorWithAlphaComponent:0.85f];
+	[footerLabel setFont:[UIFont systemFontOfSize:14.f]];
+	[footerLabel setShadowColor:[UIColor whiteColor]];
+	[footerLabel setShadowOffset:CGSizeMake(0, 1)];
+	[footerLabel setTextAlignment:UITextAlignmentCenter];
+
+	int numItems = [[[self.resultsController sections] objectAtIndex:0] numberOfObjects];
+	NSNumber *folderRawSize = [[self.resultsController fetchedObjects] valueForKeyPath:@"@sum.size"];
+	NSString *folderSize = [self.byteSizeTransformer transformedValue:folderRawSize];
+	
+	[footerLabel setText:[NSString stringWithFormat:@"%d items, %@", numItems, folderSize]];
+
+	return footerLabel;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section;
+{
+	return 22.0f;
+}
 
 #pragma mark Private Methods
 
@@ -400,7 +422,7 @@
 			[self.resultsController setDelegate:self];
 			[self.tableView reloadData];
 		}
-		
+
 		if (resultsDataSourceType == U1DataSourceRemote)
 			[self stopLoading];
 		

=== modified file 'Files/U1FolderViewController.xib'
--- Files/U1FolderViewController.xib	2011-08-31 14:56:30 +0000
+++ Files/U1FolderViewController.xib	2011-12-08 14:24:32 +0000
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
 	<data>
-		<int key="IBDocument.SystemTarget">1056</int>
+		<int key="IBDocument.SystemTarget">1280</int>
 		<string key="IBDocument.SystemVersion">10K549</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1306</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">301</string>
+			<string key="NS.object.0">933</string>
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -23,11 +23,8 @@
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys" id="0">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<reference key="dict.values" ref="0"/>
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -45,7 +42,6 @@
 				<string key="NSFrameSize">{320, 460}</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>
@@ -61,7 +57,7 @@
 				<float key="IBUISectionFooterHeight">22</float>
 			</object>
 			<object class="IBUITableViewCell" id="864788526">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -75,18 +71,12 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{136, 17}, {75, 21}}</string>
 								<reference key="NSSuperview" ref="834389907"/>
-								<reference key="NSWindow"/>
 								<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">Loading...</string>
-								<object class="NSFont" key="IBUIFont">
-									<string key="NSName">Helvetica</string>
-									<double key="NSSize">17</double>
-									<int key="NSfFlags">16</int>
-								</object>
 								<object class="NSColor" key="IBUITextColor">
 									<int key="NSColorSpace">1</int>
 									<bytes key="NSRGB">MCAwIDAAA</bytes>
@@ -94,13 +84,23 @@
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">1</int>
 								<float key="IBUIMinimumFontSize">10</float>
+								<object class="IBUIFontDescription" key="IBUIFontDescription">
+									<string key="name">Helvetica</string>
+									<string key="family">Helvetica</string>
+									<int key="traits">0</int>
+									<double key="pointSize">17</double>
+								</object>
+								<object class="NSFont" key="IBUIFont">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">17</double>
+									<int key="NSfFlags">16</int>
+								</object>
 							</object>
 							<object class="IBUIActivityIndicatorView" id="42067442">
 								<reference key="NSNextResponder" ref="834389907"/>
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{108, 18}, {20, 20}}</string>
 								<reference key="NSSuperview" ref="834389907"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="317026358"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -109,9 +109,8 @@
 								<int key="IBUIStyle">2</int>
 							</object>
 						</object>
-						<string key="NSFrameSize">{320, 54}</string>
+						<string key="NSFrameSize">{320, 53}</string>
 						<reference key="NSSuperview" ref="864788526"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="42067442"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
@@ -125,15 +124,12 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{320, 54}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="834389907"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
 					<bytes key="NSRGB">MSAxIDEAA</bytes>
 				</object>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-				<int key="IBUISeparatorStyle">1</int>
 				<reference key="IBUIContentView" ref="834389907"/>
 			</object>
 		</object>
@@ -162,7 +158,9 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="IBObjectRecord">
 						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
+						<object class="NSArray" key="object" id="0">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
 						<reference key="children" ref="1000"/>
 						<nil key="parent"/>
 					</object>
@@ -242,7 +240,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">13</int>
+			<int key="maxID">17</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -284,6 +282,6 @@
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">301</string>
+		<string key="IBCocoaTouchPluginVersion">933</string>
 	</data>
 </archive>

=== modified file 'Files/U1LoginController.m'
--- Files/U1LoginController.m	2011-08-31 14:56:30 +0000
+++ Files/U1LoginController.m	2011-12-08 14:24:32 +0000
@@ -80,9 +80,10 @@
 	[self.loginViewController.view setUserInteractionEnabled:NO];
 	
 	// 1. get/create U1 oauth token
+	NSString *tokenName = [NSString stringWithFormat:@"Ubuntu One @ %@", [[UIDevice currentDevice] name]];
 	NSDictionary *params = [NSDictionary dictionaryWithObjectsAndKeys:
 							@"authenticate", @"ws.op",
-							@"Ubuntu One @ iOS", @"token_name",
+							tokenName, @"token_name",
 							nil];
 	NSString * paramsString = UOSSOEncodedStringFromParametersDictionary(params);
 	

=== added file 'Files/U1TopPinningLabel.h'
--- Files/U1TopPinningLabel.h	1970-01-01 00:00:00 +0000
+++ Files/U1TopPinningLabel.h	2011-12-08 14:24:32 +0000
@@ -0,0 +1,20 @@
+//
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  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 <UIKit/UIKit.h>
+
+@interface U1TopPinningLabel : UILabel
+
+@end

=== added file 'Files/U1TopPinningLabel.m'
--- Files/U1TopPinningLabel.m	1970-01-01 00:00:00 +0000
+++ Files/U1TopPinningLabel.m	2011-12-08 14:24:32 +0000
@@ -0,0 +1,30 @@
+//
+//  Copyright 2011 Canonical Ltd.
+//	
+//  This program is free software: you can redistribute it and/or modify it
+//  under the terms of the GNU Affero General Public License version 3,
+//  as published by the Free Software Foundation.
+//	
+//  This program is distributed in the hope that it will be useful, but
+//  WITHOUT ANY WARRANTY; without even the implied warranties of
+//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the GNU Affero General Public License for more details.
+//
+//  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 "U1TopPinningLabel.h"
+
+@implementation U1TopPinningLabel
+
+- (CGRect)textRectForBounds:(CGRect)bounds limitedToNumberOfLines:(NSInteger)numberOfLines {
+	CGRect textRect = [super textRectForBounds:bounds limitedToNumberOfLines:numberOfLines];
+	textRect.origin.y = bounds.origin.y;
+	return textRect;
+}
+
+-(void)drawTextInRect:(CGRect)requestedRect {
+	CGRect actualRect = [self textRectForBounds:requestedRect limitedToNumberOfLines:self.numberOfLines];
+	[super drawTextInRect:actualRect];
+}
+@end

=== modified file 'Files/U1UploadOperation.m'
--- Files/U1UploadOperation.m	2011-12-07 22:53:01 +0000
+++ Files/U1UploadOperation.m	2011-12-08 14:24:32 +0000
@@ -71,6 +71,12 @@
 
 - (void)beginUpload;
 {
+	if ([self isCancelled])
+	{
+		[self finishExecuting];
+		return;
+	}
+	
 	dispatch_async(dispatch_get_main_queue(), ^(void) {
 
 		[self.fileInfo setUploadPercentage:0.0];
@@ -99,7 +105,26 @@
 			if (filesServiceError != nil)
 			{
 				self.error = filesServiceError;
-				[self beginUpload];
+				if ([filesServiceError.domain isEqualToString:@"nonexistentAsset"])
+				{
+					// Asset is gone, delete U1Asset and potentially the Node, and stop running
+					U1DataRepository *dataRepository = [U1DataRepository sharedDataRepository];
+					[dataRepository dispatchAsyncBlockWithManagedObjectContext:^(NSManagedObjectContext *context) {
+						U1Asset *assetToBeDeleted = self.fileNode.asset;
+						[context deleteObject:assetToBeDeleted];
+						if (self.fileNode.generation == nil)
+						{
+							[context deleteObject:self.fileNode];
+						}
+						[dataRepository save:NULL];
+					}];
+					[self finishExecuting];
+				}
+				else
+				{
+					// File upload timed out or something else, so reschedule
+					[self beginUpload];
+				}
 			}
 			else
 			{