Merge lp:~aaronbrethorst-deactivatedaccount/ubuntuone-ios-client/ubuntuone-artwork into lp:ubuntuone-ios-client

[Aaron Brethorst]

This commit includes the following:
- Updated artwork for the Default.png and Icon files (including iPhone 4/Retina Display-optimized artwork)
- String changes to remove overt Funambol references (i.e. make the app's text identical to the one in the App Store, again)
- Add a button to the credentials page that will externally open Mobile Safari and allow the user to retrieve their syncml server creds
- Plumb through the credentials retrieved from the ubuntuone:// URL so that when the user comes back to the app, their creds are automatically populated.a

[Zachery Bir (urbanape)]

Looks good to me. Runs fine in the simulator.

We need to change the URL that "Retrieve My Credentials..." points to, and we need to get the provisioning profile to be a team profile, but this is good to merge.

review: Approve

[lp:~aaronbrethorst-deactivatedaccount/ubuntuone-ios-client/ubuntuone-artwork]

3. By Aaron Brethorst <email address hidden> on 2010-07-26

Clean up the AccountView a bit. Change it from being a UIViewController to a plain, old UITableViewController, which lets us get rid of a bunch of unnecessary code.

4. By Aaron Brethorst <email address hidden> on 2010-07-26

Improved management of placeholder values in the three account view controller fields (placeholders need not be removed when a value is present in their fields). Removed manual event management from the three fields and replaced them with a UITextFieldDelegate callback method. Also added proper management of firstResponder status, so each text field gains focus in turn when the return key is pressed.

5. By Aaron Brethorst <email address hidden> on 2010-07-26

Remove duplicate method declarations from AccountView. The method signatures removed are declared on subclasses of UITableViewController, and should not be repeated here.

6. By Aaron Brethorst <email address hidden> on 2010-07-26

Ripped out a ton of redundant code around instantiating the text fields used in the account view and replaced them with a single, internal method that generates the needed text fields in a single place. Much easier to figure out what's going on, now

7. By Aaron Brethorst <email address hidden> on 2010-07-28

Finish overhauling the AccountView: I think I have resolved all of the memory leaks in that class, I have cut out about 25% of LOC from the file, and the class now behaves like I would expect a UITableViewController subclass to work.

8. By Aaron Brethorst <email address hidden> on 2010-07-28

Turn SettingsSingleView into a UITableViewController. Get rid of some unnecessary code in the process.

9. By Aaron Brethorst <email address hidden> on 2010-08-10

updated sync artwork with the Ubuntu CoF logo. IMPORTANT: this MUST be cleared with the appropriate folks, since a casual read of the branding requirements seems to indicate that this might be in violation...

Unmerged revisions

9. By Aaron Brethorst <email address hidden> on 2010-08-10

updated sync artwork with the Ubuntu CoF logo. IMPORTANT: this MUST be cleared with the appropriate folks, since a casual read of the branding requirements seems to indicate that this might be in violation...

8. By Aaron Brethorst <email address hidden> on 2010-07-28

Turn SettingsSingleView into a UITableViewController. Get rid of some unnecessary code in the process.

7. By Aaron Brethorst <email address hidden> on 2010-07-28

Finish overhauling the AccountView: I think I have resolved all of the memory leaks in that class, I have cut out about 25% of LOC from the file, and the class now behaves like I would expect a UITableViewController subclass to work.

=== added file 'iPhoneApp/Default.png'
Binary files iPhoneApp/Default.png	1970-01-01 00:00:00 +0000 and iPhoneApp/Default.png	2010-07-26 21:44:45 +0000 differ
=== added file 'iPhoneApp/[e-mail]'
Binary files iPhoneApp/[e-mail]	1970-01-01 00:00:00 +0000 and iPhoneApp/[e-mail]	2010-07-26 21:44:45 +0000 differ
=== added file 'iPhoneApp/Icon.png'
Binary files iPhoneApp/Icon.png	1970-01-01 00:00:00 +0000 and iPhoneApp/Icon.png	2010-07-26 21:44:45 +0000 differ
=== added file 'iPhoneApp/[e-mail]'
Binary files iPhoneApp/[e-mail]	1970-01-01 00:00:00 +0000 and iPhoneApp/[e-mail]	2010-07-26 21:44:45 +0000 differ
=== modified file 'iPhoneApp/Info.plist'
--- iPhoneApp/Info.plist	2010-07-22 20:21:36 +0000
+++ iPhoneApp/Info.plist	2010-07-26 21:44:45 +0000
@@ -2,20 +2,23 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>UISupportedInterfaceOrientations</key>
-	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-	<string>Funambol</string>
+	<string>Ubuntu One</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
-	<string>apple-touch-icon.png</string>
+	<string>Icon.png</string>
+	<key>CFBundleIconFiles</key>
+	<array>
+		<string>Icon.png</string>
+		<string>[e-mail]</string>
+	</array>
 	<key>CFBundleIdentifier</key>
-	<string>com.funambol.iphoneplugin</string>
+	<string>com.structlab.one.iphoneplugin</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -25,6 +28,19 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-        <string>8.7.0</string>
+	<string>8.7.0</string>
+	<key>UIPrerenderedIcon</key>
+	<false/>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>com.structlab.one.iphoneplugin</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>ubuntuone</string>
+			</array>
+		</dict>
+	</array>
 </dict>
 </plist>

=== modified file 'iPhoneApp/SyncEngine/src/iPhoneDefaultConfigFactory.cpp'
--- iPhoneApp/SyncEngine/src/iPhoneDefaultConfigFactory.cpp	2010-07-22 20:21:36 +0000
+++ iPhoneApp/SyncEngine/src/iPhoneDefaultConfigFactory.cpp	2010-07-26 21:44:45 +0000
@@ -65,7 +65,7 @@
     ac->setProxyPort            (8080);
     ac->setProxyUsername        ("");
     ac->setProxyPassword        ("");
-    ac->setSyncURL              ("http://my.funambol.com/sync");
+    ac->setSyncURL              ("https://syncml.one.ubuntu.com");
     ac->setBeginSync            (0);
     ac->setEndSync              (0);
     ac->setServerAuthRequired   (false);

=== modified file 'iPhoneApp/UI/include/AccountView.h'
--- iPhoneApp/UI/include/AccountView.h	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/include/AccountView.h	2010-07-26 21:44:45 +0000
@@ -35,14 +35,11 @@
 
 #import <UIKit/UIKit.h>
 
-
 #import "common.h"
 #import "base/Log.h"
 
 USE_NAMESPACE
-@interface AccountView : UIViewController <UIScrollViewDelegate, UITextFieldDelegate, UITableViewDelegate, UITableViewDataSource>  {
-
-    UITableView* accountTable;
+@interface AccountView : UITableViewController <UITextFieldDelegate>  {
     
     UITextField* URLValue;
     UITextField* usernameValue;
@@ -51,6 +48,11 @@
     UITableViewCell* URLParameter;
     UITableViewCell* usernameParameter;
     UITableViewCell* passwordParameter;
+	
+	//AB 21 July 2010 - Add a 'Retrieve Creds Section'
+	UITableViewCell* credentialsButton;
+	//
+	
     UIActivityIndicatorView* activityIndicator;
     
     UIFont*     small_font;
@@ -62,22 +64,15 @@
     NSString* password;
     
     UIColor* funBlue;
-    NSNotificationCenter *nCenter;
     UIAlertView *animationAlert;
     NSString* credentials;
 }
-- (id)init;
 - (BOOL) isPortal;
-- (void)dealloc;
 - (void) reload;
-- (void) viewDidAppear:(BOOL) animated;
-- (void) viewWillDisappear:(BOOL) animated;
-- (void) URLValueEditedAction: (id)sender;
-- (void) usernameValueEditedAction: (id)sender;
-- (void) passwordValueEditedAction: (id)sender;
-
 - (void) startWaitingAnimation:(NSNotification *) aNotification ;
 - (void) stopWaitingAnimation:(NSNotification *) aNotification ;
 - (void) setCredentials:(NSString*)value;
+//AB 21 July 2010 - Add a 'Retrieve Creds Section'
+- (void)loadCredentials;
 //- (void)alertView: (UIAlertView *)alertView clickedButtonAtIndex: (NSInteger)buttonIndex;    
 @end

=== modified file 'iPhoneApp/UI/l10n/English.lproj/Localizable.strings'
Binary files iPhoneApp/UI/l10n/English.lproj/Localizable.strings	2010-07-22 20:21:36 +0000 and iPhoneApp/UI/l10n/English.lproj/Localizable.strings	2010-07-26 21:44:45 +0000 differ
=== modified file 'iPhoneApp/UI/src/AccountView.mm'
--- iPhoneApp/UI/src/AccountView.mm	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/src/AccountView.mm	2010-07-26 21:44:45 +0000
@@ -42,21 +42,28 @@
 #import "customs.h"
 #import "LoginManager.h"
 
+@interface AccountView ()
+- (UITextField*)buildTextFieldWithFrame:(CGRect)aFrame text:(NSString*)text keyboardType:(UIKeyboardType)keyboardType returnKeyType:(UIReturnKeyType)returnKeyType;
+@end
+
+
 @implementation AccountView
 
 - (id)init {
-    self = [super init];
-	if (self)
+	if (self = [super initWithStyle:UITableViewStyleGrouped])
 	{
 		// this title will appear in the navigation bar
 		self.title = NSLocalizedString(@"Account",@"Account");
+		funBlue = [[UIColor alloc] initWithRed:FUNBLUE_RGB_RED green:FUNBLUE_RGB_GREEN blue:FUNBLUE_RGB_BLUE alpha:1.0];
+		showerror = true;
     }
-    funBlue = [[UIColor alloc] initWithRed:FUNBLUE_RGB_RED green:FUNBLUE_RGB_GREEN blue:FUNBLUE_RGB_BLUE alpha:1.0];
-    showerror = true;
+    
     return self;
 }
 
-
+- (BOOL) isPortal{
+    return FALSE;
+}
 
 - (void) noCredsAlert: (NSString*) text{
     UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Alert", @"Alert") message:text
@@ -109,57 +116,84 @@
     
 }
 
+//AB 21 July 2010 - Add a 'Retrieve Creds Section'
+- (void)loadCredentials
+{
+	if (credentials)
+	{
+		NSURL *credURL = [NSURL URLWithString:credentials];
+		
+		if ([credURL user])
+		{
+			usernameValue.text = [credURL user];
+			[[FunambolAPI getInstance] saveUsernameConfig:[credURL user]];
+		}
+		
+		if ([credURL password])
+		{
+			passwordValue.text = [credURL password];
+			[[FunambolAPI getInstance] savePasswordConfig:[credURL password]];
+		}
+		
+		if ([credURL host])
+		{
+			URLValue.text = [credURL host];
+			[[FunambolAPI getInstance] saveURLConfig:[credURL host]];
+		}
+	}
+}
+
 - (void) setCredentials:(NSString*)value{
-    
+	[value retain];
+	[credentials release];
+	credentials = value;
+	
+#if 0  //AB 21 July 2010 - Add a 'Retrieve Creds Section'
     [self startWaitingAnimation:nil];
     credentials = value;
+
     LoginManager* loginmanager = [[LoginManager alloc]init];
     [loginmanager setCredentials:value];
     [loginmanager login];
-}
-
-
-- (void) loadView{
-    UIView *contentView = [[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]];
-	self.view = contentView;
-	[contentView release];
-	
-	self.view.autoresizesSubviews = YES;
-    
+#endif
+}
+
+- (UITextField*)buildTextFieldWithFrame:(CGRect)aFrame text:(NSString*)text keyboardType:(UIKeyboardType)keyboardType returnKeyType:(UIReturnKeyType)returnKeyType
+{
+	UITextField *field = [[UITextField alloc] initWithFrame:aFrame];
+	field.borderStyle = UITextBorderStyleNone;
+	field.font = small_font;
+	field.exclusiveTouch = YES;
+	field.autocorrectionType = UITextAutocorrectionTypeNo;
+	field.text = text;
+	field.keyboardType = keyboardType;
+	field.returnKeyType = returnKeyType;
+	field.clearButtonMode = UITextFieldViewModeNever;
+	field.autocapitalizationType = UITextAutocapitalizationTypeNone;
+	field.textColor = funBlue;
+	field.contentVerticalAlignment =  UIControlContentVerticalAlignmentCenter;
+	field.delegate = self;
+	
+	return field;
+}
+
+
+- (void) viewDidLoad{
+    [super viewDidLoad];
+	
     small_font = [UIFont systemFontOfSize:15];
-    
-    accountTable = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStyleGrouped]; 
-	accountTable.delegate = self;
-    accountTable.dataSource = self;
-    accountTable.scrollEnabled = NO;
-	//accountTable.rowHeight = 60;
-    [accountTable reloadData];
-    
+        
     [[FunambolAPI getInstance] loadSyncConfig:&URL username:&username password:&password];
-
   
     URLParameter = [[UITableViewCell alloc] init];
     URLParameter.textLabel.text = NSLocalizedString(@"Server",@"Server");
     [URLParameter setSelectionStyle:UITableViewCellSelectionStyleNone];
-    URLValue = [[UITextField alloc] initWithFrame:CGRectMake(116.0, 3.0, 185.0, 40 )];
-    //URLValue = [[UITextField alloc] initWithFrame:CGRectMake(15.0, 3.0, 290, 40 )];
-    URLValue.borderStyle = UITextBorderStyleNone;
-    URLValue.font = small_font;
-    URLValue.exclusiveTouch = YES;
-    URLValue.autocorrectionType = UITextAutocorrectionTypeNo;
-    if ([URL isEqualToString:@""]){
-        URLValue.text = @"http://my.funambol.com/sync";
-    }else{
-        URLValue.text = URL;
-    }
-    URLValue.backgroundColor = [UIColor whiteColor];
-    URLValue.keyboardType = UIKeyboardTypeURL;
-    URLValue.returnKeyType = UIReturnKeyDone;
-    URLValue.clearButtonMode = UITextFieldViewModeNever;
-    URLValue.autocapitalizationType = UITextAutocapitalizationTypeNone;
-    URLValue.textColor = funBlue;
-    URLValue.contentVerticalAlignment =  UIControlContentVerticalAlignmentCenter;
-    [URLValue addTarget:self action:@selector(URLValueEditedAction:) forControlEvents:UIControlEventEditingDidEnd];
+	
+	URLValue = [self buildTextFieldWithFrame:CGRectMake(116.0, 3.0, 185.0, 40)
+										text:([URL isEqual:@""] ? @"https://syncml.one.ubuntu.com" : URL)
+								keyboardType:UIKeyboardTypeURL
+							   returnKeyType:UIReturnKeyNext];
+	
     [URLParameter addSubview:URLValue];
     
     //smart dimension of the labels
@@ -167,75 +201,48 @@
     NSString* passwordLabel = NSLocalizedString(@"Password",@"Password");
 
     
-    double label_start = 115.0;
-    double label_width = 185.0;
+    float label_start = 115.0;
+    float label_width = 185.0;
     if( [usernameLabel length] > 10 || [passwordLabel length] > 10 ){
-        int val;
-        ([usernameLabel length] > [passwordLabel length]) ? val = [usernameLabel length] : [passwordLabel length];  
+        int val = MAX([usernameLabel length],[passwordLabel length]);
         label_start = 12 * val;
         label_width = 300 - label_start;
-    
     }
     
     usernameParameter = [[UITableViewCell alloc] init];
-
-    usernameParameter.textLabel.text = usernameLabel;
-//    [usernameParameter setText: usernameLabel];
-    
+    usernameParameter.textLabel.text = usernameLabel;    
     [usernameParameter setSelectionStyle:UITableViewCellSelectionStyleNone];
-    usernameValue = [[UITextField alloc] initWithFrame:CGRectMake(label_start, 3.0, label_width, 40)];
-    usernameValue.borderStyle = UITextBorderStyleNone;
-    usernameValue.contentVerticalAlignment =  UIControlContentVerticalAlignmentCenter;
-    //usernameValue.textAlignment = UITextAlignmentRight;
-    usernameValue.font = small_font;
-    if([username isEqualToString:@""]||[username isEqualToString:@"guest "]){
-        usernameValue.placeholder = @"username";
-        //usernameValue.text = username;
-    }else{
-        usernameValue.text = username;
-    }
-    usernameValue.backgroundColor = [UIColor whiteColor];    
-    usernameValue.keyboardType = UIKeyboardTypeEmailAddress;
-    usernameValue.returnKeyType = UIReturnKeyDone;
-    usernameValue.autocorrectionType = UITextAutocorrectionTypeNo;
-    usernameValue.textColor = funBlue;
-    usernameValue.clearButtonMode = UITextFieldViewModeNever;
-    usernameValue.autocapitalizationType = UITextAutocapitalizationTypeNone;
-    [usernameValue addTarget:self action:@selector(usernameValueEditedAction:) forControlEvents:UIControlEventAllEditingEvents];
+	
+	usernameValue = [self buildTextFieldWithFrame:CGRectMake(label_start, 3.0, label_width, 40)
+											 text:([username length] > 0 && ![username isEqual:@"guest "] ? username : @"")
+									 keyboardType:UIKeyboardTypeEmailAddress
+									returnKeyType:UIReturnKeyNext];
+	
     [usernameParameter addSubview:usernameValue];
     
     passwordParameter = [[UITableViewCell alloc] init];
     [passwordParameter setSelectionStyle:UITableViewCellSelectionStyleNone];
     passwordParameter.textLabel.text = passwordLabel;
-    //[passwordParameter setText:passwordLabel];
-    passwordValue = [[UITextField alloc] initWithFrame:CGRectMake(label_start, 3.0,label_width, 40)];
-    passwordValue.borderStyle = UITextBorderStyleNone;
-    passwordValue.contentVerticalAlignment =  UIControlContentVerticalAlignmentCenter;
-    //passwordValue.textAlignment = UITextAlignmentRight;
-    passwordValue.textColor = funBlue;
-    passwordValue.font = small_font;
-    if([password isEqualToString:@""]){
-        passwordValue.placeholder = @"password";
-    }else {
-        passwordValue.text = password;
-    }
-    //[passwordValue  setEditing:TRUE];
-    passwordValue.backgroundColor = [UIColor whiteColor];
-    passwordValue.autocorrectionType = UITextAutocorrectionTypeNo;
-    passwordValue.keyboardType = UIKeyboardTypeDefault;
-    passwordValue.returnKeyType = UIReturnKeyDone;
-    passwordValue.clearButtonMode = UITextFieldViewModeNever;
-    passwordValue.secureTextEntry = YES;
-    [passwordValue addTarget:self action:@selector(passwordValueEditedAction:) forControlEvents:UIControlEventAllEditingEvents];
+	
+	passwordValue = [self buildTextFieldWithFrame:CGRectMake(label_start, 3.0,label_width, 40)
+											 text:(0 == [password length] ? @"" : password)
+									 keyboardType:UIKeyboardTypeDefault
+									returnKeyType:UIReturnKeyDone];
+
+	passwordValue.secureTextEntry = YES;
     [passwordParameter addSubview:passwordValue]; 
-    
-    [self.view addSubview:accountTable];
-
-    [accountTable reloadData];
-
-    nCenter = [NSNotificationCenter defaultCenter];
-    
-    [nCenter addObserver:self  
+	
+	//AB 21 July 2010 - Add a 'Retrieve Creds Section'
+	credentialsButton = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"CredentialsButton"];
+	credentialsButton.textLabel.text = NSLocalizedString(@"Retrieve My Credentials...",@"Credentials button in AccountView.mm");
+    credentialsButton.textLabel.textAlignment = UITextAlignmentCenter;
+
+	[self loadCredentials];
+	//
+
+    [self.tableView reloadData];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self  
                 selector:@selector(stopWaitingAnimation:)
                     name:@LOGIN_END_NOTIFICATION
                   object:nil];
@@ -280,7 +287,7 @@
                 break;
         }
     }else{
-        
+#if 0 //AB 21 July 2010 - Add a 'Retrieve Creds Section'
         switch (indexPath.row) {
             case 0:
                 return URLParameter;
@@ -291,6 +298,22 @@
             default:
                 break;
         }
+#endif
+		if (0 == indexPath.section) {
+			switch (indexPath.row) {
+				case 0:
+					return URLParameter;
+				case 1:
+					return usernameParameter;
+				case 2:
+					return passwordParameter;
+				default:
+					break;
+			}
+		}else if (1 == indexPath.section){
+			return credentialsButton;
+		}
+		
     }
     return nil;
 }
