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

[Aaron Brethorst]

Overhaul the settings experience. Make it far simpler than it was before, and remove several classes that we no longer need as a result.

[Zachery Bir (urbanape)]

So much nicer.

review: Approve

=== modified file 'iPhoneApp/Default.png'
Binary files iPhoneApp/Default.png	2010-07-23 17:27:52 +0000 and iPhoneApp/Default.png	2010-08-20 00:36:44 +0000 differ
=== modified file 'iPhoneApp/[e-mail]'
Binary files iPhoneApp/[e-mail]	2010-07-23 17:27:52 +0000 and iPhoneApp/[e-mail]	2010-08-20 00:36:44 +0000 differ
=== modified file 'iPhoneApp/Info.plist'
--- iPhoneApp/Info.plist	2010-07-23 17:27:52 +0000
+++ iPhoneApp/Info.plist	2010-08-20 00:36:44 +0000
@@ -18,7 +18,7 @@
 		<string>[e-mail]</string>
 	</array>
 	<key>CFBundleIdentifier</key>
-	<string>com.structlab.one.iphoneplugin</string>
+	<string>com.ubuntu.one.iphoneplugin</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -42,5 +42,7 @@
 			</array>
 		</dict>
 	</array>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleOpaqueBlack</string>
 </dict>
 </plist>

=== modified file 'iPhoneApp/UI/include/AccountView.h'
--- iPhoneApp/UI/include/AccountView.h	2010-08-04 19:38:11 +0000
+++ iPhoneApp/UI/include/AccountView.h	2010-08-20 00:36:44 +0000
@@ -47,13 +47,8 @@
     UITableViewCell* usernameParameter;
     UITableViewCell* passwordParameter;
 
-	//AB 21 July 2010 - Add a 'Retrieve Creds Section'
 	UITableViewCell* credentialsButton;
-	//
-
-    UIActivityIndicatorView* activityIndicator;
-
-    UIFont*     small_font;
+	UITableViewCell* aboutButton;
 
     bool showerror;
 
@@ -61,16 +56,17 @@
     NSString* username;
     NSString* password;
 
-    UIColor* funBlue;
-    UIAlertView *animationAlert;
     NSString* credentials;
+	
+	//Contact Sync
+	NSString* syncValue;
+	
+	BOOL presentedModally;
 }
-- (BOOL) isPortal;
+@property(nonatomic,assign) BOOL presentedModally;
+@property(nonatomic,retain) NSString *credentials;
+@property(nonatomic,retain) NSString *syncValue;
 - (void) reload;
-- (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;
+- (IBAction)close:(id)sender;
 @end

=== removed file 'iPhoneApp/UI/include/CleanUpView.h'
--- iPhoneApp/UI/include/CleanUpView.h	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/include/CleanUpView.h	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc.
- * Copyright (C) 2008 Funambol, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- *
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-#import <UIKit/UIKit.h>
-
-
-#import "common.h"
-#import "base/Log.h"
-
-
-@interface CleanUpView : UIViewController <UITableViewDelegate, UITableViewDataSource, UIAlertViewDelegate, UIActionSheetDelegate>  {
-    
-    UITableView*        cleanupTable;
-    
-    UIBarButtonItem *   cleanupButton;
-    
-    UITableViewCell *   descriptionCell;
-    UITableViewCell *   contactSyncCell;
-    UISwitch*           contactSync;
-    
-    UITableViewCell *   calendarSyncCell;
-    UISwitch*           calendarSync;
-    
-    UITableViewCell *   noteSyncCell;
-    UISwitch*           noteSync;
-
-    NSMutableArray      *menuList;
-    
-    UIFont*             small_font;    
-    
-    
-    NSString*           direction;
-    
-    UIAlertView*        alert;
-    
-    int                 contactLastSync;
-    
-    bool                clickedCleanup;
-    bool                firstmsgCleanup;
-    bool                notsyncedCleanup;
-    bool                contactFlag;
-    bool                calendarFlag;
-    bool                noteFlag;
-    
-    int                 heightRow;
-}
-
-- (id)   init;
-- (void) dealloc;
-- (void) loadView;
-- (void) reload;
-
-- (void) contactSyncAction: (id)sender;
-- (void) cleanupAction: (id)sender;
-
-- (void) viewWillAppear:(BOOL)animated;
-
-- (bool) didClickCleanup;
-- (bool) getContactFlag;
-- (bool) getCalendarFlag;
-- (bool) getNoteFlag;
-@end

=== removed file 'iPhoneApp/UI/include/ContactsSettingsView.h'
--- iPhoneApp/UI/include/ContactsSettingsView.h	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/include/ContactsSettingsView.h	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc.
- * Copyright (C) 2008 Funambol, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- *
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-#import <UIKit/UIKit.h>
-
-
-#import "common.h"
-#import "base/Log.h"
-
-
-@interface ContactsSettingsView : UIViewController <UITableViewDelegate, UITableViewDataSource>  {
-    
-    UITableView*        contactsTable;
-    
-    UITableViewCell*    contactSyncCell;
-    UITableViewCell*    syncWayCell;
-    UITableViewCell*    remoteURICell;
-    UITableViewCell*    pathCell;
-    
-    UILabel*            syncWayLabel;
-    
-    NSString*           syncValue;
-    NSString*           remoteURIValue;
-    
-    UISwitch*           contactSync;
-    UITextField*        remoteURI;
-    UISlider*           path;
-    NSMutableArray      *menuList;
-    
-    UIFont*             small_font;
-    
-    UITableViewCell *   companyDirectoryCell;
-    UISwitch *          companyDirectory;
-    
-    UIColor*            funBlue;
-    
-}
-- (id)init;
-- (void)dealloc;
-- (void) reload;
-- (void) pathAction: (id)sender;
-- (void) remoteURIAction: (id)sender;
-- (void) contactSyncAction: (id)sender;
-@end

=== removed file 'iPhoneApp/UI/include/LogLevelView.h'
--- iPhoneApp/UI/include/LogLevelView.h	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/include/LogLevelView.h	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc.
- * Copyright (C) 2008 Funambol, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- *
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-#import <UIKit/UIKit.h>
-
-#import "common.h"
-#import "base/Log.h"
-
-@interface LogLevelView : UIViewController <UITableViewDelegate, UITableViewDataSource> {
-
-    UITableView*        logTable;
-    
-    UITableViewCell*    infoCell;
-    UITableViewCell*    debugCell;
-    UITableViewCell*    errorCell;
-}
-- (id)init;
-- (void)reload;
-- (void) dealloc;
-- (void)infoAction:(id)sender;
-- (void)errorAction:(id)sender;
-- (void)debugAction:(id)sender;
-@end
\ No newline at end of file

=== removed file 'iPhoneApp/UI/include/LogSettingsView.h'
--- iPhoneApp/UI/include/LogSettingsView.h	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/include/LogSettingsView.h	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc.
- * Copyright (C) 2008 Funambol, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- *
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-#import <UIKit/UIKit.h>
-
-#import "common.h"
-#import "base/Log.h"
-
-@interface LogSettingsView : UIViewController <UITableViewDelegate, UITableViewDataSource> {
- 
-    UITableView*        logTable;
-    
-    UITableViewCell*    logLevelCell;
-    UITableViewCell*    viewLogCell;
-    UITableViewCell*    sendLogCell;
-    
-    UILabel*            logLevelLabel;
-    
-    NSMutableArray      *menuList;
-    UIColor*            funBlue;
-    UIFont*             small_font;
-    
-}
-- (id)init;
-- (void)reload;
-- (void) dealloc;
-- (void)sendLogAction:(id)sender;
-@end

=== removed file 'iPhoneApp/UI/include/LogView.h'
--- iPhoneApp/UI/include/LogView.h	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/include/LogView.h	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc.
- * Copyright (C) 2008 Funambol, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- *
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-#import <UIKit/UIKit.h>
-
-#import "common.h"
-#import "base/Log.h"
-
-@interface LogView : UIViewController {
-    UITextView*         logTextView;
-    UIFont*             small_font;
-
-    
-}
-- (id)init;
-- (void)reload;
-- (void) dealloc;
-- (void)viewWillAppear:(BOOL)animated;
-
-@end

=== removed file 'iPhoneApp/UI/include/LoginManager.h'
--- iPhoneApp/UI/include/LoginManager.h	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/include/LoginManager.h	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc.
- * Copyright (C) 2010 Funambol, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- *
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-#import "FunambolAPI.h"
-#import "base/util/StringBuffer.h"
-
-#define LOGIN_START_NOTIFICATION        "LoginStartNotification"
-#define LOGIN_END_NOTIFICATION          "LoginEndNotification"
-
-#define LOGIN_STATUS_NOTIFICATION_CODE  "LoginStatusCode"
-
-
-@interface LoginManager : NSObject {
-    NSString* credentials;
-}
-
-- (id) init;
-- (void) dealloc;
-- (BOOL) login;
-- (void) setCredentials:(NSString*) value;
-
-@end

=== modified file 'iPhoneApp/UI/include/MainSingleView.h'
--- iPhoneApp/UI/include/MainSingleView.h	2010-08-12 01:15:02 +0000
+++ iPhoneApp/UI/include/MainSingleView.h	2010-08-20 00:36:44 +0000
@@ -54,7 +54,7 @@
 	UIButton* stopButton;
 	UIButton* infoButton;
     UITextView* textView;  
-//    UILabel* allText;
+
 	UIButton *allText;
     UILabel* synchronizeText;
     UILabel* syncCancelText;

=== removed file 'iPhoneApp/UI/include/RecoverSyncMethodsView.h'
--- iPhoneApp/UI/include/RecoverSyncMethodsView.h	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/include/RecoverSyncMethodsView.h	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc. 
- * Copyright (C) 2008 Funambol, Inc.
- * 
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission 
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE 
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU Affero General Public License 
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- * 
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite 
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- * 
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- * 
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably 
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-#import <UIKit/UIKit.h>
-
-#import "SyncMethodsView.h"
-
-
-@interface RecoverSyncMethodsView : SyncMethodsView {
-
-}
-
-- (id)init;
-- (id)initWithModes:(NSArray*)syncModes;
-
-- (void)recoverFromServerAction:(id)sender;
-- (void)recoverFromClientAction:(id)sender;
-
-@end

=== removed file 'iPhoneApp/UI/include/RecoverView.h'
--- iPhoneApp/UI/include/RecoverView.h	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/include/RecoverView.h	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc.
- * Copyright (C) 2008 Funambol, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- *
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-#import <UIKit/UIKit.h>
-
-
-#import "common.h"
-#import "base/Log.h"
-
-
-@interface RecoverView : UIViewController <UITableViewDelegate, UITableViewDataSource>  {
-    
-    UITableView*        recoverTable;
-    
-    UIBarButtonItem *   recoverButton;
-    
-    UITableViewCell *   descriptionCell;
-    UITableViewCell*    directionCell;
-    UITableViewCell *   contactSyncCell;
-    UISwitch*           contactSync;
-
-    NSMutableArray      *menuList;
-    
-    UIFont*             small_font;    
-    
-    
-    NSString*           direction;
-    
-    bool                clickedRecover;
-}
-
-- (id)   init;
-- (void) dealloc;
-- (void) loadView;
-- (void) reload;
-
-- (void) contactSyncAction: (id)sender;
-- (void) recoverAction: (id)sender;
-
-- (void) viewWillAppear:(BOOL)animated;
-
-- (void) setRecoverDirection: (NSString*)direction;
-- (NSString*) getRecoverDirection;
-
-- (void) setDirectionText;
-- (bool) didClickRecover;
-@end

=== removed file 'iPhoneApp/UI/include/SettingsSingleView.h'
--- iPhoneApp/UI/include/SettingsSingleView.h	2010-08-12 01:15:02 +0000
+++ iPhoneApp/UI/include/SettingsSingleView.h	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc.
- * Copyright (C) 2008 Funambol, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- *
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-#import <UIKit/UIKit.h>
-
-#import "common.h"
-#import "base/Log.h"
-
-@interface SettingsSingleView : UIViewController <UITableViewDelegate, UITableViewDataSource> {
-
-    NSMutableArray*     menuList;
-    
-    UITableView*        settingsTable;
-    
-	UITableViewCell*    accountCell;
-	UITableViewCell*    contactsCell;
-
-	UITableViewCell*    logCell;	
-	UITableViewCell*    aboutCell;
-    UITableViewCell*    recoverCell;
-    UITableViewCell*    cleanupCell;
-    
-    UILabel*            usernameLabel;
-    UILabel*            contactsLabel;
-    UIFont*             small_font;
-    UIColor*            funBlue;
-    
-    NSIndexPath *       lastSelection;
-}
-- (id)init;
-- (void)dealloc;
-- (void) viewDidAppear:(BOOL)animated;
-- (void) reload;
-- (void) addComponents;
-- (void) addAccountTable;
-- (void) addSourcesTable;
-- (void) addLogTable;
-- (void) addAboutTable;
-- (void) addRecoverTable;
-- (void) addCleanupTable;
-- (IBAction)done:(id)sender;
-@end

=== modified file 'iPhoneApp/UI/src/AccountView.mm'
--- iPhoneApp/UI/src/AccountView.mm	2010-08-12 01:15:02 +0000
+++ iPhoneApp/UI/src/AccountView.mm	2010-08-20 00:36:44 +0000
@@ -40,31 +40,32 @@
 #import "FunambolAPI.h"
 #import "base/util/StringBuffer.h"
 #import "customs.h"
-#import "LoginManager.h"
+#import "FastSyncMethodsView.h"
+#import "AboutView.h"
 
-@interface AccountView ()
+@interface AccountView (Private)
 - (UITextField*)buildTextFieldWithFrame:(CGRect)aFrame text:(NSString*)text keyboardType:(UIKeyboardType)keyboardType returnKeyType:(UIReturnKeyType)returnKeyType;
+- (NSString*)friendlySyncValue;
+- (void)updateSyncValue;
 @end
 
-
 @implementation AccountView
 
+@synthesize credentials, syncValue, presentedModally;
+
 - (id)init {
 	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];
+		self.title = NSLocalizedString(@"Settings",@"Settings");
+		
 		showerror = true;
+		
+		self.presentedModally = NO;
     }
 
     return self;
 }
 
-- (BOOL) isPortal{
-    return FALSE;
-}
-
 - (void) noCredsAlert: (NSString*) text{
     UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Alert", @"Alert") message:text
                                                    delegate:self cancelButtonTitle:NSLocalizedString(@"OK", @"OK") otherButtonTitles: nil];
@@ -72,47 +73,6 @@
     [alert release];
 }
 
