Fixes an inconsistency in the way blog passwords were stored that might cause problems with .com blogs with custom domains.

Fixes an issue where an xmlrpc error due to bad credentials would prompt the user to update their password, but the password would not propigate to the .com api until the app was restarted.
Removes the old UIAlertView used for updating credentials, replacing it with the EditSiteViewController for a standardized look and feel. 
Exposes a promptForPassword method to WPTableViewController subclasses. Would be nice to keep this hidden.

Author: aerych

WordPress/Classes/Blog.m

@@ -114,11 +114,19 @@ + (Blog *)createFromDictionary:(NSDictionary *)blogInfo withContext:(NSManagedOb
         blog.isAdmin = [NSNumber numberWithInt:[[blogInfo objectForKey:@"isAdmin"] intValue]];
 
         NSError *error = nil;
-        [SFHFKeychainUtils storeUsername:[blogInfo objectForKey:@"username"]
-                             andPassword:[blogInfo objectForKey:@"password"]
-                          forServiceName:blog.hostURL
-                          updateExisting:TRUE
-                                   error:&error ];
+		if(blog.isWPcom) {
+			[SFHFKeychainUtils storeUsername:[blogInfo objectForKey:@"username"]
+								 andPassword:[blogInfo objectForKey:@"password"]
+							  forServiceName:@"WordPress.com"
+							  updateExisting:TRUE
+									   error:&error ];
+		} else {
+			[SFHFKeychainUtils storeUsername:[blogInfo objectForKey:@"username"]
+								 andPassword:[blogInfo objectForKey:@"password"]
+							  forServiceName:blog.hostURL
+							  updateExisting:TRUE
+									   error:&error ];
+		}
         // TODO: save blog settings
 	}
     return blog;

WordPress/Classes/EditSiteViewController.m

@@ -65,14 +65,9 @@ - (void)viewDidLoad {
 		}
         self.view.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"welcome_bg_pattern.png"]];
 
-        NSError *error = nil;
         self.url = blog.url;
         self.username = blog.username;
-        if ([blog isWPcom]) {
-            self.password = [SFHFKeychainUtils getPasswordForUsername:blog.username andServiceName:@"WordPress.com" error:&error];
-        } else {
-            self.password = [SFHFKeychainUtils getPasswordForUsername:blog.username andServiceName:blog.hostURL error:&error];            
-        }
+		self.password = [blog fetchPassword];
 
         self.startingUser = self.username;
         self.startingPwd = self.password;

WordPress/Classes/PostSettingsViewController.m