@@ -299,7 +322,14 @@
     if([self isPortal]){
         return 2;
     }else{
+#if 0 //AB 21 July 2010 - Add a 'Retrieve Creds Section'
         return 3;
+#endif
+		if (0 == section){
+			return 3;
+		}else{
+			return 1;
+		}
     }
 }
 
@@ -314,46 +344,55 @@
 }
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)accountTable {
+#if 0 //AB 21 July 2010 - Add a 'Retrieve Creds Section'
     return 1;
-}
-
-- (BOOL) isPortal{
-    return FALSE;
-}
-
-- (void)URLValueEditedAction:(id)sender
-{
-    StringBuffer val;
-    val = [URLValue.text UTF8String];
-    val.replaceAll("%", "");
-    [URLValue setText:[[NSString alloc] initWithUTF8String:val.c_str()]];
-    [[FunambolAPI getInstance] saveURLConfig:URLValue.text];
-}
-
-- (void)usernameValueEditedAction:(id)sender
-{
-    if([usernameValue.text isEqualToString:@""]){
-        usernameValue.placeholder = @"username";
-    }else{
-    
-    }
-    
-    [[FunambolAPI getInstance] saveUsernameConfig:usernameValue.text];
-}
-
-- (void)passwordValueEditedAction:(id)sender
-{
-    if([passwordValue.text isEqualToString:@""]){
-        passwordValue.placeholder = @"password";
-    }else{
-    }
-    
-    [[FunambolAPI getInstance] savePasswordConfig:passwordValue.text];
+#endif
+	return 2;
+}
+
+//AB 21 July 2010 - Add a 'Retrieve Creds Section'
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	if (1 == indexPath.section && 0 == indexPath.row)
+	{
+		NSURL *credentialsURL = [NSURL URLWithString:@"http://structlab.com/u1.html"];
+		[tableView deselectRowAtIndexPath:indexPath animated:YES];
+		[[UIApplication sharedApplication] openURL:credentialsURL];
+	}
+}
+
+#pragma mark -
+#pragma mark UITextFieldDelegate
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField{
+	if (URLValue == textField){
+		
+		//AB: I'm trying to figure out if this method is doing something spectacularly
+		//clever that my total lack of C++-fu is unable to figure out, or if this is
+		//actually just ripping out instances of the % character.
+		StringBuffer val;
+		val = [URLValue.text UTF8String];
+		val.replaceAll("%", "");
+		[URLValue setText:[[NSString alloc] initWithUTF8String:val.c_str()]];
+		[[FunambolAPI getInstance] saveURLConfig:URLValue.text];
+		[usernameValue becomeFirstResponder];
+
+	}else if(usernameValue == textField){		
+	
+		[[FunambolAPI getInstance] saveUsernameConfig:usernameValue.text];
+		[passwordValue becomeFirstResponder];
+
+	}else if(passwordValue == textField){		
+	
+		[[FunambolAPI getInstance] savePasswordConfig:passwordValue.text];
+		[passwordValue resignFirstResponder];
+
+	}
+	return YES;
 }
 
 - (void)dealloc {
     // TODO dealloc all items
-    [accountTable release];
     
     [URLValue release];
     [usernameValue release];

=== modified file 'iPhoneApp/UI/src/main.mm'
--- iPhoneApp/UI/src/main.mm	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/src/main.mm	2010-07-26 21:44:45 +0000
@@ -70,6 +70,7 @@
         NSURL *url = (NSURL*)[launchOptions valueForKey: UIApplicationLaunchOptionsURLKey]  ;
         if (url) {
             credentials = [url absoluteString];
+			NSLog(@"CREDS: %@", credentials);
         }
     }
 