-- (void) startWaitingAnimation:(NSNotification *) aNotification {
-    [usernameValue setEnabled:NO];
-    [passwordValue setEnabled:NO];
-    usernameValue.textColor = [UIColor grayColor];
-    passwordValue.textColor = [UIColor grayColor];
-    animationAlert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Alert", @"Alert") message: NSLocalizedString(@"WaitingAnimation", @"WaitingAnimation")
-                                                   delegate:self cancelButtonTitle:nil otherButtonTitles: nil];
-
-    activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
-    activityIndicator.center = CGPointMake(145, 100);
-    [animationAlert addSubview:activityIndicator];
-    //[self.view addSubview:activityIndicator];
-    [activityIndicator startAnimating];
-    [animationAlert show];
-}
-
--(void) stopWaitingAnimation:(NSNotification *) aNotification {
-    [activityIndicator stopAnimating];
-    [animationAlert dismissWithClickedButtonIndex:0 animated:YES];
-    [animationAlert release];
-    [usernameValue setEnabled:YES];
-    [passwordValue setEnabled:YES];
-    usernameValue.textColor = funBlue;
-    passwordValue.textColor = funBlue;
-
-    NSNumber* notificationType = [[aNotification userInfo] objectForKey:@LOGIN_STATUS_NOTIFICATION_CODE];
-    int notification_type = [notificationType intValue];
-
-    if (notification_type != 0){
-        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Alert", @"Alert") message: NSLocalizedString(@"WaitingAnimationError", @"WaitingAnimationError")
-                                                       delegate:self cancelButtonTitle:nil otherButtonTitles: nil];
-        [alert show];
-        [alert release];
-    } else {
-        [activityIndicator removeFromSuperview];
-        [[self navigationController] popViewControllerAnimated:YES];
-    }
-
-}
-
-//AB 21 July 2010 - Add a 'Retrieve Creds Section'
 - (void)loadCredentials
 {
 	if (credentials)
@@ -137,42 +97,11 @@
 	[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];
-#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];
-
     [[FunambolAPI getInstance] loadSyncConfig:&URL username:&username password:&password];
 
     //smart dimension of the labels
@@ -211,21 +140,17 @@
 	passwordValue.secureTextEntry = YES;
     [passwordParameter addSubview:passwordValue];
 
-	//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];
-	//
+	
+	aboutButton = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"AboutButton"];
+	aboutButton.textLabel.text = NSLocalizedString(@"About Ubuntu One",@"About button in AccountView.mm");
+    aboutButton.textLabel.textAlignment = UITextAlignmentCenter;
 
     [self.tableView reloadData];
-
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                selector:@selector(stopWaitingAnimation:)
-                    name:@LOGIN_END_NOTIFICATION
-                  object:nil];
-
 }
 
 - (void) viewDidAppear:(BOOL) animated{
@@ -246,6 +171,22 @@
     }
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+	[super viewWillAppear:animated];
+	
+	if (self.presentedModally) {
+		self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Close",@"") style:UIBarButtonItemStyleDone target:self action:@selector(close:)] autorelease];
+	}
+	
+	[self updateSyncValue];
+	[self.tableView reloadData];
+}
+
+- (IBAction)close:(id)sender
+{
+	[self dismissModalViewControllerAnimated:YES];
+}
 
 - (void) viewWillDisappear:(BOOL) animated{
     showerror = true;
@@ -258,71 +199,112 @@
 
 }
 
-- (UITableViewCell *)tableView:(UITableView *)accountTable cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    if ([self isPortal]){
-        switch (indexPath.row) {
-            case 0:
-                return usernameParameter;
-            case 1:
-                return passwordParameter;
-            default:
-                break;
-        }
-    }else{
-		if (0 == indexPath.section) {
-			switch (indexPath.row) {
-				case 0:
-					return usernameParameter;
-				case 1:
-					return passwordParameter;
-				default:
-					break;
-			}
-		}else if (1 == indexPath.section){
+- (UITableViewCell *)tableView:(UITableView *)accountTable cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+	switch (indexPath.section)
+	{
+		case 0: //Username and Password
+		{
+			if (0 == indexPath.row)
+			{
+				return usernameParameter;
+			}
+			else if (1 == indexPath.row)
+			{
+				return passwordParameter;
+			}
+			break;
+		}
+		case 1: //Retrieve Credentials
+		{
 			return credentialsButton;
 		}
-
-    }
-    return nil;
+		case 2: //Sync Direction
+		{
+			static NSString* identifier = @"SyncWayIdentifier";
+			
+			UITableViewCell *cell = [self.tableView dequeueReusableCellWithIdentifier:identifier];
+			
+			if (nil == cell)
+			{
+				cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:identifier] autorelease];
+				cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+			}
+			
+			cell.textLabel.text = NSLocalizedString(@"Sync Direction",@"Sync Direction");
+			cell.detailTextLabel.text = [self friendlySyncValue];
+			
+			return cell;
+			
+			break;
+		}
+		case 3: //About
+		{
+			return aboutButton;
+		}
+		default:
+		{
+			return nil;
+			break;
+		}
+	}
 }
 
 - (NSInteger)tableView:(UITableView *)accountTable numberOfRowsInSection:(NSInteger)section {
-    if([self isPortal]){
-        return 2;
-    }else{
-		if (0 == section){
-			return 2;
-		}else{
-			return 1;
-		}
-    }
+    if (0 == section){
+		return 2;
+	}else {
+		return 1;
+	}
 }
 
 - (CGFloat)tableView:(UITableView *)accountTable heightForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    switch (indexPath.section) {
-
-        default:
-            return 45;
-            break;
-    }
-}
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)accountTable {
-#if 0 //AB 21 July 2010 - Add a 'Retrieve Creds Section'
-    return 1;
-#endif
-	return 2;
-}
-
-//AB 21 July 2010 - Add a 'Retrieve Creds Section'
+	return 45;
+}
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)accountTable
+{
+	return 4;
+}
+
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
+{
+	switch (section)
+	{
+		case 0:
+		{
+			return NSLocalizedString(@"Credentials",@"");
+			break;
+		}
+		case 2:
+		{
+			return NSLocalizedString(@"Sync Settings",@"");
+			break;
+		}
+		default:
+		{
+			return nil;
+			break;
+		}
+	}
+}
+
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-	if (1 == indexPath.section && 0 == indexPath.row)
+	if (1 == indexPath.section)
 	{
 		NSURL *credentialsURL = [NSURL URLWithString:@"https://one.ubuntu.com/phones/creds/ios"];
 		[tableView deselectRowAtIndexPath:indexPath animated:YES];
 		[[UIApplication sharedApplication] openURL:credentialsURL];
+	} else if (2 == indexPath.section) {
+		FastSyncMethodsView* syncMethodsViewController = [[[FastSyncMethodsView alloc] init] autorelease];
+		[syncMethodsViewController setSyncSourceName:@"addressbook"];
+		[syncMethodsViewController setSyncMode:self.syncValue];
+		[[self navigationController] pushViewController:syncMethodsViewController animated:YES];
+	} else if (3 == indexPath.section) {
+		AboutView *about = [[[AboutView alloc] init] autorelease];
+		[self.navigationController pushViewController:about animated:YES];
 	}
 }
 
@@ -353,17 +335,71 @@
     [usernameParameter release];
     [passwordParameter release];
 
-    [small_font release];
-
     [URL release];
 
+	self.credentials = NULL;
+	
+	self.syncValue = NULL;
+	
+	[credentialsButton release];
+	[aboutButton release];
 
-    [funBlue release];
     [username release];
     [password release];
     [super dealloc];
 }
 
-
-
 @end
+
+@implementation AccountView (Private)
+
+- (UITextField*)buildTextFieldWithFrame:(CGRect)aFrame text:(NSString*)text keyboardType:(UIKeyboardType)keyboardType returnKeyType:(UIReturnKeyType)returnKeyType
+{
+	UITextField *field = [[UITextField alloc] initWithFrame:aFrame];
+	field.borderStyle = UITextBorderStyleNone;
+	field.font = [UIFont systemFontOfSize:15];
+	field.exclusiveTouch = YES;
+	field.autocorrectionType = UITextAutocorrectionTypeNo;
+	field.text = text;
+	field.keyboardType = keyboardType;
+	field.returnKeyType = returnKeyType;
+	field.clearButtonMode = UITextFieldViewModeNever;
+	field.autocapitalizationType = UITextAutocapitalizationTypeNone;
+	field.textColor = [UIColor colorWithRed:FUNBLUE_RGB_RED green:FUNBLUE_RGB_GREEN blue:FUNBLUE_RGB_BLUE alpha:1.0];
+	field.contentVerticalAlignment =  UIControlContentVerticalAlignmentCenter;
+	field.delegate = self;
+	
+	return field;
+}
+
+- (NSString*)friendlySyncValue
+{
+	if ([syncValue isEqual:@"two-way"])
+	{
+		return NSLocalizedString(@"Two Way",@"Two Way");
+	}
+	else if ([syncValue isEqual:@"one-way-from-client"])
+	{
+		return NSLocalizedString(@"From Client",@"From Client");
+	}
+	else if ([syncValue isEqual:@"one-way-from-server"])
+	{
+		return NSLocalizedString(@"From Server",@"From Server");
+	}
+	else if ([syncValue isEqual:@"none"])
+	{
+		return NSLocalizedString(@"Disabled",@"Disabled");
+	}
+	else
+	{
+		return @"Unknown";
+	}
+}
+
+- (void)updateSyncValue
+{
+	NSString *sync = [[FunambolAPI getInstance] getSync:@"addressbook"];
+	self.syncValue = sync;
+	[sync release];
+}
+@end
\ No newline at end of file

=== removed file 'iPhoneApp/UI/src/CleanUpView.mm'
--- iPhoneApp/UI/src/CleanUpView.mm	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/src/CleanUpView.mm	1970-01-01 00:00:00 +0000
@@ -1,340 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc.
- * Copyright (C) 2008 Funambol, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- *
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-
-#import "CleanUpView.h"
-
-#import "spds/constants.h"
-#import "customs.h"
-#import "FunambolAPI.h"
-
-
-@implementation CleanUpView
-
-- (id) init {
-    self = [super init];
-	if (self)
-	{
-		// this title will appear in the navigation bar
-		self.title = NSLocalizedString(@"Clean Up",@"Clean Up");
-	}
-	return self;
-}    
-
-- (void) dealloc {
-    // TODO: destruct
-    
-    [super dealloc];
-}
-
-- (void) loadView{
-    
-    UIView *contentView = [[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]];
-	self.view = contentView;
-	[contentView release];
-	
-	self.view.autoresizesSubviews = YES;
-
-    small_font = [UIFont systemFontOfSize:15];
-    
-
-    cleanupTable = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStyleGrouped];
-    cleanupTable.delegate = self;
-    cleanupTable.dataSource = self;
-	//cleanupTable.rowHeight = 80;
-    [cleanupTable setAutoresizesSubviews:YES];
-    [cleanupTable setAutoresizingMask:UIViewAutoresizingFlexibleHeight + UIViewAutoresizingFlexibleBottomMargin];
-    
-    [self.view addSubview:cleanupTable]; 
-    
-    contactSyncCell      =   [[UITableViewCell alloc]init];
-    calendarSyncCell      =   [[UITableViewCell alloc]init];
-    noteSyncCell      =   [[UITableViewCell alloc]init];
-
-
-    descriptionCell      = [[UITableViewCell alloc] init];
-    descriptionCell.selectionStyle = UITableViewCellSelectionStyleNone; 
-    NSString* descriptionLabel = NSLocalizedString(@"Clean up Text", @"Clean up Text");
-    
-
-    int val = [descriptionLabel length];
-    val = (val / 20 ) * 15; 
-    if ( val < 50 ) {
-        val = 50;
-    }
-    heightRow = val + 20;
-    
-    
-
-    UITextView * description= [[UITextView alloc] initWithFrame: CGRectMake(20, 10, descriptionCell.contentView.bounds.size.width-40, val)];
-    description.text = descriptionLabel;    
-    
-    
-    [description setEditable:NO];
-    [description setFont:small_font];
-    [description setScrollEnabled:NO];
-    [description setAutoresizesSubviews:YES];
-    
-    [descriptionCell addSubview:description];
-
-
-    contactSyncCell.textLabel.text = NSLocalizedString(@"Contacts", @"Contacts...");
-    calendarSyncCell.textLabel.text = NSLocalizedString(@"Calendar", @"Calendar...");
-    noteSyncCell.textLabel.text = NSLocalizedString(@"Notes", @"Notes...");
-    
-    contactSync          =   [[UISwitch alloc] initWithFrame:CGRectMake(200.0, 10.0, 60.0, 30)];
-    [contactSync addTarget:self action:@selector(contactSyncAction:) forControlEvents:UIControlEventValueChanged];
-    [contactSync setOn:NO animated:NO];
-    
-    calendarSync          =   [[UISwitch alloc] initWithFrame:CGRectMake(200.0, 10.0, 60.0, 30)];
-    [calendarSync addTarget:self action:@selector(calendarSyncAction:) forControlEvents:UIControlEventValueChanged];
-    [calendarSync setOn:NO animated:NO];
-    
-    noteSync          =   [[UISwitch alloc] initWithFrame:CGRectMake(200.0, 10.0, 60.0, 30)];
-    [noteSync addTarget:self action:@selector(noteSyncAction:) forControlEvents:UIControlEventValueChanged];
-    [noteSync setOn:NO animated:NO];
-
-    [contactSyncCell addSubview:contactSync];
-    [calendarSyncCell addSubview:calendarSync];
-    [noteSyncCell addSubview:noteSync];
-    cleanupButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Yes",@"Yes...")
-                                                         style:UIBarButtonItemStylePlain
-                                                        target:self
-                                                        action:@selector(cleanupAction:)];    
-
-
-    self.navigationItem.rightBarButtonItem = cleanupButton;
-    [cleanupButton setEnabled:YES];
-    
-    
-    
-    [cleanupTable reloadData];
-}
-
-- (void) reload
-{
-}
-
-- (void) viewDidAppear:(BOOL)animated{
-    [self contactSyncAction:nil];
-}
-
-
-
-- (void) contactSyncAction: (id)sender
-{
-    if ([contactSync isOn])
-    {
-        contactFlag = true;
-    }
-    else
-    {
-        contactFlag = false;
-    }
-}
-
-- (void) calendarSyncAction: (id)sender
-{
-    if ([calendarSync isOn])
-    {
-        calendarFlag = true;
-    }
-    else
-    {
-        calendarFlag = false;
-    }
-}
-
-- (void) noteSyncAction: (id)sender
-{
-    if ([noteSync isOn])
-    {
-        noteFlag = true;
-    }
-    else
-    {
-        noteFlag = false;
-    }
-}
-
-- (void) cleanupAction: (id)sender
-{
-
-
-        bool contactNotSynced = false;
-
-        int sourcesnotsynced = 0;
-        
-        if(([[FunambolAPI getInstance]getSyncSourceLastSyncDate:@"addressbook"] == 0) && 
-           !([[[FunambolAPI getInstance]getSync:@"addressbook"]isEqualToString:@"none"])){
-            contactNotSynced = true;
-            sourcesnotsynced++;
-        }
-  
-        if(sourcesnotsynced > 0){
-            alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Alert", @"Alert")
-                                                message:NSLocalizedString(@"Want to cleanup notsynced sources",@"Want to cleanup notsynced sources")
-                                                delegate:self 
-                                                cancelButtonTitle:NSLocalizedString(@"OK",@"OK") 
-                                                otherButtonTitles:NSLocalizedString(@"Cancel",@"Cancel"), nil];
-            [alert show];
-            [alert release];
-
-        }else{
-            clickedCleanup = true;
-            [[self navigationController] popViewControllerAnimated:YES];
-        }
-    
-}
-
-- (void)alertView:(UIAlertView *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex
-{
-    // the user clicked one of the OK/Cancel buttons
-    if (buttonIndex == 0){//OK
-        clickedCleanup = true;
-        [[self navigationController] popViewControllerAnimated:YES];
-    }else{//Cancel
-        clickedCleanup = false;
-        [[self navigationController] popViewControllerAnimated:YES];
-    }
-}
-                              
-                              
-- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-    switch (indexPath.section) {
-        case 0:
-            return heightRow;
-        default:
-            return 40;
-        break;
-    }
-    cleanupTable.rowHeight;
-}
-
-- (UITableViewCell *)tableView:(UITableView *)contactsTable cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-	
-    switch (indexPath.section) {
-        case 0:
-            switch (indexPath.row) {
-                case 0:
-                    return descriptionCell;
-                default:
-                    break;
-            }
-            break;
-        case 1:
-            switch (indexPath.row) {
-                case 0:
-                    return contactSyncCell;
-                case 1:
-                    return calendarSyncCell;
-                case 2:
-                    return noteSyncCell;
-                default:
-                    break;
-            }
-            break;
-        default:
-
-            break;
-    }
-    
-    return nil;
-}
-
-- (void)tableView:(UITableView *)contactsTable didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
-    switch (indexPath.section) {
-        case 0:
-            // Cannot select description
-            [cleanupTable deselectRowAtIndexPath:indexPath animated:YES];
-            return;
-            break;
-        //case 1:
-        //    break;
-        default:
-            break;
-    }
-
-}
-
-- (NSInteger)tableView:(UITableView *)contactsTable numberOfRowsInSection:(NSInteger)section {
-        switch (section) {
-            case 0:
-                return 1;
-            case 1:
-                return 3;                    
-            default:
-                break;
-        }
-    return 0;//should never happen
-}
-
-
-
-- (void)viewWillAppear:(BOOL)animated
-{
-    clickedCleanup = false;
-
-	// this UIViewController is about to re-appear, make sure we remove the current selection in our table view
-	NSIndexPath *indexPath = [cleanupTable indexPathForSelectedRow];
-    if(!indexPath)
-        return;
-        
-	[cleanupTable deselectRowAtIndexPath:indexPath animated:NO];
-    
-}
-
-
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)contactsTable {
-        return 1;
-}
-
-- (bool) didClickCleanup
-{
-    return clickedCleanup;
-}
-
-- (bool) getContactFlag{
-    return contactFlag;
-}
-- (bool) getCalendarFlag{
-    return calendarFlag;
-}
-- (bool) getNoteFlag{
-    return noteFlag;
-}
-@end