@@ -228,10 +228,9 @@ - (void)loadFeaturedImage:(NSURL *)imageURL {
             if (!triedAuthOnce) {
                 triedAuthOnce = YES;
 
-                NSError *error = nil;
                 Blog *blog = self.apost.blog;
                 NSString *username = blog.username;
-                NSString *password = [SFHFKeychainUtils getPasswordForUsername:blog.username andServiceName:blog.hostURL error:&error];
+                NSString *password = [blog fetchPassword];
 
                 NSMutableURLRequest *mRequest = [[NSMutableURLRequest alloc] init];
                 NSString *requestBody = [NSString stringWithFormat:@"log=%@&pwd=%@&redirect_to=",

WordPress/Classes/PostsViewController.m

@@ -16,6 +16,7 @@ - (void)editPost:(AbstractPost *)apost;
 - (void)showSelectedPost;
 - (void)checkLastSyncDate;
 - (void)syncFinished;
+- (void)handleInvalidCredentialsNotification:(NSNotification *)notification;
 
 @end
 
@@ -230,7 +231,11 @@ - (void)deletePostAtIndexPath:(NSIndexPath *)indexPath{
     Post *post = [self.resultsController objectAtIndexPath:indexPath];
     [post deletePostWithSuccess:nil failure:^(NSError *error) {
         NSDictionary *errInfo = [NSDictionary dictionaryWithObjectsAndKeys:self.blog, @"currentBlog", nil];
-        [[NSNotificationCenter defaultCenter] postNotificationName:kXML_RPC_ERROR_OCCURS object:error userInfo:errInfo];
+		if([error code] == 403) {
+			[self promptForPassword];
+		} else {
+			[[NSNotificationCenter defaultCenter] postNotificationName:kXML_RPC_ERROR_OCCURS object:error userInfo:errInfo];
+		}
         [self syncItemsWithUserInteraction:NO];
         if(IS_IPAD && self.postReaderViewController) {
             if(self.postReaderViewController.apost == post) {

WordPress/Classes/WPAddCategoryViewController.m

@@ -1,7 +1,6 @@
 #import "WPAddCategoryViewController.h"
-#import "PostSettingsViewController.h"
+#import "EditSiteViewController.h"
 #import "WordPressAppDelegate.h"
-#import "Reachability.h"
 #import "UIBarButtonItem+Styled.h"
 
 @implementation WPAddCategoryViewController
@@ -139,10 +138,27 @@ - (IBAction)saveAddCategory:(id)sender {
         [self removeProgressIndicator];
         [self dismiss];
     } failure:^(NSError *error) {
-        NSDictionary *errInfo = [NSDictionary dictionaryWithObjectsAndKeys:self.blog, @"currentBlog", nil];
-		[[NSNotificationCenter defaultCenter] postNotificationName:kXML_RPC_ERROR_OCCURS object:error userInfo:errInfo];
 		[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
 		[self removeProgressIndicator];
+		
+		if ([error code] == 403) {
+
+			UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Couldn't Connect", @"")
+																message:NSLocalizedString(@"The username or password stored in the app may be out of date. Please re-enter your password in the settings and try again.", @"")
+															   delegate:nil
+													  cancelButtonTitle:nil
+													  otherButtonTitles:NSLocalizedString(@"OK", @""), nil];
+			[alertView show];
+			
+			// bad login/pass combination
+			EditSiteViewController *editSiteViewController = [[EditSiteViewController alloc] initWithNibName:nil bundle:nil];
+			editSiteViewController.blog = self.blog;
+			[self.navigationController pushViewController:editSiteViewController animated:YES];
+			
+		} else {
+			NSDictionary *errInfo = [NSDictionary dictionaryWithObjectsAndKeys:self.blog, @"currentBlog", nil];
+			[[NSNotificationCenter defaultCenter] postNotificationName:kXML_RPC_ERROR_OCCURS object:error userInfo:errInfo];
+		}
     }];
 }
 

WordPress/Classes/WPTableViewController.h

@@ -9,8 +9,10 @@
 #import "Blog.h"
 #import "SettingsViewControllerDelegate.h"
 
-@interface WPTableViewController : UITableViewController <NSFetchedResultsControllerDelegate, UIAlertViewDelegate,SettingsViewControllerDelegate>
+@interface WPTableViewController : UITableViewController <NSFetchedResultsControllerDelegate, UIAlertViewDelegate, SettingsViewControllerDelegate>
 
 @property (nonatomic, strong) Blog *blog;
 
+- (void)promptForPassword;
+
 @end

WordPress/Classes/WPTableViewController.m

@@ -631,27 +631,7 @@ - (void)syncItemsWithUserInteraction:(BOOL)userInteraction {
                 [alertView show];
 
             } else if (error.code == 403 && editSiteViewController == nil) {
-                UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Couldn't Connect", @"")
-                                                                    message:NSLocalizedString(@"The username or password stored in the app may be out of date. Please re-enter your password in the settings and try again.", @"")
-                                                                   delegate:nil
-                                                          cancelButtonTitle:nil
-                                                          otherButtonTitles:NSLocalizedString(@"OK", @""), nil];
-                [alertView show];
-
-                // bad login/pass combination
-                editSiteViewController = [[EditSiteViewController alloc] initWithNibName:nil bundle:nil];
-                editSiteViewController.blog = self.blog;
-                editSiteViewController.isCancellable = YES;
-                editSiteViewController.delegate = self;
-                UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:editSiteViewController];
-
-                if(IS_IPAD == YES) {
-                    navController.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
-                    navController.modalPresentationStyle = UIModalPresentationFormSheet;
-                }
-
-                [self.panelNavigationController presentModalViewController:navController animated:YES];
-
+				[self promptForPassword];
             } else if (userInteraction) {
                 [WPError showAlertWithError:error title:NSLocalizedString(@"Couldn't sync", @"")];
             }
@@ -662,6 +642,29 @@ - (void)syncItemsWithUserInteraction:(BOOL)userInteraction {
     }];
 }
 
+- (void)promptForPassword {
+	UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Couldn't Connect", @"")
+														message:NSLocalizedString(@"The username or password stored in the app may be out of date. Please re-enter your password in the settings and try again.", @"")
+													   delegate:nil
+											  cancelButtonTitle:nil
+											  otherButtonTitles:NSLocalizedString(@"OK", @""), nil];
+	[alertView show];
+	
+	// bad login/pass combination
+	editSiteViewController = [[EditSiteViewController alloc] initWithNibName:nil bundle:nil];
+	editSiteViewController.blog = self.blog;
+	editSiteViewController.isCancellable = YES;
+	editSiteViewController.delegate = self;
+	UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:editSiteViewController];
+	
+	if(IS_IPAD == YES) {
+		navController.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
+		navController.modalPresentationStyle = UIModalPresentationFormSheet;
+	}
+	
+	[self.panelNavigationController presentModalViewController:navController animated:YES];
+}
+
 #pragma mark - Swipe gestures
 
 - (void)enableSwipeGestureRecognizer {

WordPress/Classes/WordPressAppDelegate.m

@@ -28,7 +28,6 @@ @interface WordPressAppDelegate (Private)
 - (void)setAppBadge;
 - (void)checkIfStatsShouldRun;
 - (void)runStats;
-- (void)showPasswordAlert;
 - (void)cleanUnusedMediaFileFromTmpDir;
 - (void)customizeAppearance;
 - (void)toggleExtraDebuggingIfNeeded;
@@ -427,19 +426,6 @@ - (void)showNotificationErrorAlert:(NSNotification *)notification {
 		if ([[err domain] isEqualToString:@"org.wordpress.iphone"]){
 			if([err code] == 401)
 				cleanedErrorMsg = NSLocalizedString(@"Sorry, you cannot access this feature. Please check your User Role on this blog.", @"");
-			else if([err code] == 403) { //403 = bad username/password
-				NSDictionary *errInfo = [notification userInfo];
-				//check if the user has NOT changed the blog during the loading
-				if( (errInfo != nil) && ([errInfo objectForKey:@"currentBlog"] != nil ) 
-				   && currentBlog == [errInfo objectForKey:@"currentBlog"] ) {
-                    passwordAlertRunning = YES;
-					[self performSelectorOnMainThread:@selector(showPasswordAlert) withObject:nil waitUntilDone:NO];
-				} else {
-					//do not show the alert
-					[self setAlertRunning:NO];
-				}
-				return;
-			}
 		}
 
         // ignore HTTP auth canceled errors
@@ -457,54 +443,6 @@ - (void)showNotificationErrorAlert:(NSNotification *)notification {
 	[self showAlertWithTitle:NSLocalizedString(@"Error", @"Generic popup title for any type of error.") message:cleanedErrorMsg];
 }
 
-
-- (void)showPasswordAlert {
-
-	UILabel *labelPasswd;
-	
-	NSString *lineBreaks;
-	
-	if (IS_IPAD)
-		lineBreaks = @"\n\n\n\n";
-	else 
-		lineBreaks = @"\n\n\n";
-	
-	UIAlertView *customSizeAlert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Incorrect Password", @"If the password was lost, a popup asks the author to update their password, this is the popup's title.") 
-															  message:lineBreaks // IMPORTANT
-															 delegate:self 
-													cancelButtonTitle:NSLocalizedString(@"Cancel", @"Cancel button label.") 
-													otherButtonTitles:NSLocalizedString(@"Save", @"Save button label (saving content, ex: Post, Page, Comment)."), nil];
-	
-	customSizeAlert.tag = 101;
-	
-	labelPasswd = [[UILabel alloc] initWithFrame:CGRectMake(12.0, 48.0, 260.0, 29.0)];
-	labelPasswd.backgroundColor = [UIColor clearColor];
-	labelPasswd.textColor = [UIColor whiteColor];
-	labelPasswd.text = NSLocalizedString(@"Please update your password:", @"If the password was lost, a popup asks the author to update their password, this is the popup's description.");
-	[customSizeAlert addSubview:labelPasswd];
-	
-	passwordTextField = [[UITextField alloc]  initWithFrame:CGRectMake(12.0, 82.0, 260.0, 29.0)]; 
-	[passwordTextField setBackgroundColor:[UIColor whiteColor]];
-	[passwordTextField setContentVerticalAlignment: UIControlContentVerticalAlignmentCenter];
-	passwordTextField.keyboardType = UIKeyboardTypeDefault;
-	passwordTextField.secureTextEntry = YES;
-	
-	[passwordTextField setTag:123];
-	
-	[customSizeAlert addSubview:passwordTextField];
-	
-	//fix the dialog position for older devices on iOS 3
-	float version = [[[UIDevice currentDevice] systemVersion] floatValue];
-	if (version <= 3.1)
-	{
-		customSizeAlert.transform = CGAffineTransformTranslate(customSizeAlert.transform, 0.0, 100.0);
-	}
-	
-	[customSizeAlert show];
-	
-	[passwordTextField becomeFirstResponder]; //this line should always be called on MainThread
-}
-
 - (void)showContentDetailViewController:(UIViewController *)viewController {
     if (viewController) {
         [panelNavigationController pushViewController:viewController animated:YES];
@@ -1233,36 +1171,7 @@ - (void) handleAuthenticationCancelForChallenge: (NSURLAuthenticationChallenge *
 - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex { 
 	[self setAlertRunning:NO];
 
-	if (alertView.tag == 101) { //Password Alert
-        passwordAlertRunning = NO;
-		if(currentBlog != nil) {
-			NSError *error = nil;
-			
-			if ([passwordTextField.text isEqualToString:@""]) 
-				return;
-			
-			//check if the current blog is a WP.COM blog
-			if(currentBlog.isWPcom) {
-				[SFHFKeychainUtils storeUsername:currentBlog.username
-									 andPassword:passwordTextField.text
-								  forServiceName:@"WordPress.com"
-								  updateExisting:YES
-										   error:&error];
-			} else {
-				[SFHFKeychainUtils storeUsername:currentBlog.username
-									 andPassword:passwordTextField.text
-								  forServiceName:currentBlog.hostURL
-								  updateExisting:YES
-										   error:&error];
-			}
-			
-			if (error) {
-				[FileLogger log:@"%@ %@ Error saving password for %@: %@", self, NSStringFromSelector(_cmd), currentBlog.url, error];
-			} else {
-				[FileLogger log:@"%@ %@ %@", self, NSStringFromSelector(_cmd), currentBlog.url];
-			}
-		}
-    } else if (alertView.tag == 102) { // Update alert
+    if (alertView.tag == 102) { // Update alert
         if (buttonIndex == 1) {
             [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"http://itunes.apple.com/us/app/wordpress/id335703880?mt=8&ls=1"]];
         }