Merge lp:~rockstar/ubuntuone-ios-music/error-handling into lp:ubuntuone-ios-music

[Paul Hummer]

Add error handling to UbuntuOne SSO

Use the error handling in the new branch for UbuntuOneAuthKit

[Zachery Bir (urbanape)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The prerequisite https://code.launchpad.net/~rockstar/ubuntuone-ios-music/sort-sso has not yet been merged into https://code.launchpad.net/~ubuntuone-ios-client-team/ubuntuone-ios-music/trunk.

=== modified file 'view_controllers/UOMusicLoginController.m'
--- view_controllers/UOMusicLoginController.m	2012-09-19 16:23:20 +0000
+++ view_controllers/UOMusicLoginController.m	2012-09-19 16:23:21 +0000
@@ -53,26 +53,39 @@
     [self.loginViewController.view setUserInteractionEnabled:NO];
     
     UOAuthManager *authManager = [UOAuthManager sharedAuthManager];
-    [authManager loginWithUsername:username andPassword:password completionBlock:^(){
-        [authManager fetchSubsonicCredentials:^(NSString *username) {
+    id completionBlock = ^(){
+        id subsonicCompletionBlock = ^(NSString *username) {
             [self.delegate loginControllerDidLoginWithUsername:username];
-        }];
-    }];
-}
-
-- (void)handleError:(NSError*)error;
-{
-	NSString *errorMessage = [error localizedDescription];
-	if ([error code] == 401)
-		errorMessage = NSLocalizedString(@"Incorrect username or password.", nil);
-	else if (errorMessage == nil)
-		errorMessage = NSLocalizedString(@"An error occured trying to sign in, please try again.", @"Login Error Message");
-
-	UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Ubuntu One", nil) message:errorMessage delegate:self cancelButtonTitle:@"Dismiss" otherButtonTitles:nil];
-	[alert show];
-	[self.loginViewController.view setUserInteractionEnabled:YES];
-	UOSSOCredentialsViewController *loginController = (id)[(UINavigationController*)[self loginViewController] topViewController];
-	[loginController reset];
+        };
+        id subsonicErrorBlock = ^(NSError *error) {
+            UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Ubuntu One", nil) message:[error localizedDescription] delegate:self cancelButtonTitle:@"Dismiss" otherButtonTitles:nil];
+            [alert show];
+            [self.loginViewController.view setUserInteractionEnabled:YES];
+            UOSSOCredentialsViewController *loginController = (id)[(UINavigationController*)[self loginViewController] topViewController];
+            [loginController reset];
+        };
+        [authManager fetchSubsonicCredentials:subsonicCompletionBlock errorBlock:subsonicErrorBlock];
+    };
+    id errorBlock = ^(NSError *error) {
+        NSString *errorMessage = nil;[error localizedDescription];
+        switch (error.code) {
+            case 401:
+                errorMessage = NSLocalizedString(@"Incorrect username or password.", nil);
+                break;
+            default:
+                errorMessage = [error localizedDescription];
+                if (errorMessage == nil) {
+                    errorMessage = NSLocalizedString(@"An error occured trying to sign in, please try again.", @"Login Error Message");
+                }
+                break;
+        }
+        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Ubuntu One", nil) message:errorMessage delegate:self cancelButtonTitle:@"Dismiss" otherButtonTitles:nil];
+        [alert show];
+        [self.loginViewController.view setUserInteractionEnabled:YES];
+        UOSSOCredentialsViewController *loginController = (id)[(UINavigationController*)[self loginViewController] topViewController];
+        [loginController reset];
+    };
+    [authManager loginWithUsername:username andPassword:password completionBlock:completionBlock errorBlock:errorBlock];
 }
 
 @end