=== removed file 'iPhoneApp/UI/src/ContactsSettingsView.mm'
--- iPhoneApp/UI/src/ContactsSettingsView.mm	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/src/ContactsSettingsView.mm	1970-01-01 00:00:00 +0000
@@ -1,388 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc.
- * Copyright (C) 2008 Funambol, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- *
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-
-#import <UIKit/UIKit.h>
-#import "ContactsSettingsView.h"
-#import "UIController.h"
-#import "FunambolAPI.h"
-#import "FastSyncMethodsView.h"
-
-#import "customs.h"
-
-
-@implementation ContactsSettingsView
-
-- (BOOL) isPathEnabled{
-    return false;
-}
-
-- (id) init {
-    self = [super init];
-	if (self)
-	{
-		// this title will appear in the navigation bar
-		self.title = NSLocalizedString(@"Contacts",@"Contacts");
-		menuList = [[NSMutableArray alloc] init];
-	}
-    funBlue = [[UIColor alloc] initWithRed:FUNBLUE_RGB_RED green:FUNBLUE_RGB_GREEN blue:FUNBLUE_RGB_BLUE alpha:1.0];
-	return self;
-}    
-    
-- (void) loadView{
-    
-    UIView *contentView = [[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]];
-	self.view = contentView;
-	[contentView release];
-    
-    FastSyncMethodsView* syncmethodsview = [[FastSyncMethodsView alloc] init];
-    NSString * mode = [[FunambolAPI getInstance] getSync:@"addressbook"];
-    [syncmethodsview setSyncSourceName:@"addressbook"];
-    [syncmethodsview setSyncMode:mode];
-
-    [menuList addObject:[NSDictionary dictionaryWithObjectsAndKeys:
-                         NSLocalizedString(@"Sync Methods", @""), @"title",
-                         syncmethodsview, @"viewController",
-                         nil]];
-	[syncmethodsview release];
-	
-	self.view.autoresizesSubviews = YES;
-
-    small_font = [UIFont systemFontOfSize:15];
-    
-    syncValue = [[FunambolAPI getInstance] getSync:@"addressbook"];
-    remoteURIValue = [[FunambolAPI getInstance] getURI:@"addressbook"];
-        
-    contactsTable = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStyleGrouped]; 
-	contactsTable.delegate = self;
-    contactsTable.dataSource = self;
-	contactsTable.rowHeight = 40;
-    [contactsTable reloadData];
-    
-    [self.view addSubview:contactsTable];
-    
-    contactSyncCell     =   [[UITableViewCell alloc]init];
-    syncWayCell         =   [[UITableViewCell alloc]init];
-    pathCell            =   [[UITableViewCell alloc]init];
-    remoteURICell       =   [[UITableViewCell alloc]init];
-    
-    path          =   [[UISwitch alloc] initWithFrame:CGRectMake(200.0, 10.0, 60.0, 30)];
-    [path addTarget:self action:@selector(pathAction:) forControlEvents:UIControlEventValueChanged];
-
-    pathCell.textLabel.text = NSLocalizedString(@"Sync", @"Sync");
-    [pathCell addSubview:path];
-    
-    contactSync       =   [[UISwitch alloc] initWithFrame:CGRectMake(200.0, 10.0, 60.0, 30)];
-    [contactSync addTarget:self action:@selector(contactSyncAction:) forControlEvents:UIControlEventValueChanged];
-    if([mode isEqualToString:@"none"]){
-        [contactSync setOn:NO animated:NO];
-    }else{
-        [contactSync setOn:YES animated:NO];
-    }
-    
-    contactSyncCell.textLabel.text = NSLocalizedString(@"Sync", @"Sync");
-    [contactSyncCell addSubview:contactSync];
-    
-    [syncWayCell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator];
-    syncWayCell.textLabel.text = NSLocalizedString(@"Sync Direction",@"Sync Direction");
-    syncWayLabel = [[UILabel alloc] initWithFrame:CGRectMake(140.0, 7.0, 140.0, 25.0)];
-    if([syncValue isEqualToString:@"two-way"]){
-        [syncWayLabel setText:NSLocalizedString(@"Two Way",@"Two Way")];
-    }else if([syncValue isEqualToString:@"one-way-from-client"]){
-        [syncWayLabel setText:NSLocalizedString(@"From Client",@"From Client")];
-    }else if([syncValue isEqualToString:@"one-way-from-server"]){
-        [syncWayLabel setText:NSLocalizedString(@"From Server",@"From Server")];
-    }else if([syncValue isEqualToString:@"none"]){
-        [syncWayLabel setText:NSLocalizedString(@"Disabled",@"Disabled")];
-    }
-    [syncWayLabel setTextColor:funBlue];
-    [syncWayLabel setFont:small_font];
-    [syncWayLabel setTextAlignment:UITextAlignmentRight];
-    
-    [syncWayCell addSubview:syncWayLabel];
-    
-    
-    remoteURI = [[UITextField alloc] initWithFrame:CGRectMake(140.0,11.0, 160.0, 25.0)];
-    remoteURI.borderStyle = UITextBorderStyleNone;
-    remoteURI.textColor = funBlue;
-    remoteURI.font = small_font;
-    [remoteURI setTextAlignment:UITextAlignmentRight];
-    remoteURI.autocorrectionType = UITextAutocorrectionTypeNo;
-    remoteURI.text = remoteURIValue;
-    remoteURI.backgroundColor = [UIColor whiteColor];
-    remoteURI.keyboardType = UIKeyboardTypeDefault;
-    remoteURI.returnKeyType = UIReturnKeyDone;
-    remoteURI.clearButtonMode = UITextFieldViewModeNever;
-    [remoteURI addTarget:self action:@selector(remoteURIAction:) forControlEvents:UIControlEventAllEditingEvents];
-    remoteURICell.textLabel.text = NSLocalizedString(@"Remote URI", @"Remote URI");
-    [remoteURICell setSelectionStyle:UITableViewCellSelectionStyleNone];
-    [remoteURICell addSubview:remoteURI];
-    
-
-    companyDirectory      =   [[UISwitch alloc] initWithFrame:CGRectMake(200.0, 10.0, 60.0, 30)];
-    [companyDirectory     addTarget:self action:@selector(companyDirectoryAction:) forControlEvents:UIControlEventValueChanged];
-    [companyDirectory     setOn:(
-                            ([remoteURI.text length] >= [@"-shared" length])
-                            &&
-                                ([
-                                    [remoteURI.text substringFromIndex:
-                                        ([remoteURI.text length] - ([@"-shared" length]))]
-                                compare:@"-shared"]
-                                 == 0)
-                            )
-                          animated:NO];
-    
-    companyDirectoryCell  =   [[UITableViewCell alloc]init];
-    companyDirectoryCell.textLabel.text = NSLocalizedString(@"Company Directory", @"Company Directory");
-    [companyDirectoryCell addSubview:companyDirectory];   
-    if (CUSTOM_CONTACTS_COMPANY_DIRECTORY) { // BEGIN CUSTOM
-        remoteURI.enabled = false;
-        remoteURI.textColor = [UIColor grayColor];
-    } // END CUSTOM
-    [mode release];
-}
-
-
-
-//TABLE VIEW
-
-- (UITableViewCell *)tableView:(UITableView *)contactsTable cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-        switch (indexPath.section) {
-            case 0:
-                switch (indexPath.row) {
-                    case 0:
-                        return syncWayCell;
-                    default:
-                        break;
-                }
-                break;
-            case 1:
-            {
-                if ([self isPathEnabled]){
-                    switch (indexPath.row) {
-                        case 0:
-                            return pathCell;
-                        case 1:
-                            return remoteURICell;
-                        default:
-                            break;
-                    }
-                }else{
-                    switch (indexPath.row) {
-                        case 0:
-                            return remoteURICell;
-                        default:
-                            break;
-                    }
-                }
-            
-                // This will always be last, so we dont need more switches
-                if (CUSTOM_CONTACTS_COMPANY_DIRECTORY) { // BEGIN CUSTOM
-                    return companyDirectoryCell;
-                } // END CUSTOM
-            }
-                break;
-            default:
-                break;
-        }
-    return nil;
-}
-
-- (void)tableView:(UITableView *)contactsTable didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
-    UIViewController *targetViewController;
-    NSString * mode;
-        switch (indexPath.section) {
-            case 0:
-                switch (indexPath.row) {
-                    case 0:
-                        targetViewController = [[menuList objectAtIndex: 0] objectForKey:@"viewController"];
-                        mode = [[FunambolAPI getInstance] getSync:@"addressbook"];
-                        [((SyncMethodsView*)targetViewController) setSyncMode:mode];
-                        [mode release];
-                        [[self navigationController] pushViewController:targetViewController animated:YES];
-                        break;
-                    default:
-                        break;
-                }
-                break;
-            default:
-                break;
-        }
-
-}
-
-- (NSInteger)tableView:(UITableView *)contactsTable numberOfRowsInSection:(NSInteger)section {
-
-        switch (section) {
-            case 0:
-                return 1;
-            case 1:
-                {
-                    int size = 1;
-                    if (CUSTOM_CONTACTS_COMPANY_DIRECTORY) { // BEGIN CUSTOM
-                        size++;
-                    } // END CUSTOM
-                    if ([self isPathEnabled]) {
-                        size++;
-                    }
-                    return size;
-                }
-                break;
-            default:
-                break;
-            }         
-    return 0;//should never happen
-}
-
-
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)contactsTable {
-        return 2;
-}
-
-- (void) pathAction: (id)sender{
-    
-}
-
-- (void) remoteURIAction: (id)sender{
-    
-    [[FunambolAPI getInstance] setURI:remoteURI.text syncsourcename:@"addressbook"];
-    
-}
-
-- (void) contactSyncAction: (id)sender{
-    if([contactSync isOn]){
-        [[FunambolAPI getInstance]setSync:@"two-way" source: @"addressbook"];
-        syncWayCell.textLabel.textColor = [UIColor blackColor];
-        
-        [syncWayLabel setText:NSLocalizedString(@"Two Way", @"Two Way")];
-    }else {
-        [[FunambolAPI getInstance]setSync:@"none" source: @"addressbook"];
-        syncWayCell.textLabel.textColor = [UIColor grayColor];
-        [syncWayLabel setText:NSLocalizedString(@"Disabled", @"Disabled")];
-    }
-    
-
-}
-
-- (void) companyDirectoryAction: (id)sender {
-    if ([companyDirectory isOn])
-    {
-        if ([remoteURI.text length] < [@"-shared" length] ||
-            [
-                [remoteURI.text substringFromIndex:
-                    ([remoteURI.text length] - ([@"-shared" length]))]
-            compare:@"-shared"]
-            != 0)
-        {
-            remoteURI.text = [NSString stringWithFormat:@"%@%@", remoteURI.text, @"-shared"];
-        }
-    }
-    else
-    {
-        if ([remoteURI.text length] > [@"-shared" length] &&
-        [[remoteURI.text substringFromIndex:([remoteURI.text length] - ([@"-shared" length]))] compare:@"-shared"] == 0)
-        {
-            remoteURI.text = [remoteURI.text substringToIndex:([remoteURI.text length] - ([@"-shared" length]))];
-        }
-    }
-    
-    [[FunambolAPI getInstance] setURI:remoteURI.text syncsourcename:@"addressbook"];
-
-}
-
-- (void)viewDidAppear:(BOOL)animated{
-    NSString * mode = [[FunambolAPI getInstance] getSync:@"addressbook"];
-    if([mode isEqualToString:@"none"]){
-        [contactSync setOn:NO animated:YES];
-        syncWayCell.textLabel.textColor = [UIColor grayColor];
-    }else{
-        [contactSync setOn:YES animated:YES];
-        syncWayCell.textLabel.textColor = [UIColor blackColor];
-    }
-
-    if([mode isEqualToString:@"two-way"]){
-        [syncWayLabel setText:NSLocalizedString(@"Two Way",@"Two Way")];
-    }else if([mode isEqualToString:@"one-way-from-client"]){
-        [syncWayLabel setText:NSLocalizedString(@"From Client",@"From Client")];
-    }else if([mode isEqualToString:@"one-way-from-server"]){
-        [syncWayLabel setText:NSLocalizedString(@"From Server",@"From Server")];
-    }else if([mode isEqualToString:@"none"]){
-        [syncWayLabel setText:NSLocalizedString(@"Disabled",@"Disabled")];
-    }
-    [mode release];
-    
-    
-}
-
-- (void)viewWillAppear:(BOOL)animated
-{
-	// this UIViewController is about to re-appear, make sure we remove the current selection in our table view
-	NSIndexPath *indexPath = [contactsTable indexPathForSelectedRow];
-	[contactsTable deselectRowAtIndexPath:indexPath animated:NO];
-}
-
-- (void) dealloc {
-    [contactsTable release];
-    
-    [contactSyncCell release];
-    [syncWayCell release];
-    [remoteURICell release];
-    [pathCell release];
-    
-    [syncValue release];
-    [remoteURIValue release];
-    
-    [contactSync release];
-    [remoteURI release];
-    [path release];
-    [menuList release];
-    
-    [small_font release];
-    
-    [funBlue release];
-    [syncWayLabel release];
-    
-    [companyDirectory release];
-    [companyDirectoryCell release];
-    
-    
-    [super dealloc];
-}
-
-- (void) reload {
-
-}
-@end

