Merge lp:~urbanape/ubuntuone-ios-client/new-query-string-parser into lp:ubuntuone-ios-client

[Zachery Bir]

This branch uses parses the Funambol username and password out of the query string returned by the server, rather than encoded in the URL. It uses a new query string parser class to do this.

[Aaron Brethorst (aaronbrethorst-deactivatedaccount)]

review: Approve

=== modified file 'contacts/iPhoneApp/Info.plist'
--- contacts/iPhoneApp/Info.plist	2010-08-18 01:00:21 +0000
+++ contacts/iPhoneApp/Info.plist	2010-09-03 21:17:44 +0000
@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-	<string>Ubuntu One</string>
+	<string>U1 Contacts</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
@@ -35,10 +35,10 @@
 	<array>
 		<dict>
 			<key>CFBundleURLName</key>
-			<string>com.structlab.one.iphoneplugin</string>
+			<string>com.ubuntu.one.iphoneplugin</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>ubuntuone</string>
+				<string>x-ubuntuone-contacts</string>
 			</array>
 		</dict>
 	</array>

=== added file 'contacts/iPhoneApp/UI/include/URLQueryStringParser.h'
--- contacts/iPhoneApp/UI/include/URLQueryStringParser.h	1970-01-01 00:00:00 +0000
+++ contacts/iPhoneApp/UI/include/URLQueryStringParser.h	2010-09-03 21:17:44 +0000
@@ -0,0 +1,52 @@
+/*
+ * Funambol is a mobile platform developed by Funambol, Inc.
+ * Copyright (C) 2010 Canonical Group Ltd.
+ *
+ * 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 Canonical Group Ltd. headquarters at:
+ *
+ *   27th Floor Millbank Tower
+ *   21-24 Millbank
+ *   London SW1P 4QP
+ *   United Kingdom
+ *
+ * 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 <Foundation/Foundation.h>
+
+
+@interface URLQueryStringParser : NSObject {
+	NSMutableDictionary *queryDict;
+}
+
+@property (nonatomic, retain) NSMutableDictionary *queryDict;
+
+- (id)initWithURL:(NSURL *)url;
+- (NSString *)queryStringValueForKey:(NSString *)key;
+
+@end

=== modified file 'contacts/iPhoneApp/UI/src/AccountView.mm'
--- contacts/iPhoneApp/UI/src/AccountView.mm	2010-08-20 00:32:22 +0000
+++ contacts/iPhoneApp/UI/src/AccountView.mm	2010-09-03 21:17:44 +0000
@@ -42,6 +42,7 @@
 #import "customs.h"
 #import "FastSyncMethodsView.h"
 #import "AboutView.h"
+#import "URLQueryStringParser.h"
 
 @interface AccountView (Private)
 - (UITextField*)buildTextFieldWithFrame:(CGRect)aFrame text:(NSString*)text keyboardType:(UIKeyboardType)keyboardType returnKeyType:(UIReturnKeyType)returnKeyType;
@@ -77,19 +78,21 @@
 {
 	if (credentials)
 	{
-		NSURL *credURL = [NSURL URLWithString:credentials];
-
-		if ([credURL user])
-		{
-			usernameValue.text = [credURL user];
-			[[FunambolAPI getInstance] saveUsernameConfig:[credURL user]];
-		}
-
-		if ([credURL password])
-		{
-			passwordValue.text = [credURL password];
-			[[FunambolAPI getInstance] savePasswordConfig:[credURL password]];
-		}
+		URLQueryStringParser *queryStringParser = [[URLQueryStringParser alloc] initWithURL:[NSURL URLWithString:credentials]];
+		NSString *user = [queryStringParser queryStringValueForKey:@"u"];
+		NSString *pass = [queryStringParser queryStringValueForKey:@"p"];
+		if (user != nil)
+		{
+			usernameValue.text = user;
+			[[FunambolAPI getInstance] saveUsernameConfig:user];
+		}
+
+		if (pass != nil)
+		{
+			passwordValue.text = pass;
+			[[FunambolAPI getInstance] savePasswordConfig:pass];
+		}
+		[queryStringParser release]; 
 	}
 }
 
@@ -294,7 +297,7 @@
 {
 	if (1 == indexPath.section)
 	{
-		NSURL *credentialsURL = [NSURL URLWithString:@"https://one.ubuntu.com/phones/creds/ios"];
+		NSURL *credentialsURL = [NSURL URLWithString:@"https://one.ubuntu.com/phones/creds/ios?scheme=x-ubuntuone-contacts"];
 		[tableView deselectRowAtIndexPath:indexPath animated:YES];
 		[[UIApplication sharedApplication] openURL:credentialsURL];
 	} else if (2 == indexPath.section) {

=== added file 'contacts/iPhoneApp/UI/src/URLQueryStringParser.mm'
--- contacts/iPhoneApp/UI/src/URLQueryStringParser.mm	1970-01-01 00:00:00 +0000
+++ contacts/iPhoneApp/UI/src/URLQueryStringParser.mm	2010-09-03 21:17:44 +0000
@@ -0,0 +1,72 @@
+/*
+ * Funambol is a mobile platform developed by Funambol, Inc.
+ * Copyright (C) 2010 Canonical Group Ltd.
+ *
+ * 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 Canonical Group Ltd. headquarters at:
+ *
+ *   27th Floor Millbank Tower
+ *   21-24 Millbank
+ *   London SW1P 4QP
+ *   United Kingdom
+ *
+ * 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 "URLQueryStringParser.h"
+
+
+@implementation URLQueryStringParser
+
+- (id) initWithURL:(NSURL *)url {
+	self = [super init];
+	if (self != nil) {
+		self.queryDict = [NSMutableDictionary dictionary];
+
+		NSString *query = [url query];
+		NSArray *queryPairs = [query componentsSeparatedByString:@"&"];
+		for (NSString *pair in queryPairs) {
+			// take chunk and break it on @"=", setting key and value in dict
+			NSArray *keyValue = [pair componentsSeparatedByString:@"="];
+			[self.queryDict setObject:[keyValue objectAtIndex:1] forKey:[keyValue objectAtIndex:0]];
+		}
+	}
+	return self;
+}
+
+- (NSString *)queryStringValueForKey:(NSString *)key {
+	return [self.queryDict objectForKey:key];
+}
+
+- (void) dealloc {
+	self.queryDict = nil;
+	[super dealloc];
+}
+
+@synthesize queryDict;
+
+@end

=== modified file 'contacts/iPhoneApp/funambolAppStore.xcodeproj/project.pbxproj'
--- contacts/iPhoneApp/funambolAppStore.xcodeproj/project.pbxproj	2010-08-20 00:32:22 +0000
+++ contacts/iPhoneApp/funambolAppStore.xcodeproj/project.pbxproj	2010-09-03 21:17:44 +0000
@@ -22,6 +22,7 @@
 		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 */; };
