Merge lp:~threeve/ubuntuone-ios-files/logout-cleanup into lp:ubuntuone-ios-files

[Jason Foreman]

Cancel pending uploads when signing out.

[Zachery Bir (urbanape)]

woot.

review: Approve

=== modified file 'Files/U1AutoUploadOperation.m'
--- Files/U1AutoUploadOperation.m	2011-12-05 22:53:05 +0000
+++ Files/U1AutoUploadOperation.m	2011-12-06 21:28:48 +0000
@@ -51,7 +51,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-06 19:44:22 +0000
+++ Files/U1AutoUploadsManager.m	2011-12-06 21:28:48 +0000
@@ -18,6 +18,7 @@
 
 #import "Reachability.h"
 
+#import "U1AccountManager.h"
 #import "U1Asset.h"
 #import "U1AssetRepresenationDataProvider.h"
 #import "U1AutoUploadOperation.h"
@@ -75,6 +76,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;
 }
 
@@ -176,6 +178,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.
 
=== modified file 'Files/U1FilesClient.m'
--- Files/U1FilesClient.m	2011-12-03 02:58:25 +0000
+++ Files/U1FilesClient.m	2011-12-06 21:28:48 +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/U1UploadOperation.m'
--- Files/U1UploadOperation.m	2011-12-05 19:51:30 +0000
+++ Files/U1UploadOperation.m	2011-12-06 21:28:48 +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];