=== removed file 'iPhoneApp/UI/src/LogLevelView.mm'
--- iPhoneApp/UI/src/LogLevelView.mm	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/src/LogLevelView.mm	1970-01-01 00:00:00 +0000
@@ -1,231 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc.
- * Copyright (C) 2008 Funambol, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- *
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-
-#import <UIKit/UIKit.h>
-
-
-#import "common.h"
-#import "LogLevelView.h"
-#import "base/Log.h"
-#import "UIController.h"
-#import "FunambolAPI.h"
-
-@implementation LogLevelView
-
-- (id)init {
-	self = [super init];
-	if (self)
-	{
-		// this title will appear in the navigation bar
-		self.title = NSLocalizedString(@"LogLevel",@"LogLevel") ;
-	}
-	return self;
-}
-
-- (void) loadView{
-    UIView *contentView = [[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]];
-	self.view = contentView;    
-  
-    errorCell   =   [[UITableViewCell alloc]init];
-    errorCell.textLabel.text = NSLocalizedString(@"Error",@"Error") ;
-    infoCell    =   [[UITableViewCell alloc]init];
-    infoCell.textLabel.text = NSLocalizedString(@"Info",@"Info");
-    debugCell   =   [[UITableViewCell alloc]init];
-    debugCell.textLabel.text = NSLocalizedString(@"Debug",@"Debug");
-    int loglevelValue = [[FunambolAPI getInstance] getLogLevel];
-
-    switch (loglevelValue) {
-        case 0:
-            [errorCell setAccessoryType:UITableViewCellAccessoryCheckmark];
-            [infoCell setAccessoryType:UITableViewCellAccessoryNone];
-            [debugCell setAccessoryType:UITableViewCellAccessoryNone];
-            break;
-        case 1:
-            [infoCell setAccessoryType:UITableViewCellAccessoryCheckmark];
-            [errorCell setAccessoryType:UITableViewCellAccessoryNone];
-            [debugCell setAccessoryType:UITableViewCellAccessoryNone];
-            break;
-        case 2:
-            [debugCell setAccessoryType:UITableViewCellAccessoryCheckmark];
-            [infoCell setAccessoryType:UITableViewCellAccessoryNone];
-            [errorCell setAccessoryType:UITableViewCellAccessoryNone];
-            break;
-        default:
-            break;
-    }
-    
-    
-    logTable = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStyleGrouped]; 
-	logTable.delegate = self;
-    logTable.dataSource = self;
-	logTable.rowHeight = 40;
-    [logTable reloadData];
-    
-    [self.view addSubview:logTable];
-    
-}
-
-//TABLE VIEW
-
-- (void)viewWillAppear:(BOOL)animated
-{
-	// this UIViewController is about to re-appear, make sure we remove the current selection in our table view
-	NSIndexPath *tableSelection = [logTable indexPathForSelectedRow];
-	[logTable deselectRowAtIndexPath:tableSelection animated:NO];
-}
-
-- (void)tableView:(UITableView *)settingsTable didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
- switch (indexPath.row) {
-     case 0:
-         [self errorAction:nil];
-         break;
-     case 1:
-         [self infoAction:nil];
-         break;
-     case 2:
-         [self debugAction:nil];
-         break;
-     default:
-         break;
- }   
-}
-/*
-- (UITableViewCellAccessoryType)tableView:(UITableView *)logTable accessoryTypeForRowWithIndexPath:(NSIndexPath *)indexPath
-{
-    int loglevelValue = [[FunambolAPI getInstance] getLogLevel];
-    switch (indexPath.row) {
-        case 0:
-            if (loglevelValue == 0 ){
-                return UITableViewCellAccessoryCheckmark;
-            }else{
-                return UITableViewCellAccessoryNone;
-            }
-            case 1:
-            if (loglevelValue == 1 ){
-                return UITableViewCellAccessoryCheckmark;
-            }else{
-                return UITableViewCellAccessoryNone;
-            }
-        case 2:
-            if (loglevelValue == 2 ){
-                return UITableViewCellAccessoryCheckmark;
-            }else{
-                return UITableViewCellAccessoryNone;
-            }
-            
-        default:
-            break;
-    }
-    return UITableViewCellAccessoryNone;
-}*/
-
-- (UITableViewCell *)tableView:(UITableView *)logTable cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-	
-        switch (indexPath.section) {
-                //account table section
-            case 0:
-                switch (indexPath.row) {
-                    case 0:
-                        return errorCell;
-                    case 1:
-                        return infoCell;
-                    case 2:
-                        return debugCell;
-                    default:
-                        break;
-                }
-            default:
-                break;
-        }
-    return nil;
-}
-
-- (NSInteger)tableView:(UITableView *)logTable numberOfRowsInSection:(NSInteger)section {
-
-    return 3;
-}
-
-
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)logTable {
-    return 1;
-}
-
-- (void)reload {
-    [self init];
-}
-
-- (void)backAction:(id)sender
-{
-}
-
-
-- (void)errorAction:(id)sender
-{
-    [errorCell setAccessoryType:UITableViewCellAccessoryCheckmark];
-    [infoCell setAccessoryType:UITableViewCellAccessoryNone];
-    [debugCell setAccessoryType:UITableViewCellAccessoryNone];
-	[[FunambolAPI getInstance] setLogLevel:0];
-    
-}
-
-- (void)infoAction:(id)sender
-{
-    
-    [errorCell setAccessoryType:UITableViewCellAccessoryNone];
-    [infoCell  setAccessoryType:UITableViewCellAccessoryCheckmark];
-    [debugCell setAccessoryType:UITableViewCellAccessoryNone];
-	[[FunambolAPI getInstance] setLogLevel:1];
-}
-
-- (void)debugAction:(id)sender
-{
-    
-    [errorCell setAccessoryType:UITableViewCellAccessoryNone];
-    [infoCell setAccessoryType:UITableViewCellAccessoryNone];
-    [debugCell  setAccessoryType:UITableViewCellAccessoryCheckmark];
-    [[FunambolAPI getInstance] setLogLevel:2];
-}
-
-- (void) dealloc{
-    [logTable release];
-    
-    [infoCell release];
-    [debugCell release];
-    [errorCell release];
-    [super dealloc]; 
-}
-@end

=== removed file 'iPhoneApp/UI/src/LogSettingsView.mm'
--- iPhoneApp/UI/src/LogSettingsView.mm	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/src/LogSettingsView.mm	1970-01-01 00:00:00 +0000
@@ -1,357 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc.
- * Copyright (C) 2008 Funambol, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- *
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-
-#import <UIKit/UIKit.h>
-
-
-#import "common.h"
-#import "LogSettingsView.h"
-#import "base/Log.h"
-#import "UIController.h"
-#import "LogLevelView.h"
-#import "LogView.h"
-#import "customs.h"
-#import "base/util/StringBuffer.h"
-#import "stringUtils.h"
-#import "FunambolAPI.h"
-
-
-
-@implementation LogSettingsView
-
-- (BOOL) isSendLogEnabled{
-    return (CUSTOM_SEND_LOG != 0);
-}
-
-- (id)init {	self = [super init];
-	if (self)
-	{
-		// this title will appear in the navigation bar
-		self.title = NSLocalizedString(@"Log",@"Log");
-		
-		menuList = [[NSMutableArray alloc] init];
-	}
-    funBlue = [[UIColor alloc] initWithRed:FUNBLUE_RGB_RED green:FUNBLUE_RGB_GREEN blue:FUNBLUE_RGB_BLUE alpha:1.0];
-	return self;
-}
-
-- (void) loadView{
-    UIView *contentView = [[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]];
-	self.view = contentView;
-	[contentView release];
-    small_font = [UIFont systemFontOfSize:15];
-    logLevelLabel = [[UILabel alloc] initWithFrame:CGRectMake(140.0, 7.0, 140.0, 25.0)];
-
-    int loglevelValue = [[FunambolAPI getInstance] getLogLevel];
-    if (loglevelValue == 0 ){
-        [logLevelLabel setText:NSLocalizedString(@"Error",@"Error")];
-    }else if (loglevelValue == 1 ){
-        [logLevelLabel setText:NSLocalizedString(@"Info",@"Info")];
-    }else if (loglevelValue == 2 ){
-        [logLevelLabel setText:NSLocalizedString(@"Debug",@"Debug")];
-    }
-    
-    [logLevelLabel setTextColor:funBlue];
-    [logLevelLabel setFont:small_font];
-    [logLevelLabel setTextAlignment:UITextAlignmentRight];
-    
-	self.view.autoresizesSubviews = YES;
-    
-    LogLevelView* loglevelview = [[LogLevelView alloc] init];
-    [menuList addObject:[NSDictionary dictionaryWithObjectsAndKeys:
-                         NSLocalizedString(@"Account", @""), @"title",
-                         loglevelview, @"viewController",
-                         nil]];
-	[loglevelview release];
-    
-    LogView* logview = [[LogView alloc] init];
-    [menuList addObject:[NSDictionary dictionaryWithObjectsAndKeys:
-                         NSLocalizedString(@"Account", @""), @"title",
-                         logview, @"viewController",
-                         nil]];
-	[logview release];
-    
-
-    logTable = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStyleGrouped]; 
-	logTable.delegate = self;
-    logTable.dataSource = self;
-	logTable.rowHeight = 40;
-    [logTable reloadData];
-    
-    
-    viewLogCell = [[UITableViewCell alloc]init];
-    viewLogCell.textLabel.text = NSLocalizedString(@"View Log",@"ViewLog");
-    [viewLogCell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator];
-      
-    sendLogCell = [[UITableViewCell alloc]init];
-    sendLogCell.textLabel.text = NSLocalizedString(@"Send Log",@"Send Log");
-    [sendLogCell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator];
-    
-    logLevelCell = [[UITableViewCell alloc]init];
-    logLevelCell.textLabel.text = NSLocalizedString(@"LogLevel",@"Log Level");
-    [logLevelCell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator];
-    [logLevelCell addSubview:logLevelLabel];
-    
-    [self.view addSubview:logTable];
-
-}
-
-//TABLE VIEW
-
-- (UITableViewCell *)tableView:(UITableView *)logTable cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-	
-    if([self isSendLogEnabled]){ 
-        switch (indexPath.section) {
-                //account table section
-            case 0:
-                switch (indexPath.row) {
-                    case 0:
-                        return logLevelCell;
-                    default:
-                        break;
-                }
-                break;
-                //sources table section
-            case 1:
-                switch (indexPath.row) {
-                    case 0:
-                        return viewLogCell;
-                    case 1:
-                        return sendLogCell;
-                    default:
-                        break;
-                }
-            default:
-                break;
-        }
-    }else{
-        switch (indexPath.section) {
-                //account table section
-            case 0:
-                switch (indexPath.row) {
-                    case 0:
-                        return logLevelCell;
-                    default:
-                        break;
-                }
-                break;
-                //sources table section
-            case 1:
-                switch (indexPath.row) {
-                    case 0:
-                        return viewLogCell;
-                    default:
-                        break;
-                }
-            default:
-                break;
-        }
-    }
-    return nil;
-}
-
-- (void)viewWillAppear:(BOOL)animated
-{
-	// this UIViewController is about to re-appear, make sure we remove the current selection in our table view
-	NSIndexPath *tableSelection = [logTable indexPathForSelectedRow];
-	[logTable deselectRowAtIndexPath:tableSelection animated:NO];
-}
-
-- (void)tableView:(UITableView *)logTable didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
-    UIViewController *targetViewController;
-    if([self isSendLogEnabled]){
-        switch (indexPath.section) {
-            case 0:
-                switch (indexPath.row) {
-                    case 0:
-                        targetViewController = [[menuList objectAtIndex: 0] objectForKey:@"viewController"];
-                        [[self navigationController] pushViewController:targetViewController animated:YES];
-                        break;
-                    default:
-                        break;
-                }
-                break;
-            case 1:
-                switch (indexPath.row) {
-                    case 0:
-                        targetViewController = [[menuList objectAtIndex: 1] objectForKey:@"viewController"];
-                        [[self navigationController] pushViewController:targetViewController animated:YES];
-                        break;
-                    case 1:
-                        [self sendLogAction:self];
-                        break;
-                    default:
-                        break;
-                }
-                break;
-            default:
-                break;
-        }
-    }else{
-        switch (indexPath.section) {
-            case 0:
-                switch (indexPath.row) {
-                    case 0:
-                        targetViewController = [[menuList objectAtIndex: 0] objectForKey:@"viewController"];
-                        [[self navigationController] pushViewController:targetViewController animated:YES];
-                        break;
-                    default:
-                        break;
-                }
-                break;
-            case 1:
-                switch (indexPath.row) {
-                    case 0:
-                        targetViewController = [[menuList objectAtIndex: 1] objectForKey:@"viewController"];
-                        [[self navigationController] pushViewController:targetViewController animated:YES];
-                        break;
-                    default:
-                        break;
-                }
-                break;
-            default:
-                break;
-        }
-    }
-}
-- (NSInteger)tableView:(UITableView *)logTable numberOfRowsInSection:(NSInteger)section {
-    if([self isSendLogEnabled]){
-        switch (section) {
-            case 0:
-                return 1;
-            case 1:
-                return 2;
-            default:
-                break;
-        }
-    }else{
-        switch (section) {
-            case 0:
-                return 1;
-            case 1:
-                return 1;
-            default:
-                break;
-        }
-    }
-    return 0;//should never happen
-}
-
-
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)logTable {
-    return 2;
-}
-
-- (void)reload {
-}
-
-- (void) dealloc{
-    [logTable release];
-    
-    [logLevelCell release];
-    [viewLogCell release];
-    [sendLogCell release];
-    
-    [small_font release];
-    [logLevelLabel release];
-    [funBlue release];
-    
-    [menuList release];
-    [super dealloc];
-    
-}
-
-- (void)sendLogAction:(id)sender {
-    NSString *documentsDirectory = getiphoneHomeDir();
-    
-    NSString *s = [NSString stringWithFormat:@"%@/synclog.txt",documentsDirectory];
-    
-    NSFileHandle *logFile = [NSFileHandle fileHandleForReadingAtPath:s];
-    NSString *logString;
-
-    if (logFile != nil) {
-        NSData *logData = [logFile readDataToEndOfFile];
-        [logFile closeFile];
-        logString = [[NSString alloc] initWithData:logData encoding:1];
-        Funambol::StringBuffer logs([logString UTF8String]);
-        [logString release];
-        logs.replaceAll("<", "&lt;",0);
-        logs.replaceAll(">", "&gt;",0);
-        logString = [[NSString alloc] initWithCString:logs.c_str()];
-    } else {
-        logString = @"Cannot open log";
-    }
-    
-    NSString * to      = NSLocalizedString(@"Send To",      @"Send To");
-    NSString * subj    = NSLocalizedString(@"Sending Logs", @"Sending Logs");
-    
-    CFStringRef cto    = CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (const CFStringRef)to,        CFSTR(""), CFSTR(""), kCFStringEncodingUTF8);
-    CFStringRef csubj  = CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (const CFStringRef)subj,      CFSTR(""), CFSTR(""), kCFStringEncodingUTF8);
-    CFStringRef cbody  = CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (const CFStringRef)logString, CFSTR(""), CFSTR(""), kCFStringEncodingUTF8);
-    
-    NSString * url     = [NSString stringWithFormat:@"mailto:%@?subject=%@&body=%@", (NSString*)cto, (NSString*)csubj, (NSString*)cbody];
-    NSURL * URL        = [NSURL URLWithString:url];
-    
-    [logString release];
-    
-    CFRelease(cto);
-    CFRelease(csubj);
-    CFRelease(cbody);
-    
-    if (URL)
-    {
-        [[UIApplication sharedApplication] openURL:URL];
-    }
-    else
-    {
-        [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Alert", @"Alert") message:NSLocalizedString(@"Cannot Send Logs", @"Cannot Send Logs")
-        delegate:self cancelButtonTitle:NSLocalizedString(@"OK", @"OK") otherButtonTitles: nil];
-    }
-}
-
--(void)viewDidAppear:(BOOL)animated{
-    int loglevelValue = [[FunambolAPI getInstance] getLogLevel];
-    if (loglevelValue == 0 ){
-        [logLevelLabel setText:NSLocalizedString(@"Error",@"Error")];
-    }else if (loglevelValue == 1 ){
-        [logLevelLabel setText:NSLocalizedString(@"Info",@"Info")];
-    }else if (loglevelValue == 2 ){
-        [logLevelLabel setText:NSLocalizedString(@"Debug",@"Debug")];
-    }
-}
-
-@end