=== modified file 'iPhoneApp/funambolAppStore.xcodeproj/project.pbxproj'
--- iPhoneApp/funambolAppStore.xcodeproj/project.pbxproj	2010-07-22 20:21:36 +0000
+++ iPhoneApp/funambolAppStore.xcodeproj/project.pbxproj	2010-07-26 21:44:45 +0000
@@ -24,6 +24,10 @@
 		7C9F581B0DAF5C50007E0091 /* UIController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C9F57E90DAF5C50007E0091 /* UIController.mm */; };
 		7C9F59500DAF67B9007E0091 /* stringUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C9F594F0DAF67B9007E0091 /* stringUtils.cpp */; };
 		7C9F59620DAF683B007E0091 /* AddressBookSyncSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C9F59610DAF683B007E0091 /* AddressBookSyncSource.cpp */; };
+		930D5A6A11F9FB8800DD6D06 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 930D5A6611F9FB8800DD6D06 /* Default.png */; };
+		930D5A6B11F9FB8800DD6D06 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 930D5A6711F9FB8800DD6D06 /* [e-mail] */; };
+		930D5A6C11F9FB8800DD6D06 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 930D5A6811F9FB8800DD6D06 /* Icon.png */; };
+		930D5A6D11F9FB8800DD6D06 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 930D5A6911F9FB8800DD6D06 /* [e-mail] */; };
 		AB2107D30DE1C5820026FA2F /* FunambolAPIWrapperImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB2107D20DE1C5820026FA2F /* FunambolAPIWrapperImpl.cpp */; };
 		AB33A9900E5AD6750098F0A2 /* TimeUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB33A98D0E5AD6750098F0A2 /* TimeUtils.mm */; };
 		AB33AA930E5AE0460098F0A2 /* icon_sync_154x154_frame01.png in Resources */ = {isa = PBXBuildFile; fileRef = AB33AA830E5AE0460098F0A2 /* icon_sync_154x154_frame01.png */; };
