Changeset 639

Timestamp:

01/12/10 12:51:19 (2 months ago)

Author:

henri

Message:

Better error handling in account management and login

Location:

apps/iphone/my.tel/trunk

Files:

• Classes/AccountEditController.m (modified) (3 diffs)
• Classes/MyTelConnect.m (modified) (1 diff)
• Classes/RootViewController.h (modified) (1 diff)
• Classes/RootViewController.m (modified) (10 diffs)
• VIP.tel.xcodeproj/project.pbxproj (modified) (1 diff)

apps/iphone/my.tel/trunk/Classes/AccountEditController.m

@@ -231 +231 @@
 #pragma mark UITextFieldDelegate methods
 
+- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range
+replacementString:(NSString *)string {
+        // Always reset the api root url if the domain name changes
+        if (textField == cellDomainName.textField) {
+                self.apiRootUrl = @"";
+                [cellApiRootUrl setNeedsDisplay];
+        }
+        return YES;
+}
+
 - (void)textFieldDidEndEditing:(UITextField *)textField {
         // Clean data entry as necessary
@@ -237 +247 @@
                         self.domainName = [self.domainName stringByAppendingString:@".tel"];
                 }
-                if ([self.accountLabel length] == 0) {
+                if ((self.accountLabel == nil) || ([self.accountLabel length] == 0)) {
                         self.accountLabel = self.domainName;
                 }
@@ -260 +270 @@
         [self performSelector:@selector(self) withObject:nil afterDelay:0.1];
 
-        if ([self.accountLabel length] == 0) {
+        if ((self.accountLabel == nil) || ([self.accountLabel length] == 0)) {
                 self.accountLabel = self.domainName;
+        }
+        if (self.userName == nil) {
+                self.userName = @"";
+        }
+        if (self.password == nil) {
+                self.password = @"";
         }
         

apps/iphone/my.tel/trunk/Classes/MyTelConnect.m

@@ -39 +39 @@
                                                  delegate:(id)aDelegate
                                                  selector:(SEL)aSel {
+        
+        if ((aName == nil) || (aPassword == nil)) {
+                SBJSON *json = [[SBJSON new] autorelease];
+                NSError *jsonError;
+                NSDictionary *parsedJSON = [json objectWithString:@"{\"success\":false;\"actionMessages\":\"bad username or password\"}" error:&jsonError];
+                [aDelegate performSelector:aSel withObject:parsedJSON];
+                return;         
+        }
         
         NSDictionary *loginInfo = [NSDictionary dictionaryWithObjectsAndKeys:

apps/iphone/my.tel/trunk/Classes/RootViewController.h

@@ -29 +29 @@
         NSString *dataFilePath;
         NSMutableArray *accountsArray;
+        NSUInteger currentDomainIndex;          // index of the current domain in the current account (set from the account view controller)
+@private
+        BOOL mustLogin;
         NSUInteger currentAccountIndex;         // accountsArray index of the account being edited or viewed
-        NSUInteger currentDomainIndex;          // index of the current domain in the current account (set from the account view controller)
 }
 

apps/iphone/my.tel/trunk/Classes/RootViewController.m

@@ -9 +9 @@
 #import "RootViewController.h"
 
+@interface RootViewController (PrivateMethods)
+
+- (void)setCurrentAccountIndex:(NSUInteger)index;
+
+@end
 
 @implementation RootViewController
@@ -24 +29 @@
     if (self = [super initWithStyle:style]) {
                 currentAccountIndex = NSUIntegerMax;
+                mustLogin = YES;
                 [self loadData];
     }
@@ -126 +132 @@
 }
 
+- (void)setCurrentAccountIndex:(NSUInteger)index {
+        if (index != currentAccountIndex) {
+                currentAccountIndex = index;
+                mustLogin = YES;
+        }
+}
+
 - (void)loginToCurrentAccount {
         if (currentAccountIndex == NSUIntegerMax) {
@@ -132 +145 @@
                 return;
         }
-        return [self loginToAccountAtIndex:currentAccountIndex forced:YES];
+        return [self loginToAccountAtIndex:currentAccountIndex forced:mustLogin];
 }
 
 - (void)loginToAccountAtIndex:(NSUInteger)accountIndex forced:(BOOL)forced{
-        if (forced || (accountIndex != currentAccountIndex)) {
-                currentAccountIndex = accountIndex;
+        if (currentAccountIndex == NSUIntegerMax)
+                return;
+        [self setCurrentAccountIndex:accountIndex];
+        if (forced || mustLogin) {
                 NSDictionary *selectedAccount = [self.accountsArray objectAtIndex:currentAccountIndex];
                 [[[UIApplication sharedApplication] keyWindow] addSubview:[MyTelConnect sharedInstance].view];
@@ -156 +171 @@
 
         if ([[parsedJson valueForKey:@"success"] integerValue] == 1) {
-                // Success. Go to account if there's no account, otherwise do nothing
+                // Success. Go to account if there's no account visible
+                mustLogin = NO;
                 if (self.navigationController.topViewController == self) {
                         [self displayControllerForAccountAtIndex:currentAccountIndex];
@@ -163 +179 @@
         } else {
                 // Failed. Get back to the root
-                currentAccountIndex = NSUIntegerMax;
+                NSDictionary *failedAccount = self.currentAccount;
+                [self setCurrentAccountIndex:NSUIntegerMax];
                 [self.navigationController popToRootViewControllerAnimated:NO];
+                UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:[failedAccount objectForKey:@"accountLabel"]
+                                                                                                                        message:[[parsedJson valueForKey:@"actionErrors"] objectAtIndex:0]
+                                                                                                                   delegate:nil
+                                                                                                  cancelButtonTitle:NSLocalizedString(@"OK", nil)
+                                                                                                  otherButtonTitles:nil];
+                [alertView show];
+                [alertView release];
         }
 }
@@ -195 +219 @@
         NSArray *indexPaths = [NSArray arrayWithObject:[NSIndexPath indexPathForRow:currentAccountIndex inSection:kKRootTableViewSectionAccounts]];
         [self.tableView deleteRowsAtIndexPaths:indexPaths withRowAnimation:UITableViewRowAnimationFade];
-        currentAccountIndex = NSUIntegerMax;
+        [self setCurrentAccountIndex:NSUIntegerMax];
         [self saveData];
 }
@@ -272 +296 @@
                 case kKRootTableViewSectionAccounts:
                         if (self.tableView.editing) {   // in edit mode, open the account edit view
-                                [self editAccountAtIndex:indexPath.row];
+                                [self setCurrentAccountIndex:indexPath.row];
+                                [self objectWillGetEditedInController:self];
                         } else {        // in non-edit mode, login and move to the account
                                 [self loginToAccountAtIndex:indexPath.row forced:NO];
@@ -278 +303 @@
                         break;
                 case kKRootTableViewSectionAddAccount:
+                        [self setCurrentAccountIndex:NSUIntegerMax];
                         eVC = [[AccountEditController new] autorelease];
                         eVC.delegate = self;
@@ -411 +437 @@
                 }
                 [self saveData];
+                mustLogin = YES;
         }
 }

apps/iphone/my.tel/trunk/VIP.tel.xcodeproj/project.pbxproj

@@ -1091 +1091 @@
                                 GCC_WARN_UNUSED_VARIABLE = YES;
                                 PREBINDING = NO;
+                                PROVISIONING_PROFILE = "8073E846-129F-4458-A198-31367F83CF72";
                                 SDKROOT = iphoneos3.0;
                         };