=== removed file 'iPhoneApp/UI/src/LogView.mm'
--- iPhoneApp/UI/src/LogView.mm	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/src/LogView.mm	1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc.
- * Copyright (C) 2008 Funambol, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- *
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-
-#import <UIKit/UIKit.h>
-
-#import "common.h"
-#import "LogView.h"
-#import "base/Log.h"
-#import "UIController.h"
-#import "stringUtils.h"
-
-@implementation LogView
-
-- (id)init {
-
-	self = [super init];
-	if (self)
-	{
-		// this title will appear in the navigation bar
-		self.title = NSLocalizedString(@"View Log",@"View Log");
-
-	}
-	return self;
-}
-
-- (void) loadView{
-    UIView *contentView = [[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]];
-	self.view = contentView;    
-    small_font = [UIFont systemFontOfSize:10];
-
-    logTextView = [UITextView alloc];
-    [logTextView initWithFrame: self.view.bounds];
-
-    [self reload];
-
-    [logTextView setEditable:NO];
-    [logTextView setFont:small_font];
-    [self.view addSubview:logTextView];
-}
-
-- (void)viewWillAppear:(BOOL)animated
-{
-    NSString *documentsDirectory = getiphoneHomeDir();
-    
-    NSString *s = [NSString stringWithFormat:@"%@/synclog.txt",documentsDirectory];
-    
-    NSFileHandle *logFile = [NSFileHandle fileHandleForReadingAtPath:s];
-    NSString *logString;
-    
-    if (logFile != nil) {
-        NSData *logData = [logFile readDataToEndOfFile];
-        [logFile closeFile];
-        logString = [[NSString alloc] initWithData:logData encoding:1];
-    } else {
-        logString = @"Cannot open log";
-    }
-    
-    [logTextView setText:logString];
-}
-
-- (void)reload {
-    
-    NSString *documentsDirectory = getiphoneHomeDir();
-    
-    NSString *s = [NSString stringWithFormat:@"%@/synclog.txt",documentsDirectory];
-    
-    NSFileHandle *logFile = [NSFileHandle fileHandleForReadingAtPath:s];
-    NSString *logString;
-
-    if (logFile != nil) {
-        NSData *logData = [logFile readDataToEndOfFile];
-        [logFile closeFile];
-        logString = [[NSString alloc] initWithData:logData encoding:1];
-    } else {
-        logString = @"Cannot open log";
-    }
-    
-    [logTextView setText:logString];
-}
-
--(void) dealloc{
-    [logTextView release];
-    [small_font release];
-    [super dealloc];
-}
-
-@end

=== removed file 'iPhoneApp/UI/src/LoginManager.mm'
--- iPhoneApp/UI/src/LoginManager.mm	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/src/LoginManager.mm	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc.
- * Copyright (C) 2010 Funambol, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- *
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-#import "LoginManager.h"
-
-@implementation LoginManager
-
-- (id) init 
-{
-	return [super init];
-}
-
-- (BOOL) login
-{
-    return YES;
-}
-
-- (void)dealloc 
-{
-    [super dealloc];
-}
-
-- (void) setCredentials:(NSString*) value{
-    credentials = value;
-}
-
-@end

=== modified file 'iPhoneApp/UI/src/MainSingleView.mm'
--- iPhoneApp/UI/src/MainSingleView.mm	2010-08-16 07:13:14 +0000
+++ iPhoneApp/UI/src/MainSingleView.mm	2010-08-20 00:36:44 +0000
@@ -38,7 +38,6 @@
 #import "common.h"
 #import "MainSingleView.h"
 #import "AccountView.h"
-#import "SettingsSingleView.h"
 #import "base/Log.h"
 #import "UIController.h"
 #import "FunambolAPI.h"
@@ -54,47 +53,31 @@
 @implementation MainSingleView
 
 - (id)init {
-    
-    syncContactText = nil;
-    self = [super init];
-	if (self)
-	{
-		// this title will appear in the navigation bar
+	if (self = [super init]) {
 		self.title = NSLocalizedString(@"AppName",@"Funambol");
-		menuList = [[NSMutableArray alloc] init];
+		syncContactText = nil;
 	}
 	return self;
 }
 
-- (void) didReceiveMemoryWarning{
+- (void)didReceiveMemoryWarning {
     
     [super didReceiveMemoryWarning];
-    LOG.error("Memory Warning!!!");
-    //exit(-2);//TODO remove!
-    
+    LOG.error("Memory Warning!!!");    
 }
 
 - (void) loadView{
     UIView *contentView = [[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]];
 	self.view = contentView;
 	[contentView release];
-    
-    SettingsSingleView* settingsview = [[SettingsSingleView alloc]init];
-    [menuList addObject:[NSMutableDictionary dictionaryWithObjectsAndKeys:
-                         NSLocalizedString(@"Settings", @""), @"title",
-                         settingsview, @"viewController",
-                         nil]];
-    [settingsview release];
-    
-    
+        
     if (credentials) {
         AccountView* accountview = [[AccountView alloc]init];
         [accountview setCredentials:credentials];
         [[self navigationController] pushViewController:accountview animated:NO];        
     } else {
         if ([self checkConfigCredentials] == YES) {
-            AccountView* accountview = [[AccountView alloc]init];
-            //[accountview setCredentials:nil];
+            AccountView* accountview = [[AccountView alloc] init];
             [[self navigationController] pushViewController:accountview animated:NO];
         }
     }
@@ -287,9 +270,9 @@
 
 - (void)settingsAction:(id)sender
 {
-	UIViewController *targetViewController = [[menuList objectAtIndex: 0] objectForKey:@"viewController"];
-	
-	UINavigationController *nav = [[[UINavigationController alloc] initWithRootViewController:targetViewController] autorelease];
+	AccountView *settings = [[[AccountView alloc] init] autorelease];
+	settings.presentedModally = YES;
+	UINavigationController *nav = [[[UINavigationController alloc] initWithRootViewController:settings] autorelease];
 	nav.navigationBar.barStyle = UIBarStyleBlackOpaque;
 	nav.modalTransitionStyle = UIModalTransitionStyleFlipHorizontal;
 	[self presentModalViewController:nav animated:YES];

=== removed file 'iPhoneApp/UI/src/RecoverSyncMethodsView.mm'
--- iPhoneApp/UI/src/RecoverSyncMethodsView.mm	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/src/RecoverSyncMethodsView.mm	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc. 
- * Copyright (C) 2008 Funambol, Inc.
- * 
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission 
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE 
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU Affero General Public License 
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- * 
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite 
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- * 
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- * 
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably 
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-#import "RecoverSyncMethodsView.h"
-
-#import "FunambolAPI.h"
-
-@implementation RecoverSyncMethodsView
-
-- (id)init
-{
-    NSMutableArray * defaultModes = [[NSMutableArray alloc] init];
-    [defaultModes addObject:@"recover-from-server"];
-    [defaultModes addObject:@"recover-from-client"];
-    self = [super initWithModes: defaultModes];
-    return self;
-}
-
-- (id)initWithModes:(NSArray*)syncModes {
-	self = [super initWithModes:syncModes];
-	return self;
-}
-
-- (void)recoverFromServerAction:(id)sender
-{
-    [[FunambolAPI getInstance] setRecoverMode:@"recover-from-server"];
-}
-
-- (void)recoverFromClientAction:(id)sender
-{
-    [[FunambolAPI getInstance] setRecoverMode:@"recover-from-client"];
-}
-@end

=== removed file 'iPhoneApp/UI/src/RecoverView.mm'
--- iPhoneApp/UI/src/RecoverView.mm	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/src/RecoverView.mm	1970-01-01 00:00:00 +0000
@@ -1,339 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc.
- * Copyright (C) 2008 Funambol, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- *
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-
-#import "RecoverView.h"
-
-#import "RecoverSyncMethodsView.h"
-
-#import "CoreGraphics/CoreGraphics.h"
-
-#import "spds/constants.h"
-
-
-@implementation RecoverView
-
-- (id) init {
-    self = [super init];
-	if (self)
-	{
-		// this title will appear in the navigation bar
-		self.title = NSLocalizedString(@"Recover",@"Recover");
-		menuList = [[NSMutableArray alloc] init];
-        
-        [self setRecoverDirection:@"recover-from-server"];
-	}
-	return self;
-}    
-
-- (void) dealloc {
-    // TODO: destruct
-    
-    [super dealloc];
-}
-
-- (void) loadView{
-    
-    UIView *contentView = [[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]];
-	self.view = contentView;
-	[contentView release];
-	
-	self.view.autoresizesSubviews = YES;
-
-    small_font = [UIFont systemFontOfSize:15];
-    
-
-    SyncMethodsView* syncmethodsview = [[RecoverSyncMethodsView alloc] init];
-    [syncmethodsview setSyncMode:@"recover-from-server"];
-    [menuList addObject:[NSDictionary dictionaryWithObjectsAndKeys:
-                         NSLocalizedString(@"Sync Methods", @""), @"title",
-                         syncmethodsview, @"viewController",
-                         nil]];
-	[syncmethodsview release];
-    
-    recoverTable = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStyleGrouped];
-    recoverTable.delegate = self;
-    recoverTable.dataSource = self;
-	//recoverTable.rowHeight = 40;
-    [recoverTable setAutoresizesSubviews:YES];
-    [recoverTable setAutoresizingMask:UIViewAutoresizingFlexibleHeight + UIViewAutoresizingFlexibleBottomMargin];
-    
-    [self.view addSubview:recoverTable]; 
-    
-    directionCell        =   [[UITableViewCell alloc]init];
-    contactSyncCell      =   [[UITableViewCell alloc]init];
-
-
-    descriptionCell      = [[UITableViewCell alloc] init];
-    descriptionCell.selectionStyle = UITableViewCellSelectionStyleNone; 
-
-    UITextView * description= [[UITextView alloc] initWithFrame: CGRectMake(20, 10, descriptionCell.contentView.bounds.size.width-40, 100)];
-    description.text = NSLocalizedString(@"Recover Directions", @"Recover data...");
-    [description setEditable:NO];
-    [description setFont:small_font];
-    [description setScrollEnabled:NO];
-    [description setAutoresizesSubviews:YES];
-    
-    [descriptionCell addSubview:description];
-
-
-    [directionCell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator];
-    [self setDirectionText];
-    
-    contactSyncCell.textLabel.text = NSLocalizedString(@"Contacts", @"Contacts...");
-    
-    contactSync          =   [[UISwitch alloc] initWithFrame:CGRectMake(200.0, 10.0, 60.0, 30)];
-    [contactSync addTarget:self action:@selector(contactSyncAction:) forControlEvents:UIControlEventValueChanged];
-    [contactSync setOn:YES animated:NO];
-
-    [contactSyncCell addSubview:contactSync];
-        
-        
-    recoverButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Begin",@"Begin...")
-                                                  style:UIBarButtonItemStylePlain
-                                                 target:self
-                                                 action:@selector(recoverAction:)];
-
-    self.navigationItem.rightBarButtonItem = recoverButton;
-    [recoverButton setEnabled:YES];
-    
-    
-    
-    [recoverTable reloadData];
-}
-
-- (void) reload
-{
-}
-
-- (void) viewDidAppear:(BOOL)animated{
-    [self contactSyncAction:nil];
-}
-
-- (void) contactSyncAction: (id)sender
-{
-    if ([contactSync isOn])
-    {
-        [recoverButton setEnabled:YES];
-    }
-    else
-    {
-        [recoverButton setEnabled:NO];
-    }
-}
-
-- (void) recoverAction: (id)sender
-{
-    if ([contactSync isOn])
-    {
-        clickedRecover = true;
-
-        [[self navigationController] popViewControllerAnimated:YES];
-    }
-    else
-    {
-        clickedRecover = false;
-    }
-}
-
-- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-    switch (indexPath.section) {
-        case 0:
-            return 110;
-        default:
-            return 40;
-        break;
-    }
-    recoverTable.rowHeight;
-}
-
-- (UITableViewCell *)tableView:(UITableView *)contactsTable cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-	
-    switch (indexPath.section) {
-        case 0:
-            switch (indexPath.row) {
-                case 0:
-                    return descriptionCell;
-                default:
-                    break;
-            }
-            break;
-        case 1:
-            switch (indexPath.row) {
-                case 0:
-                    return directionCell;
-                default:
-                    break;
-            }
-            break;
-        case 2:
-            switch (indexPath.row) {
-                case 0:
-                    return contactSyncCell;
-                default:
-                    break;
-            }
-            break;
-        default:
-
-            break;
-    }
-    
-    return nil;
-}
-
-- (void)tableView:(UITableView *)contactsTable didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
-    UIViewController *targetViewController;
-    switch (indexPath.section) {
-        case 0:
-            // Cannot select description
-            [recoverTable deselectRowAtIndexPath:indexPath animated:YES];
-            return;
-            break;
-        case 1:
-            switch (indexPath.row) {
-                case 0:
-                    targetViewController = [[menuList objectAtIndex: 0] objectForKey:@"viewController"];
-                    [((SyncMethodsView*)targetViewController) setSyncMode:direction];
-                    [[self navigationController] pushViewController:targetViewController animated:YES];
-                    
-                    break;
-                default:
-                    break;
-            }
-            break;
-        default:
-            break;
-    }
-
-}
-
-- (NSInteger)tableView:(UITableView *)contactsTable numberOfRowsInSection:(NSInteger)section {
-        switch (section) {
-            case 0:
-                return 1;
-            case 1:
-                return 1;
-            case 2:
-                // Number of categories
-                return 1;
-            default:
-                break;
-        }
-    return 0;//should never happen
-}
-
-
-
-- (void)viewWillAppear:(BOOL)animated
-{
-    clickedRecover = false;
-
-	// this UIViewController is about to re-appear, make sure we remove the current selection in our table view
-	NSIndexPath *indexPath = [recoverTable indexPathForSelectedRow];
-    if(!indexPath)
-        return;
-    
-    UIViewController *targetViewController;
-    NSString* mode;
-    switch (indexPath.section) {
-        case 1:
-            switch (indexPath.row) {
-                case 0:
-                    targetViewController = [[menuList objectAtIndex: 0] objectForKey:@"viewController"];
-                    mode = [((SyncMethodsView*)targetViewController) getSyncMode];
-                    [self setRecoverDirection:mode];
-                    [mode release];
-                    break;
-                default:
-                    break;
-            }
-            break;
-        default:
-            break;
-    }
-	[recoverTable deselectRowAtIndexPath:indexPath animated:NO];
-    
-    [self setDirectionText];
-}
-
-
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)contactsTable {
-    return 3;
-}
-
-
-- (void) setDirectionText
-{
-    if ([direction isEqualToString:@"recover-from-server"])
-    {
-        directionCell.textLabel.text = [NSString stringWithFormat:@"%@ - %@", NSLocalizedString(@"Direction",@"Direction..."), @"From Server"];
-    }
-    else
-    {
-        directionCell.textLabel.text = [NSString stringWithFormat:@"%@ - %@", NSLocalizedString(@"Direction",@"Direction..."), @"To Server"];
-    }
-}
-
-
-- (void) setRecoverDirection: (NSString*)dir
-{
-    if (dir == direction)
-    {
-        return;
-    }
-    
-    if (direction)
-    {
-        [direction release];
-    }
-    
-    direction = [dir copy];
-}
-
-- (NSString*) getRecoverDirection
-{
-    if (!direction)
-        return nil;
-    return [direction copy];
-}
-
-- (bool) didClickRecover
-{
-    return clickedRecover;
-}
-@end