@@ -144,6 +148,10 @@
 		7C9F59600DAF683B007E0091 /* AddressBookSyncSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddressBookSyncSource.h; sourceTree = "<group>"; };
 		7C9F59610DAF683B007E0091 /* AddressBookSyncSource.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = AddressBookSyncSource.cpp; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		930D5A6611F9FB8800DD6D06 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
+		930D5A6711F9FB8800DD6D06 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
+		930D5A6811F9FB8800DD6D06 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
+		930D5A6911F9FB8800DD6D06 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
 		AB084D3F0E7576CA008FDF08 /* Date.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Date.h; sourceTree = "<group>"; };
 		AB2107D10DE1C57A0026FA2F /* FunambolAPIWrapperImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FunambolAPIWrapperImpl.h; sourceTree = "<group>"; };
 		AB2107D20DE1C5820026FA2F /* FunambolAPIWrapperImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FunambolAPIWrapperImpl.cpp; sourceTree = "<group>"; };
@@ -265,6 +273,10 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				930D5A6611F9FB8800DD6D06 /* Default.png */,
+				930D5A6711F9FB8800DD6D06 /* [e-mail] */,
+				930D5A6811F9FB8800DD6D06 /* Icon.png */,
+				930D5A6911F9FB8800DD6D06 /* [e-mail] */,
 				ABA164000D9178CF0033F591 /* icons */,
 				8D1107310486CEB800E47090 /* Info.plist */,
 				AB3785B90E5AF345003E51F8 /* dist.plist */,