+		9173D56212318DE2004CEDB9 /* URLQueryStringParser.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9173D56112318DE2004CEDB9 /* URLQueryStringParser.mm */; };
 		930D5A6A11F9FB8800DD6D06 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 930D5A6611F9FB8800DD6D06 /* Default.png */; };
 		930D5A6B11F9FB8800DD6D06 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 930D5A6711F9FB8800DD6D06 /* [e-mail] */; };
 		930D5A6C11F9FB8800DD6D06 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 930D5A6811F9FB8800DD6D06 /* Icon.png */; };
@@ -155,6 +156,8 @@
 		7C9F59600DAF683B007E0091 /* AddressBookSyncSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddressBookSyncSource.h; sourceTree = "<group>"; };
 		7C9F59610DAF683B007E0091 /* AddressBookSyncSource.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = AddressBookSyncSource.cpp; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		9173D4DF123019CC004CEDB9 /* URLQueryStringParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URLQueryStringParser.h; sourceTree = "<group>"; };
+		9173D56112318DE2004CEDB9 /* URLQueryStringParser.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = URLQueryStringParser.mm; sourceTree = "<group>"; };
 		930D5A6611F9FB8800DD6D06 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
 		930D5A6711F9FB8800DD6D06 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
 		930D5A6811F9FB8800DD6D06 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
@@ -441,6 +444,7 @@
 				7C9F57D30DAF5C50007E0091 /* AccountView.h */,
 				7C9F57D40DAF5C50007E0091 /* common.h */,
 				7C9F57D90DAF5C50007E0091 /* UIController.h */,
+				9173D4DF123019CC004CEDB9 /* URLQueryStringParser.h */,
 			);
 			path = include;
 			sourceTree = "<group>";
@@ -455,6 +459,7 @@
 				7C7647BB0DB361F500786883 /* main.mm */,
 				7C9F57E40DAF5C50007E0091 /* AccountView.mm */,
 				7C9F57E90DAF5C50007E0091 /* UIController.mm */,
+				9173D56112318DE2004CEDB9 /* URLQueryStringParser.mm */,
 			);
 			path = src;
 			sourceTree = "<group>";
@@ -687,6 +692,7 @@
 				ABF87D980DEE926E00E433ED /* FastSyncMethodsView.mm in Sources */,
 				ABC5F1430E249E9100119787 /* MainSingleView.mm in Sources */,
 				AB33A9900E5AD6750098F0A2 /* TimeUtils.mm in Sources */,
+				9173D56212318DE2004CEDB9 /* URLQueryStringParser.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};