=== removed file 'iPhoneApp/UI/src/SettingsSingleView.mm'
--- iPhoneApp/UI/src/SettingsSingleView.mm	2010-08-12 01:15:02 +0000
+++ iPhoneApp/UI/src/SettingsSingleView.mm	1970-01-01 00:00:00 +0000
@@ -1,640 +0,0 @@
-/*
- * Funambol is a mobile platform developed by Funambol, Inc.
- * Copyright (C) 2008 Funambol, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Affero General Public License version 3 as published by
- * the Free Software Foundation with the addition of the following permission
- * added to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED
- * WORK IN WHICH THE COPYRIGHT IS OWNED BY FUNAMBOL, FUNAMBOL DISCLAIMS THE
- * WARRANTY OF NON INFRINGEMENT  OF THIRD PARTY RIGHTS.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program; if not, see http://www.gnu.org/licenses or write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA.
- *
- * You can contact Funambol, Inc. headquarters at 643 Bair Island Road, Suite
- * 305, Redwood City, CA 94063, USA, or at email address [e-mail].
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU Affero General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU Affero General Public License
- * version 3, these Appropriate Legal Notices must retain the display of the
- * "Powered by Funambol" logo. If the display of the logo is not reasonably
- * feasible for technical reasons, the Appropriate Legal Notices must display
- * the words "Powered by Funambol".
- */
-
-
-#import <UIKit/UIKit.h>
-
-#import "common.h"
-#import "SettingsSingleView.h"
-#import "base/Log.h"
-#import "AccountView.h"
-#import "ContactsSettingsView.h"
-#import "LogSettingsView.h"
-#import "AboutView.h"
-#import "FunambolAPI.h"
-
-#import "RecoverView.h"
-#import "CleanUpView.h"
-// TODO : REMOVE THIS HACK WHEN CLEANUP PAGE IS IMPLEMENTED IS WORKING
-//#define CleanupView RecoverView
-//#define didClickCleanup didClickRecover
-
-#import "FunambolAPI.h"
-
-#import "UIController.h"
-
-#import "customs.h"
-
-//static NSString *kCellIdentifier = @"MyIdentifier";
-
-@implementation SettingsSingleView
-
-- (id)init {
-  
-	self = [super init];
-	if (self)
-	{
-		// this title will appear in the navigation bar
-		self.title = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
-		
-		menuList = [[NSMutableArray alloc] init];
-	}
-    funBlue = [[UIColor alloc] initWithRed:FUNBLUE_RGB_RED green:FUNBLUE_RGB_GREEN blue:FUNBLUE_RGB_BLUE alpha:1.0];
-	return self;
-}
-
-- (void) loadView{
-    UIView *contentView = [[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]];
-	self.view = contentView;
-	[contentView release];
-	
-	self.view.autoresizesSubviews = YES;
-    [self setTitle:NSLocalizedString(@"Settings",@"Settings")];
-    small_font = [UIFont systemFontOfSize:15];
-
-    usernameLabel = [[UILabel alloc] initWithFrame:CGRectMake(140.0, 7.0, 140.0, 25.0)];
-    [usernameLabel setFont:small_font];
-    [usernameLabel setTextAlignment:UITextAlignmentRight];
-    [usernameLabel  setTextColor:funBlue];
-    
-    
-    contactsLabel = [[UILabel alloc] initWithFrame:CGRectMake(140.0, 7.0, 140.0, 25.0)];
-    [contactsLabel setFont:small_font];
-    [contactsLabel setTextAlignment:UITextAlignmentRight];
-    [contactsLabel  setTextColor:funBlue];
-    
-    [self addComponents];
-    
-}
-
-- (IBAction)done:(id)sender
-{
-	[self dismissModalViewControllerAnimated:YES];
-}
-
-- (void)viewWillAppear:(BOOL)animated
-{
-	// this UIViewController is about to re-appear, make sure we remove the current selection in our table view
-    lastSelection = [settingsTable indexPathForSelectedRow];
-	[settingsTable deselectRowAtIndexPath:lastSelection animated:NO];
-	
-	self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done",@"") style:UIBarButtonItemStyleDone target:self action:@selector(done:)] autorelease];
-}
-
-- (void) viewDidAppear:(BOOL)animated{
-    NSString* URL;
-    NSString* username;
-    NSString* password; 
-    
-    [[FunambolAPI getInstance] loadSyncConfig:&URL username:&username password:&password];
-    
-    if([username isEqualToString:@""] || [password isEqualToString:@""]){
-        UIViewController *targetViewController = [[menuList objectAtIndex: 0] objectForKey:@"viewController"];
-        [[self navigationController] pushViewController:targetViewController animated:YES];
-    }
-    
-    StringBuffer urlstring([URL UTF8String]);
-    if((urlstring.find(" ") != StringBuffer::npos)||
-       (urlstring.find("<") != StringBuffer::npos)||
-       (urlstring.find(">") != StringBuffer::npos)){
-        UIViewController *targetViewController = [[menuList objectAtIndex: 0] objectForKey:@"viewController"];
-        [[self navigationController] pushViewController:targetViewController animated:YES];
-    } 
-    
-    [usernameLabel setText:username];
-    
-    [URL      release];
-    [username release];
-    [password release];
-    
-    NSString* contactsync = [[FunambolAPI getInstance] getSync:@"addressbook"];
-    
-    if([contactsync isEqualToString:@"none"]){
-        [contactsLabel setText:NSLocalizedString(@"Disabled",@"Disabled")];
-    }else{
-        [contactsLabel setText:NSLocalizedString(@"Enabled",@"Enabled")];
-    }
-    
-    [contactsync release];
-    
-	// this UIViewController is about to re-appear, make sure we remove the current selection in our table view
-	NSIndexPath *indexPath = lastSelection;
-    
-    if(!indexPath)
-        return;
-        
-    switch (indexPath.section) {
-        case 2:
-            if (!CUSTOM_LOG_SEPARATE_GROUP && CUSTOM_CLEANUP || CUSTOM_RECOVER)
-            {
-                switch (indexPath.row) {
-                    case 1:
-                        if (CUSTOM_CLEANUP) {
-                            // Go back and init cleanup
-                            UIViewController *targetViewController = [[menuList objectAtIndex: 3] objectForKey:@"viewController"];
-                            if ([((CleanUpView*)targetViewController) didClickCleanup])
-                            {
-                                [[UIController getInstance] cleanupContacts];
-                                [[self navigationController] popViewControllerAnimated:YES];
-                            }
-                        } else if (CUSTOM_RECOVER) {
-                            UIViewController *targetViewController = [[menuList objectAtIndex: 4] objectForKey:@"viewController"];
-                            if ([((RecoverView*)targetViewController) didClickRecover])
-                            {
-                                // Go back and init recover
-                                [[UIController getInstance] recoverContacts];
-                                [[self navigationController] popViewControllerAnimated:YES];
-                            }
-                        }
-                        break;
-                    case 2:
-                        if (CUSTOM_RECOVER)
-                        {
-                            UIViewController *targetViewController = [[menuList objectAtIndex: 4] objectForKey:@"viewController"];
-                            if ([((RecoverView*)targetViewController) didClickRecover])
-                            {
-                                // Go back and init recover
-                                [[UIController getInstance] recoverContacts];
-                                [[self navigationController] popViewControllerAnimated:YES];
-                            }
-                        }
-                        break;
-                    default:
-                        break;
-                }
-            }
-            
-            break;
-        case 3:
-            if(CUSTOM_LOG_SEPARATE_GROUP && CUSTOM_CLEANUP || CUSTOM_RECOVER)
-            {
-                switch (indexPath.row) {
-                    case 0:
-                        if (CUSTOM_CLEANUP) {
-                            // Go back and init cleanup
-                            UIViewController *targetViewController = [[menuList objectAtIndex: 3] objectForKey:@"viewController"];
-                            if ([((CleanUpView*)targetViewController) didClickCleanup])
-                            {
-                                [[UIController getInstance] cleanupContacts];
-                                [[self navigationController] popViewControllerAnimated:YES];
-                            }
-                        } else if (CUSTOM_RECOVER) {
-                            UIViewController *targetViewController = [[menuList objectAtIndex: 4] objectForKey:@"viewController"];
-                            if ([((RecoverView*)targetViewController) didClickRecover])
-                            {
-                                // Go back and init recover
-                                [[UIController getInstance] recoverContacts];
-                                [[self navigationController] popViewControllerAnimated:YES];
-                            }
-                        }
-                        break;
-                    case 1:
-                        if (CUSTOM_RECOVER)
-                        {
-                            UIViewController *targetViewController = [[menuList objectAtIndex: 4] objectForKey:@"viewController"];
-                            if ([((RecoverView*)targetViewController) didClickRecover])
-                            {
-                                // Go back and init recover
-                                [[UIController getInstance] recoverContacts];
-                                [[self navigationController] popViewControllerAnimated:YES];
-                            }
-                        }
-                        break;
-                    default:
-                        break;
-                }
-            }
-            break;
-        default:
-            break;
-    }
-
-	[settingsTable deselectRowAtIndexPath:indexPath animated:NO];
-}
-
-/*
- * 0 account
- * 1 Contact 
- * 2 log
- * 3 cleanup
- * 4 recover
- * 5 about
- */
-
-- (void) addComponents{
-    
-    //menulist index 0
-    AccountView* accountview = [[AccountView alloc] init];
-    [menuList addObject:[NSDictionary dictionaryWithObjectsAndKeys:
-                         NSLocalizedString(@"Account", @""), @"title",
-                         accountview, @"viewController",
-                         nil]];
-	[accountview release];
-    
-    //menulist index 1
-    ContactsSettingsView* contactview = [[ContactsSettingsView alloc] init];
-    [menuList addObject:[NSDictionary dictionaryWithObjectsAndKeys:
-                         NSLocalizedString(@"Contact Settings", @""), @"title",
-                         contactview, @"viewController",
-                         nil]];
-	[contactview release];
-    
-    LogSettingsView* logsettingsview = [[LogSettingsView alloc] init];
-    [menuList addObject:[NSDictionary dictionaryWithObjectsAndKeys:
-                         NSLocalizedString(@"Log Settings", @""), @"title",
-                         logsettingsview, @"viewController",
-                         nil]];
-	[logsettingsview release];
-    
-        //menulist index 2
-        CleanUpView * cleanupView = [[CleanUpView alloc] init];
-        [menuList addObject:[NSDictionary dictionaryWithObjectsAndKeys:
-                             NSLocalizedString(@"Cleanup", @""), @"title",
-                             cleanupView, @"viewController",
-                             nil]];
-        [cleanupView release];
-        RecoverView * recoverView = [[RecoverView alloc] init];
-        [menuList addObject:[NSDictionary dictionaryWithObjectsAndKeys:
-                             NSLocalizedString(@"Recover", @""), @"title",
-                             recoverView, @"viewController",
-                             nil]];
-        [recoverView release];
-    
-    
-    AboutView* aboutview = [[AboutView alloc] init];
-    [menuList addObject:[NSDictionary dictionaryWithObjectsAndKeys:
-                         NSLocalizedString(@"Account", @""), @"title",
-                         aboutview, @"viewController",
-                         nil]];
-	[aboutview release];
-
-	settingsTable = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStyleGrouped]; 
-	settingsTable.delegate = self;
-    settingsTable.dataSource = self;
-	settingsTable.rowHeight = 40;
-    [settingsTable reloadData];
-	//Main Navigation Bar!
-    
-    //usernameLabel = [[UILabel alloc] initWithFrame:CGRectMake(140.0, 7.0, 140.0, 25.0)];
-    
-    
-
-	[self addAccountTable];
-
-	[self addSourcesTable];
-
-	[self addLogTable];
-	
-	[self addAboutTable];
-    
-    [self addCleanupTable];
-    
-    [self addRecoverTable];
-	
-	[self.view addSubview:settingsTable];
-
-
-}
-
-- (void) addAccountTable{
-	accountCell =  [[UITableViewCell alloc]init];
-    accountCell.textLabel.text = NSLocalizedString(@"Account",@"Account");
-    accountCell.imageView.image = [UIImage imageNamed: @"worksettings.png"];
-    accountCell.textLabel.textAlignment = UITextAlignmentLeft;
-    [accountCell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator];
-    [accountCell addSubview:usernameLabel];
-}
-
-- (void) addSourcesTable{
-    
-	contactsCell =  [[UITableViewCell alloc]init];
-    contactsCell.textLabel.text = NSLocalizedString(@"Contacts",@"Contacts");
-    contactsCell.imageView.image = [UIImage imageNamed: @"icon_contacts_small.png"];
-    contactsCell.textLabel.textAlignment = UITextAlignmentLeft;
-    [contactsCell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator];
-    //[contactsCell addSubview:contactsLabel];
-}
-
-- (void) addLogTable{
-    
-	logCell =  [[UITableViewCell alloc]init];
-    logCell.textLabel.text = NSLocalizedString(@"Log",@"Log");
-    logCell.imageView.image = [UIImage imageNamed: @"icon_log_small.png"];
-    [logCell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator];
-}
-
-- (void) addAboutTable{
-    
-	aboutCell =  [[UITableViewCell alloc]init];
-    aboutCell.textLabel.text = [NSLocalizedString(@"AboutC",@"About ") stringByAppendingString:NSLocalizedString(@"AppName",@"Funambol")];
-    aboutCell.imageView.image = [UIImage imageNamed: @"icon_logo_small.png"];
-    [aboutCell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator];
-}
-
-- (void) addCleanupTable{
-    
-	cleanupCell =  [[UITableViewCell alloc]init];
-    cleanupCell.textLabel.text = NSLocalizedString(@"Cleanup",@"Cleanup");
-    cleanupCell.imageView.image = [UIImage imageNamed: @"icon_cleanup_small.png"];
-    [cleanupCell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator];
-}
-
-- (void) addRecoverTable{
-
-	recoverCell =  [[UITableViewCell alloc]init];
-    recoverCell.textLabel.text = NSLocalizedString(@"Recover",@"Recover");
-    recoverCell.imageView.image = [UIImage imageNamed: @"icon_recover_small.png"];
-    [recoverCell setAccessoryType:UITableViewCellAccessoryDisclosureIndicator];
-}
-
-- (void) reload {
-}
-
-- (UITableViewCell *)tableView:(UITableView *)settingsTable cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    switch (indexPath.section) {
-            //account table section
-        case 0:
-            switch (indexPath.row) {
-                case 0:
-                    return accountCell;
-                default:
-                    break;
-            }
-            break;
-            //sources table section
-        case 1:
-            switch (indexPath.row) {
-                case 0:
-                    return contactsCell;
-                default:
-                    break;
-            }
-            // cleanup/recover
-        case 2:
-            switch (indexPath.row) {
-                case 0:
-                    return logCell;
-                case 1:
-                    if (CUSTOM_CLEANUP){
-                        return cleanupCell;
-                    } else if (CUSTOM_RECOVER){
-                        return recoverCell;
-                    }
-                case 2:
-                    return recoverCell;
-                default: 
-                    break;
-            }
-
-            // about table section
-        case 3:
-            switch (indexPath.row) {
-                case 0:
-                    if(CUSTOM_LOG_SEPARATE_GROUP){
-                        if (CUSTOM_CLEANUP)
-                            return cleanupCell;
-                        else if (CUSTOM_RECOVER)
-                            return recoverCell;
-                    }else{
-                        return aboutCell;
-                    }
-                case 1:
-                    return recoverCell;        
-                default:
-                    break;
-            }
-        case 4:
-            switch (indexPath.row) {
-                case 0:
-                    return aboutCell;
-                default:
-                    break;
-            }
-
-        default:
-            
-            break;
-    }
-    return nil;
-}
-
-- (NSInteger)tableView:(UITableView *)settingsTable numberOfRowsInSection:(NSInteger)section {
-
-    switch (section) {
-		case 0:
-			return 1;
-		case 1:
-            return 1;
-        case 2:
-            if(CUSTOM_LOG_SEPARATE_GROUP){
-                return 1;
-            }else{
-                switch ((CUSTOM_CLEANUP?1:0)*1 + (CUSTOM_RECOVER?1:0)*2)
-                {
-                    case 0: // Neither clean nor recover - it will be Log
-                        return 1;
-                    case 1:
-                        return 2;
-                    case 2:
-                        return 2;
-                    case 3:
-                        return 3;
-                default: 
-                        break;
-                }
-            }
-		case 3:
-            if(CUSTOM_LOG_SEPARATE_GROUP){
-                switch ((CUSTOM_CLEANUP?1:0)*1 + (CUSTOM_RECOVER?1:0)*2)
-                {
-                    case 0: // Neither clean nor recover - it will be Log
-                        return 1;
-                    case 1:
-                        return 1;
-                    case 2:
-                        return 1;
-                    case 3:
-                        return 2;
-                    default: 
-                        break;
-                }
-            }else{
-                return 1;
-            }
-        case 4:
-            return 1;
-		default:
-			break;
-	}
-    return 0;
-}
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)settingsTable {
-    if (CUSTOM_LOG_SEPARATE_GROUP){
-        return 5;
-    }else{
-        return 4;
-    }
-    return 4;
-}
-
-
-/*
- * 0 account
- * 1 Contact 
- * 2 log
- * 3 cleanup
- * 4 recover
- * 5 about
- */
-
-- (void)tableView:(UITableView *)settingsTable didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
-    UIViewController *targetViewController;
-    UIViewController *targetViewController3;
-    switch (indexPath.section){
-        case 0://account
-            switch (indexPath.row) {
-                case 0:
-                    targetViewController = [[menuList objectAtIndex: 0] objectForKey:@"viewController"];
-                    [[self navigationController] pushViewController:targetViewController animated:YES];
-                    break;
-                default:
-                    break;
-            }
-            break;
-        case 1://contact
-            switch (indexPath.row) {
-                case 0:
-                    targetViewController = [[menuList objectAtIndex: 1] objectForKey:@"viewController"];
-                    [[self navigationController] pushViewController:targetViewController animated:YES];
-                    break;
-                default:
-                    break;
-            }
-            break;
-        case 2://log cleanup recover
-            switch (indexPath.row) {
-                case 0:
-                    targetViewController = [[menuList objectAtIndex: 2] objectForKey:@"viewController"];
-                    [[self navigationController] pushViewController:targetViewController animated:YES];
-                    break;
-                case 1:
-                    if(CUSTOM_CLEANUP){
-                        UIViewController *targetViewController2 = [[menuList objectAtIndex: 3] objectForKey:@"viewController"];
-                        [[self navigationController] pushViewController:targetViewController2 animated:YES];
-                    }else if (CUSTOM_RECOVER){
-                        UIViewController *targetViewController3 = [[menuList objectAtIndex: 4] objectForKey:@"viewController"];
-                        [[self navigationController] pushViewController:targetViewController3 animated:YES];
-                    }
-                    break;
-                case 2:
-                    targetViewController3 = [[menuList objectAtIndex: 4] objectForKey:@"viewController"];
-                    [[self navigationController] pushViewController:targetViewController3 animated:YES];
-                    break;
-                default:
-                    break;
-            }
-            break;
-        case 3://  about
-            if(CUSTOM_LOG_SEPARATE_GROUP){
-                switch (indexPath.row) {
-                    case 0:
-                        if(CUSTOM_CLEANUP){
-                            UIViewController *targetViewController2 = [[menuList objectAtIndex: 3] objectForKey:@"viewController"];
-                            [[self navigationController] pushViewController:targetViewController2 animated:YES];
-                        }else if (CUSTOM_RECOVER){
-                            UIViewController *targetViewController3 = [[menuList objectAtIndex: 4] objectForKey:@"viewController"];
-                            [[self navigationController] pushViewController:targetViewController3 animated:YES];
-                        }
-                        break;
-                    case 1:
-                        targetViewController3 = [[menuList objectAtIndex: 4] objectForKey:@"viewController"];
-                        [[self navigationController] pushViewController:targetViewController3 animated:YES];
-                        break;
-                    default:
-                        break;
-                }
-            }else{
-                switch (indexPath.row) {
-                    case 0:
-                        targetViewController = [[menuList objectAtIndex: 5] objectForKey:@"viewController"];
-                        [[self navigationController] pushViewController:targetViewController animated:YES];
-                        break;
-                        
-                    default:
-                        break;
-                }
-            }
-            break;
-        case 4:
-            switch (indexPath.row) {
-                case 0:
-                    targetViewController = [[menuList objectAtIndex: 5] objectForKey:@"viewController"];
-                    [[self navigationController] pushViewController:targetViewController animated:YES];
-                    break;
-                    
-                default:
-                    break;
-            }
-        default:
-            break;
-            
-    }
-}
-
-
-- (void)dealloc {
-    [menuList release];
-    
-    [settingsTable release];
-    
-	[accountCell release];
-	[logCell release];	
-	[aboutCell release];
-
-    [recoverCell release];
-    [cleanupCell release];
-    
-    [contactsLabel release];
-    [usernameLabel release];
-    [funBlue release];
-    [small_font release];
-
-    [super dealloc];
-}
-
-
-
-@end