@@ -610,6 +622,10 @@
 				AB33AAA20E5AE0460098F0A2 /* icon_sync_154x154_frame16.png in Resources */,
 				AB3785BA0E5AF345003E51F8 /* dist.plist in Resources */,
 				ABBF2921104BCE15004A9F09 /* Localizable.strings in Resources */,
+				930D5A6A11F9FB8800DD6D06 /* Default.png in Resources */,
+				930D5A6B11F9FB8800DD6D06 /* [e-mail] in Resources */,
+				930D5A6C11F9FB8800DD6D06 /* Icon.png in Resources */,
+				930D5A6D11F9FB8800DD6D06 /* [e-mail] in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -666,7 +682,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Matteo Vitolo";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Aaron Brethorst (F47V3NDKL2)";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -712,7 +728,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = Funambol;
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "87F25073-C3B8-4832-A6EA-3861F52C8E73";
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "593A3158-7296-4E4E-9F26-663515C90E99";
 				SDKROOT = iphoneos4.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -848,8 +864,8 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = YES;
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CODE_SIGN_ENTITLEMENTS = dist.plist;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Matteo Vitolo";
+				CODE_SIGN_ENTITLEMENTS = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Aaron Brethorst (F47V3NDKL2)";
 				CURRENT_PROJECT_VERSION = 0.8.2;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
@@ -867,7 +883,7 @@
 				);
 				ONLY_ACTIVE_ARCH = NO;
 				PREBINDING = NO;
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "87F25073-C3B8-4832-A6EA-3861F52C8E73";
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "593A3158-7296-4E4E-9F26-663515C90E99";
 				SDKROOT = iphoneos4.0;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
 				STRIP_STYLE = all;