=== modified file 'iPhoneApp/UI/src/UIController.mm'
--- iPhoneApp/UI/src/UIController.mm	2010-07-22 20:21:36 +0000
+++ iPhoneApp/UI/src/UIController.mm	2010-08-20 00:36:44 +0000
@@ -39,9 +39,7 @@
 #import "FunambolAPI.h"
 
 #import "MainSingleView.h"
-#import "SettingsSingleView.h"
 
-#import "LogView.h"
 #import "base/Log.h"
 #import "customs.h"
 

=== modified file 'iPhoneApp/funambolAppStore.xcodeproj/project.pbxproj'
--- iPhoneApp/funambolAppStore.xcodeproj/project.pbxproj	2010-08-12 01:15:02 +0000
+++ iPhoneApp/funambolAppStore.xcodeproj/project.pbxproj	2010-08-20 00:36:44 +0000
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		1054008311AA748E0074E5A9 /* LoginManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1054008211AA748E0074E5A9 /* LoginManager.mm */; };
 		7C7647BC0DB361F500786883 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C7647BB0DB361F500786883 /* main.mm */; };
 		7C849D210DB6371B00AE7A7D /* iPhoneDefaultConfigFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C849D200DB6371B00AE7A7D /* iPhoneDefaultConfigFactory.cpp */; };
 		7C9F57A50DAF5C47007E0091 /* DataConverter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C9F579E0DAF5C47007E0091 /* DataConverter.mm */; };
@@ -20,7 +19,6 @@
 		7C9F58020DAF5C50007E0091 /* icon_logo_small.png in Resources */ = {isa = PBXBuildFile; fileRef = 7C9F57C10DAF5C50007E0091 /* icon_logo_small.png */; };
 		7C9F58120DAF5C50007E0091 /* worksettings.png in Resources */ = {isa = PBXBuildFile; fileRef = 7C9F57D10DAF5C50007E0091 /* worksettings.png */; };
 		7C9F58160DAF5C50007E0091 /* AccountView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C9F57E40DAF5C50007E0091 /* AccountView.mm */; };
-		7C9F58180DAF5C50007E0091 /* LogView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C9F57E60DAF5C50007E0091 /* LogView.mm */; };
 		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 */; };
@@ -68,17 +66,12 @@
 		AB33AAA10E5AE0460098F0A2 /* icon_sync_154x154_frame15.png in Resources */ = {isa = PBXBuildFile; fileRef = AB33AA910E5AE0460098F0A2 /* icon_sync_154x154_frame15.png */; };
 		AB3785BA0E5AF345003E51F8 /* dist.plist in Resources */ = {isa = PBXBuildFile; fileRef = AB3785B90E5AF345003E51F8 /* dist.plist */; };
 		AB3E86550E08090F00581A6C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB3E86540E08090F00581A6C /* SystemConfiguration.framework */; };
-		AB69923B0E275770000BE6D9 /* SettingsSingleView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB69923A0E275770000BE6D9 /* SettingsSingleView.mm */; };
-		AB7207470DBDF01400AE2222 /* LogLevelView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB7207460DBDF01400AE2222 /* LogLevelView.mm */; };
-		AB76D12F0DF434CB00C1F7D3 /* CleanUpView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB76D12E0DF434CB00C1F7D3 /* CleanUpView.mm */; };
 		AB7C7D050DEC07A100F46ECA /* logoImage.png in Resources */ = {isa = PBXBuildFile; fileRef = AB7C7D040DEC07A100F46ECA /* logoImage.png */; };
 		AB8B508B0DE4384F005B47E4 /* apple-touch-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8B508A0DE4384F005B47E4 /* apple-touch-icon.png */; };
-		AB926A750DBCD04E008E5FC6 /* LogSettingsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB926A740DBCD04E008E5FC6 /* LogSettingsView.mm */; };
 		AB926BE60DBCF087008E5FC6 /* AboutView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB926BE50DBCF087008E5FC6 /* AboutView.mm */; };
 		ABAEC2FC11DB5AD100A9D30F /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABAEC2FB11DB5AD100A9D30F /* CFNetwork.framework */; };
 		ABB027A30DF807D600CC4ECD /* icon_cleanup_small.png in Resources */ = {isa = PBXBuildFile; fileRef = ABB027A20DF807D600CC4ECD /* icon_cleanup_small.png */; };
 		ABB2C3300DC78162001F56C2 /* SyncMethodsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABB2C32F0DC78162001F56C2 /* SyncMethodsView.mm */; };
-		ABBCD6A10DBF89AA00A4C160 /* ContactsSettingsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABBCD6A00DBF89AA00A4C160 /* ContactsSettingsView.mm */; };
 		ABBF2921104BCE15004A9F09 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = ABBF291D104BCE15004A9F09 /* Localizable.strings */; };
 		ABC5F1430E249E9100119787 /* MainSingleView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABC5F1420E249E9100119787 /* MainSingleView.mm */; };
 		ABC5F1D20E24AFF400119787 /* button_default.png in Resources */ = {isa = PBXBuildFile; fileRef = ABC5F1CF0E24AFF400119787 /* button_default.png */; };
@@ -92,8 +85,6 @@
 		ABDC41DD0DDC9D2700F552B6 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABDC41DC0DDC9D2700F552B6 /* UIKit.framework */; };
 		ABDE70600DB8D4D800C98302 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = ABDE705F0DB8D4D700C98302 /* libsqlite3.dylib */; };
 		ABF33CDC11E75F670053481B /* libfunambol.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ABF33CDB11E75F670053481B /* libfunambol.a */; };
-		ABF87D880DEE91EC00E433ED /* RecoverView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABF87D870DEE91EC00E433ED /* RecoverView.mm */; };
-		ABF87D940DEE924900E433ED /* RecoverSyncMethodsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABF87D930DEE924900E433ED /* RecoverSyncMethodsView.mm */; };
 		ABF87D980DEE926E00E433ED /* FastSyncMethodsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABF87D970DEE926E00E433ED /* FastSyncMethodsView.mm */; };
 /* End PBXBuildFile section */
 
@@ -136,8 +127,6 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		1054008211AA748E0074E5A9 /* LoginManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoginManager.mm; sourceTree = "<group>"; };
-		1054008611AA74970074E5A9 /* LoginManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginManager.h; sourceTree = "<group>"; };
 		1D6058910D05DD3D006BFB54 /* Funambol.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Funambol.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		7C7647BA0DB361EE00786883 /* main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = main.h; sourceTree = "<group>"; };
 		7C7647BB0DB361F500786883 /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
@@ -157,10 +146,8 @@
 		7C9F57D10DAF5C50007E0091 /* worksettings.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = worksettings.png; sourceTree = "<group>"; };
 		7C9F57D30DAF5C50007E0091 /* AccountView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccountView.h; sourceTree = "<group>"; };
 		7C9F57D40DAF5C50007E0091 /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = "<group>"; };
-		7C9F57D60DAF5C50007E0091 /* LogView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogView.h; sourceTree = "<group>"; };
 		7C9F57D90DAF5C50007E0091 /* UIController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIController.h; sourceTree = "<group>"; };
 		7C9F57E40DAF5C50007E0091 /* AccountView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccountView.mm; sourceTree = "<group>"; };
-		7C9F57E60DAF5C50007E0091 /* LogView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LogView.mm; sourceTree = "<group>"; };
 		7C9F57E90DAF5C50007E0091 /* UIController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIController.mm; sourceTree = "<group>"; };
 		7C9F58F70DAF653D007E0091 /* funambol_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = funambol_Prefix.pch; sourceTree = "<group>"; };
 		7C9F594F0DAF67B9007E0091 /* stringUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stringUtils.cpp; sourceTree = "<group>"; };
@@ -215,16 +202,8 @@
 		AB33AA910E5AE0460098F0A2 /* icon_sync_154x154_frame15.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_sync_154x154_frame15.png; sourceTree = "<group>"; };
 		AB3785B90E5AF345003E51F8 /* dist.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = dist.plist; sourceTree = "<group>"; };
 		AB3E86540E08090F00581A6C /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
-		AB6992370E27574D000BE6D9 /* SettingsSingleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsSingleView.h; sourceTree = "<group>"; };
-		AB69923A0E275770000BE6D9 /* SettingsSingleView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SettingsSingleView.mm; sourceTree = "<group>"; };
-		AB7207450DBDF00900AE2222 /* LogLevelView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogLevelView.h; sourceTree = "<group>"; };
-		AB7207460DBDF01400AE2222 /* LogLevelView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LogLevelView.mm; sourceTree = "<group>"; };
-		AB76D12C0DF4344F00C1F7D3 /* CleanUpView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CleanUpView.h; sourceTree = "<group>"; };
-		AB76D12E0DF434CB00C1F7D3 /* CleanUpView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CleanUpView.mm; sourceTree = "<group>"; };
 		AB7C7D040DEC07A100F46ECA /* logoImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logoImage.png; sourceTree = "<group>"; };
 		AB8B508A0DE4384F005B47E4 /* apple-touch-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "apple-touch-icon.png"; sourceTree = "<group>"; };
-		AB926A740DBCD04E008E5FC6 /* LogSettingsView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LogSettingsView.mm; sourceTree = "<group>"; };
-		AB926A760DBCD056008E5FC6 /* LogSettingsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogSettingsView.h; sourceTree = "<group>"; };
 		AB926BE40DBCF07B008E5FC6 /* AboutView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutView.h; sourceTree = "<group>"; };
 		AB926BE50DBCF087008E5FC6 /* AboutView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AboutView.mm; sourceTree = "<group>"; };
 		AB96C9360E94BF5C00527267 /* MacMappingStoreBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacMappingStoreBuilder.h; sourceTree = "<group>"; };
@@ -233,8 +212,6 @@
 		ABB027A20DF807D600CC4ECD /* icon_cleanup_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_cleanup_small.png; sourceTree = "<group>"; };
 		ABB2C32F0DC78162001F56C2 /* SyncMethodsView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SyncMethodsView.mm; sourceTree = "<group>"; };
 		ABB2C3310DC7816C001F56C2 /* SyncMethodsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SyncMethodsView.h; sourceTree = "<group>"; };
-		ABBCD69E0DBF88D500A4C160 /* ContactsSettingsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactsSettingsView.h; sourceTree = "<group>"; };
-		ABBCD6A00DBF89AA00A4C160 /* ContactsSettingsView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ContactsSettingsView.mm; sourceTree = "<group>"; };
 		ABBF291E104BCE15004A9F09 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
 		ABC5F1410E249E8500119787 /* MainSingleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainSingleView.h; sourceTree = "<group>"; };
 		ABC5F1420E249E9100119787 /* MainSingleView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MainSingleView.mm; sourceTree = "<group>"; };
@@ -251,11 +228,7 @@
 		ABDD7E3E0E2F404F000D79C0 /* DataConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataConverter.h; sourceTree = "<group>"; };
 		ABDE705F0DB8D4D700C98302 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
 		ABF33CDB11E75F670053481B /* libfunambol.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfunambol.a; path = "../funambol-sdk/build/mac/build/iPhone-Release-iphoneos/libfunambol.a"; sourceTree = SOURCE_ROOT; };
-		ABF87D860DEE91E300E433ED /* RecoverView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecoverView.h; sourceTree = "<group>"; };
-		ABF87D870DEE91EC00E433ED /* RecoverView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RecoverView.mm; sourceTree = "<group>"; };
 		ABF87D8A0DEE921A00E433ED /* customs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = customs.h; sourceTree = "<group>"; };
-		ABF87D930DEE924900E433ED /* RecoverSyncMethodsView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RecoverSyncMethodsView.mm; sourceTree = "<group>"; };
-		ABF87D950DEE925700E433ED /* RecoverSyncMethodsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecoverSyncMethodsView.h; sourceTree = "<group>"; };
 		ABF87D970DEE926E00E433ED /* FastSyncMethodsView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FastSyncMethodsView.mm; sourceTree = "<group>"; };
 		ABF87D990DEE927600E433ED /* FastSyncMethodsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FastSyncMethodsView.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -459,23 +432,14 @@
 		7C9F57D20DAF5C50007E0091 /* include */ = {
 			isa = PBXGroup;
 			children = (
-				1054008611AA74970074E5A9 /* LoginManager.h */,
-				AB6992370E27574D000BE6D9 /* SettingsSingleView.h */,
 				ABC5F1410E249E8500119787 /* MainSingleView.h */,
-				AB76D12C0DF4344F00C1F7D3 /* CleanUpView.h */,
 				ABF87D990DEE927600E433ED /* FastSyncMethodsView.h */,
-				ABF87D950DEE925700E433ED /* RecoverSyncMethodsView.h */,
 				ABF87D8A0DEE921A00E433ED /* customs.h */,
-				ABF87D860DEE91E300E433ED /* RecoverView.h */,
 				ABB2C3310DC7816C001F56C2 /* SyncMethodsView.h */,
-				ABBCD69E0DBF88D500A4C160 /* ContactsSettingsView.h */,
-				AB7207450DBDF00900AE2222 /* LogLevelView.h */,
 				AB926BE40DBCF07B008E5FC6 /* AboutView.h */,
-				AB926A760DBCD056008E5FC6 /* LogSettingsView.h */,
 				7C7647BA0DB361EE00786883 /* main.h */,
 				7C9F57D30DAF5C50007E0091 /* AccountView.h */,
 				7C9F57D40DAF5C50007E0091 /* common.h */,
-				7C9F57D60DAF5C50007E0091 /* LogView.h */,
 				7C9F57D90DAF5C50007E0091 /* UIController.h */,
 			);
 			path = include;
@@ -484,21 +448,12 @@
 		7C9F57E30DAF5C50007E0091 /* src */ = {
 			isa = PBXGroup;
 			children = (
-				1054008211AA748E0074E5A9 /* LoginManager.mm */,
-				AB69923A0E275770000BE6D9 /* SettingsSingleView.mm */,
 				ABC5F1420E249E9100119787 /* MainSingleView.mm */,
-				AB76D12E0DF434CB00C1F7D3 /* CleanUpView.mm */,
 				ABF87D970DEE926E00E433ED /* FastSyncMethodsView.mm */,
-				ABF87D930DEE924900E433ED /* RecoverSyncMethodsView.mm */,
-				ABF87D870DEE91EC00E433ED /* RecoverView.mm */,
 				ABB2C32F0DC78162001F56C2 /* SyncMethodsView.mm */,
-				ABBCD6A00DBF89AA00A4C160 /* ContactsSettingsView.mm */,
-				AB7207460DBDF01400AE2222 /* LogLevelView.mm */,
 				AB926BE50DBCF087008E5FC6 /* AboutView.mm */,
-				AB926A740DBCD04E008E5FC6 /* LogSettingsView.mm */,
 				7C7647BB0DB361F500786883 /* main.mm */,
 				7C9F57E40DAF5C50007E0091 /* AccountView.mm */,
-				7C9F57E60DAF5C50007E0091 /* LogView.mm */,
 				7C9F57E90DAF5C50007E0091 /* UIController.mm */,
 			);
 			path = src;
@@ -721,26 +676,17 @@
 				7C9F57A70DAF5C47007E0091 /* PersonDataConverter.mm in Sources */,
 				7C9F57A80DAF5C47007E0091 /* TimestampDB.cpp in Sources */,
 				7C9F58160DAF5C50007E0091 /* AccountView.mm in Sources */,
-				7C9F58180DAF5C50007E0091 /* LogView.mm in Sources */,
 				7C9F581B0DAF5C50007E0091 /* UIController.mm in Sources */,
 				7C9F59500DAF67B9007E0091 /* stringUtils.cpp in Sources */,
 				7C9F59620DAF683B007E0091 /* AddressBookSyncSource.cpp in Sources */,
 				7C7647BC0DB361F500786883 /* main.mm in Sources */,
 				7C849D210DB6371B00AE7A7D /* iPhoneDefaultConfigFactory.cpp in Sources */,
-				AB926A750DBCD04E008E5FC6 /* LogSettingsView.mm in Sources */,
 				AB926BE60DBCF087008E5FC6 /* AboutView.mm in Sources */,
-				AB7207470DBDF01400AE2222 /* LogLevelView.mm in Sources */,
-				ABBCD6A10DBF89AA00A4C160 /* ContactsSettingsView.mm in Sources */,
 				ABB2C3300DC78162001F56C2 /* SyncMethodsView.mm in Sources */,
 				AB2107D30DE1C5820026FA2F /* FunambolAPIWrapperImpl.cpp in Sources */,
-				ABF87D880DEE91EC00E433ED /* RecoverView.mm in Sources */,
-				ABF87D940DEE924900E433ED /* RecoverSyncMethodsView.mm in Sources */,
 				ABF87D980DEE926E00E433ED /* FastSyncMethodsView.mm in Sources */,
-				AB76D12F0DF434CB00C1F7D3 /* CleanUpView.mm in Sources */,
 				ABC5F1430E249E9100119787 /* MainSingleView.mm in Sources */,
-				AB69923B0E275770000BE6D9 /* SettingsSingleView.mm in Sources */,
 				AB33A9900E5AD6750098F0A2 /* TimeUtils.mm in Sources */,
-				1054008311AA748E0074E5A9 /* LoginManager.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -762,7 +708,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Zachery Bir (VQETYLE6H4)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Aaron Brethorst (F47V3NDKL2)";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -808,7 +754,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = Funambol;
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "14D5492C-4ADF-4EC9-B55A-777EAC1AA507";
+				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "593A3158-7296-4E4E-9F26-663515C90E99";
 				SDKROOT = iphoneos4.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};