Merge lp:~rockstar/ubuntuoneauthkit/more-cleanup into lp:ubuntuoneauthkit

[Paul Hummer]

Kill Subsonic deps, teach UOAuthManager about Subsonic creds.

This branch kills two dependencies: Subsonic and SFHFKeychainUtils. The way I killed these deps is by implementing a private UOKeyManager that handles the low-level keychain stuff. As I did this, I wrote tests to make sure everything worked the way it should. I then made UOAuthManager use this new class instead of Subsonic (and, subsequently, SFHFKeychainUtils). Now UOAuthManager knows enough to handle its own auth methods.

There's a companion branch for Music that will go with this branch, essentially implementing these changes. When running the tests for this, I learned that it operates on the "production" keychain, so you'll blow away your credentials if you run the tests. I chased a bug where I wasn't cleaning up the tests properly, and the tests were poisoning my credentials, and that's how I discovered this. The tests now clean up properly, but will delete your actual keychain details.

[Zachery Bir (urbanape)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2012-09-15 17:33:52 +0000
+++ .bzrignore	2012-09-25 21:23:23 +0000
@@ -1,2 +1,3 @@
 .DS_Store
 UbuntuOneAuthKit.xcodeproj/xcuserdata
+UbuntuOneAuthKit.xcodeproj/project.xcworkspace/

=== removed file 'Reachability.h'
--- Reachability.h	2012-09-17 03:30:01 +0000
+++ Reachability.h	1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-/*
- 
- File: Reachability.h
- Abstract: Basic demonstration of how to use the SystemConfiguration Reachablity APIs.
- 
- Version: 2.0
- 
- Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple Inc.
- ("Apple") in consideration of your agreement to the following terms, and your
- use, installation, modification or redistribution of this Apple software
- constitutes acceptance of these terms.  If you do not agree with these terms,
- please do not use, install, modify or redistribute this Apple software.
- 
- In consideration of your agreement to abide by the following terms, and subject
- to these terms, Apple grants you a personal, non-exclusive license, under
- Apple's copyrights in this original Apple software (the "Apple Software"), to
- use, reproduce, modify and redistribute the Apple Software, with or without
- modifications, in source and/or binary forms; provided that if you redistribute
- the Apple Software in its entirety and without modifications, you must retain
- this notice and the following text and disclaimers in all such redistributions
- of the Apple Software.
- Neither the name, trademarks, service marks or logos of Apple Inc. may be used
- to endorse or promote products derived from the Apple Software without specific
- prior written permission from Apple.  Except as expressly stated in this notice,
- no other rights or licenses, express or implied, are granted by Apple herein,
- including but not limited to any patent rights that may be infringed by your
- derivative works or by other works in which the Apple Software may be
- incorporated.
- 
- The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
- WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
- WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
- COMBINATION WITH YOUR PRODUCTS.
- 
- IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR
- DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF
- CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
- APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- Copyright (C) 2009 Apple Inc. All Rights Reserved.
- 
-*/
-
-
-#import <Foundation/Foundation.h>
-#import <SystemConfiguration/SystemConfiguration.h>
-#import <netinet/in.h>
-
-typedef enum {
-	NotReachable = 0,
-	ReachableViaWiFi,
-	ReachableViaWWAN
-} NetworkStatus;
-#define kReachabilityChangedNotification @"kNetworkReachabilityChangedNotification"
-
-@interface Reachability: NSObject
-{
-	BOOL localWiFiRef;
-	SCNetworkReachabilityRef reachabilityRef;
-}
-
-//reachabilityWithHostName- Use to check the reachability of a particular host name. 
-+ (Reachability*) reachabilityWithHostName: (NSString*) hostName;
-
-//reachabilityWithAddress- Use to check the reachability of a particular IP address. 
-+ (Reachability*) reachabilityWithAddress: (const struct sockaddr_in*) hostAddress;
-
-//reachabilityForInternetConnection- checks whether the default route is available.  
-//  Should be used by applications that do not connect to a particular host
-+ (Reachability*) reachabilityForInternetConnection;
-
-//reachabilityForLocalWiFi- checks whether a local wifi connection is available.
-+ (Reachability*) reachabilityForLocalWiFi;
-
-//Start listening for reachability notifications on the current run loop
-- (BOOL) startNotifer;
-- (void) stopNotifer;
-
-- (NetworkStatus) currentReachabilityStatus;
-//WWAN may be available, but not active until a connection has been established.
-//WiFi may require a connection for VPN on Demand.
-- (BOOL) connectionRequired;
-@end
-
-

=== removed file 'Reachability.m'
--- Reachability.m	2012-09-17 03:30:01 +0000
+++ Reachability.m	1970-01-01 00:00:00 +0000
@@ -1,274 +0,0 @@
-/*
- 
- File: Reachability.m
- Abstract: Basic demonstration of how to use the SystemConfiguration Reachablity APIs.
- 
- Version: 2.0
- 
- Disclaimer: IMPORTANT:  This Apple software is supplied to you by Apple Inc.
- ("Apple") in consideration of your agreement to the following terms, and your
- use, installation, modification or redistribution of this Apple software
- constitutes acceptance of these terms.  If you do not agree with these terms,
- please do not use, install, modify or redistribute this Apple software.
- 
- In consideration of your agreement to abide by the following terms, and subject
- to these terms, Apple grants you a personal, non-exclusive license, under
- Apple's copyrights in this original Apple software (the "Apple Software"), to
- use, reproduce, modify and redistribute the Apple Software, with or without
- modifications, in source and/or binary forms; provided that if you redistribute
- the Apple Software in its entirety and without modifications, you must retain
- this notice and the following text and disclaimers in all such redistributions
- of the Apple Software.
- Neither the name, trademarks, service marks or logos of Apple Inc. may be used
- to endorse or promote products derived from the Apple Software without specific
- prior written permission from Apple.  Except as expressly stated in this notice,
- no other rights or licenses, express or implied, are granted by Apple herein,
- including but not limited to any patent rights that may be infringed by your
- derivative works or by other works in which the Apple Software may be
- incorporated.
- 
- The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO
- WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED
- WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
- COMBINATION WITH YOUR PRODUCTS.
- 
- IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR
- DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF
- CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
- APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- Copyright (C) 2009 Apple Inc. All Rights Reserved.
- 
-*/
-
-#import <sys/socket.h>
-#import <netinet/in.h>
-#import <netinet6/in6.h>
-#import <arpa/inet.h>
-#import <ifaddrs.h>
-#import <netdb.h>
-
-#import <CoreFoundation/CoreFoundation.h>
-
-#import "Reachability.h"
-
-#define kShouldPrintReachabilityFlags 0
-
-static void PrintReachabilityFlags(SCNetworkReachabilityFlags    flags, const char* comment)
-{
-#if kShouldPrintReachabilityFlags
-	
-    NSLog(@"Reachability Flag Status: %c%c %c%c%c%c%c%c%c %s\n",
-			(flags & kSCNetworkReachabilityFlagsIsWWAN)				  ? 'W' : '-',
-			(flags & kSCNetworkReachabilityFlagsReachable)            ? 'R' : '-',
-			
-			(flags & kSCNetworkReachabilityFlagsTransientConnection)  ? 't' : '-',
-			(flags & kSCNetworkReachabilityFlagsConnectionRequired)   ? 'c' : '-',
-			(flags & kSCNetworkReachabilityFlagsConnectionOnTraffic)  ? 'C' : '-',
-			(flags & kSCNetworkReachabilityFlagsInterventionRequired) ? 'i' : '-',
-			(flags & kSCNetworkReachabilityFlagsConnectionOnDemand)   ? 'D' : '-',
-			(flags & kSCNetworkReachabilityFlagsIsLocalAddress)       ? 'l' : '-',
-			(flags & kSCNetworkReachabilityFlagsIsDirect)             ? 'd' : '-',
-			comment
-			);
-#endif
-}
-
-
-@implementation Reachability
-static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReachabilityFlags flags, void* info)
-{
-	#pragma unused (target, flags)
-	NSCAssert(info != NULL, @"info was NULL in ReachabilityCallback");
-	NSCAssert([(NSObject*) info isKindOfClass: [Reachability class]], @"info was wrong class in ReachabilityCallback");
-
-	//We're on the main RunLoop, so an NSAutoreleasePool is not necessary, but is added defensively
-	// in case someon uses the Reachablity object in a different thread.
-	NSAutoreleasePool* myPool = [[NSAutoreleasePool alloc] init];
-	
-	Reachability* noteObject = (Reachability*) info;
-	// Post a notification to notify the client that the network reachability changed.
-	[[NSNotificationCenter defaultCenter] postNotificationName: kReachabilityChangedNotification object: noteObject];
-	
-	[myPool release];
-}
-
-- (BOOL) startNotifer
-{
-	BOOL retVal = NO;
-	SCNetworkReachabilityContext	context = {0, self, NULL, NULL, NULL};
-	if(SCNetworkReachabilitySetCallback(reachabilityRef, ReachabilityCallback, &context))
-	{
-		if(SCNetworkReachabilityScheduleWithRunLoop(reachabilityRef, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode))
-		{
-			retVal = YES;
-		}
-	}
-	return retVal;
-}
-
-- (void) stopNotifer
-{
-	if(reachabilityRef!= NULL)
-	{
-		SCNetworkReachabilityUnscheduleFromRunLoop(reachabilityRef, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
-	}
-}
-
-- (void) dealloc
-{
-	[self stopNotifer];
-	if(reachabilityRef!= NULL)
-	{
-		CFRelease(reachabilityRef);
-	}
-	[super dealloc];
-}
-
-+ (Reachability*) reachabilityWithHostName: (NSString*) hostName;
-{
-	Reachability* retVal = NULL;
-	SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithName(NULL, [hostName UTF8String]);
-	if(reachability!= NULL)
-	{
-		retVal= [[[self alloc] init] autorelease];
-		if(retVal!= NULL)
-		{
-			retVal->reachabilityRef = reachability;
-			retVal->localWiFiRef = NO;
-		}
-	}
-	return retVal;
-}
-
-+ (Reachability*) reachabilityWithAddress: (const struct sockaddr_in*) hostAddress;
-{
-	SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithAddress(kCFAllocatorDefault, (const struct sockaddr*)hostAddress);
-	Reachability* retVal = NULL;
-	if(reachability!= NULL)
-	{
-		retVal= [[[self alloc] init] autorelease];
-		if(retVal!= NULL)
-		{
-			retVal->reachabilityRef = reachability;
-			retVal->localWiFiRef = NO;
-		}
-	}
-	return retVal;
-}
-
-+ (Reachability*) reachabilityForInternetConnection;
-{
-	struct sockaddr_in zeroAddress;
-	bzero(&zeroAddress, sizeof(zeroAddress));
-	zeroAddress.sin_len = sizeof(zeroAddress);
-	zeroAddress.sin_family = AF_INET;
-	return [self reachabilityWithAddress: &zeroAddress];
-}
-
-+ (Reachability*) reachabilityForLocalWiFi;
-{
-	//[super init];
-	struct sockaddr_in localWifiAddress;
-	bzero(&localWifiAddress, sizeof(localWifiAddress));
-	localWifiAddress.sin_len = sizeof(localWifiAddress);
-	localWifiAddress.sin_family = AF_INET;
-	// IN_LINKLOCALNETNUM is defined in <netinet/in.h> as 169.254.0.0
-	localWifiAddress.sin_addr.s_addr = htonl(IN_LINKLOCALNETNUM);
-	Reachability* retVal = [self reachabilityWithAddress: &localWifiAddress];
-	if(retVal!= NULL)
-	{
-		retVal->localWiFiRef = YES;
-	}
-	return retVal;
-}
-
-#pragma mark Network Flag Handling
-
-- (NetworkStatus) localWiFiStatusForFlags: (SCNetworkReachabilityFlags) flags
-{
-	PrintReachabilityFlags(flags, "localWiFiStatusForFlags");
-
-	BOOL retVal = NotReachable;
-	if((flags & kSCNetworkReachabilityFlagsReachable) && (flags & kSCNetworkReachabilityFlagsIsDirect))
-	{
-		retVal = ReachableViaWiFi;	
-	}
-	return retVal;
-}
-
-- (NetworkStatus) networkStatusForFlags: (SCNetworkReachabilityFlags) flags
-{
-	PrintReachabilityFlags(flags, "networkStatusForFlags");
-	if ((flags & kSCNetworkReachabilityFlagsReachable) == 0)
-	{
-		// if target host is not reachable
-		return NotReachable;
-	}
-
-	BOOL retVal = NotReachable;
-	
-	if ((flags & kSCNetworkReachabilityFlagsConnectionRequired) == 0)
-	{
-		// if target host is reachable and no connection is required
-		//  then we'll assume (for now) that your on Wi-Fi
-		retVal = ReachableViaWiFi;
-	}
-	
-	
-	if ((((flags & kSCNetworkReachabilityFlagsConnectionOnDemand ) != 0) ||
-		(flags & kSCNetworkReachabilityFlagsConnectionOnTraffic) != 0))
-	{
-			// ... and the connection is on-demand (or on-traffic) if the
-			//     calling application is using the CFSocketStream or higher APIs
-
-			if ((flags & kSCNetworkReachabilityFlagsInterventionRequired) == 0)
-			{
-				// ... and no [user] intervention is needed
-				retVal = ReachableViaWiFi;
-			}
-		}
-	
-	if ((flags & kSCNetworkReachabilityFlagsIsWWAN) == kSCNetworkReachabilityFlagsIsWWAN)
-	{
-		// ... but WWAN connections are OK if the calling application
-		//     is using the CFNetwork (CFSocketStream?) APIs.
-		retVal = ReachableViaWWAN;
-	}
-	return retVal;
-}
-
-- (BOOL) connectionRequired;
-{
-	NSAssert(reachabilityRef != NULL, @"connectionRequired called with NULL reachabilityRef");
-	SCNetworkReachabilityFlags flags;
-	if (SCNetworkReachabilityGetFlags(reachabilityRef, &flags))
-	{
-		return (flags & kSCNetworkReachabilityFlagsConnectionRequired);
-	}
-	return NO;
-}
-
-- (NetworkStatus) currentReachabilityStatus
-{
-	NSAssert(reachabilityRef != NULL, @"currentNetworkStatus called with NULL reachabilityRef");
-	NetworkStatus retVal = NotReachable;
-	SCNetworkReachabilityFlags flags;
-	if (SCNetworkReachabilityGetFlags(reachabilityRef, &flags))
-	{
-		if(localWiFiRef)
-		{
-			retVal = [self localWiFiStatusForFlags: flags];
-		}
-		else
-		{
-			retVal = [self networkStatusForFlags: flags];
-		}
-	}
-	return retVal;
-}
-@end

=== removed file 'SFHFKeychainUtils.h'
--- SFHFKeychainUtils.h	2012-09-17 03:30:01 +0000
+++ SFHFKeychainUtils.h	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-//
-//  SFHFKeychainUtils.h
-//
-//  Created by Buzz Andersen on 10/20/08.
-//  Based partly on code by Jonathan Wight, Jon Crosby, and Mike Malone.
-//  Copyright 2008 Sci-Fi Hi-Fi. All rights reserved.
-//
-//  Permission is hereby granted, free of charge, to any person
-//  obtaining a copy of this software and associated documentation
-//  files (the "Software"), to deal in the Software without
-//  restriction, including without limitation the rights to use,
-//  copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the
-//  Software is furnished to do so, subject to the following
-//  conditions:
-//
-//  The above copyright notice and this permission notice shall be
-//  included in all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-//  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-//  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-//  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//  OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#import <UIKit/UIKit.h>
-
-
-@interface SFHFKeychainUtils : NSObject {
-	
-}
-
-+ (NSString *) getPasswordForUsername: (NSString *) username andServiceName: (NSString *) serviceName error: (NSError **) error;
-+ (BOOL) storeUsername: (NSString *) username andPassword: (NSString *) password forServiceName: (NSString *) serviceName updateExisting: (BOOL) updateExisting error: (NSError **) error;
-+ (BOOL) deleteItemForUsername: (NSString *) username andServiceName: (NSString *) serviceName error: (NSError **) error;
-
-@end
\ No newline at end of file

=== removed file 'SFHFKeychainUtils.m'
--- SFHFKeychainUtils.m	2012-09-17 03:30:01 +0000
+++ SFHFKeychainUtils.m	1970-01-01 00:00:00 +0000
@@ -1,272 +0,0 @@
-//
-//  SFHFKeychainUtils.m
-//
-//  Created by Buzz Andersen on 10/20/08.
-//  Based partly on code by Jonathan Wight, Jon Crosby, and Mike Malone.
-//  Copyright 2008 Sci-Fi Hi-Fi. All rights reserved.
-//
-//  Permission is hereby granted, free of charge, to any person
-//  obtaining a copy of this software and associated documentation
-//  files (the "Software"), to deal in the Software without
-//  restriction, including without limitation the rights to use,
-//  copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the
-//  Software is furnished to do so, subject to the following
-//  conditions:
-//
-//  The above copyright notice and this permission notice shall be
-//  included in all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-//  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-//  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-//  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//  OTHER DEALINGS IN THE SOFTWARE.
-//
-
-#import "SFHFKeychainUtils.h"
-#import <Security/Security.h>
-
-static NSString *SFHFKeychainUtilsErrorDomain = @"SFHFKeychainUtilsErrorDomain";
-
-@implementation SFHFKeychainUtils
-
-
-+ (NSString *) getPasswordForUsername: (NSString *) username andServiceName: (NSString *) serviceName error: (NSError **) error {
-	if (!username || !serviceName) {
-		if (error != nil) {
-			*error = [NSError errorWithDomain: SFHFKeychainUtilsErrorDomain code: -2000 userInfo: nil];
-		}
-		return nil;
-	}
-	
-	if (error != nil) {
-		*error = nil;
-	}
-	
-	// Set up a query dictionary with the base query attributes: item type (generic), username, and service
-	
-	NSArray *keys = [[[NSArray alloc] initWithObjects: (NSString *) kSecClass, kSecAttrAccount, kSecAttrService, nil] autorelease];
-	NSArray *objects = [[[NSArray alloc] initWithObjects: (NSString *) kSecClassGenericPassword, username, serviceName, nil] autorelease];
-	
-	NSMutableDictionary *query = [[[NSMutableDictionary alloc] initWithObjects: objects forKeys: keys] autorelease];
-	
-	// First do a query for attributes, in case we already have a Keychain item with no password data set.
-	// One likely way such an incorrect item could have come about is due to the previous (incorrect)
-	// version of this code (which set the password as a generic attribute instead of password data).
-	
-	NSDictionary *attributeResult = NULL;
-	NSMutableDictionary *attributeQuery = [query mutableCopy];
-	[attributeQuery setObject: (id) kCFBooleanTrue forKey:(id) kSecReturnAttributes];
-	OSStatus status = SecItemCopyMatching((CFDictionaryRef) attributeQuery, (CFTypeRef *) &attributeResult);
-	
-	[attributeResult release];
-	[attributeQuery release];
-	
-	if (status != noErr) {
-		// No existing item found--simply return nil for the password
-		if (error != nil && status != errSecItemNotFound) {
-			//Only return an error if a real exception happened--not simply for "not found."
-			*error = [NSError errorWithDomain: SFHFKeychainUtilsErrorDomain code: status userInfo: nil];
-		}
-		
-		return nil;
-	}
-	
-	// We have an existing item, now query for the password data associated with it.
-	
-	NSData *resultData = nil;
-	NSMutableDictionary *passwordQuery = [query mutableCopy];
-	[passwordQuery setObject: (id) kCFBooleanTrue forKey: (id) kSecReturnData];
-	
-	status = SecItemCopyMatching((CFDictionaryRef) passwordQuery, (CFTypeRef *) &resultData);
-	
-	[resultData autorelease];
-	[passwordQuery release];
-	
-	if (status != noErr) {
-		if (status == errSecItemNotFound) {
-			// We found attributes for the item previously, but no password now, so return a special error.
-			// Users of this API will probably want to detect this error and prompt the user to
-			// re-enter their credentials.  When you attempt to store the re-entered credentials
-			// using storeUsername:andPassword:forServiceName:updateExisting:error
-			// the old, incorrect entry will be deleted and a new one with a properly encrypted
-			// password will be added.
-			if (error != nil) {
-				*error = [NSError errorWithDomain: SFHFKeychainUtilsErrorDomain code: -1999 userInfo: nil];
-			}
-		}
-		else {
-			// Something else went wrong. Simply return the normal Keychain API error code.
-			if (error != nil) {
-				*error = [NSError errorWithDomain: SFHFKeychainUtilsErrorDomain code: status userInfo: nil];
-			}
-		}
-		
-		return nil;
-	}
-	
-	NSString *password = nil;	
-	
-	if (resultData) {
-		password = [[NSString alloc] initWithData: resultData encoding: NSUTF8StringEncoding];
-	}
-	else {
-		// There is an existing item, but we weren't able to get password data for it for some reason,
-		// Possibly as a result of an item being incorrectly entered by the previous code.
-		// Set the -1999 error so the code above us can prompt the user again.
-		if (error != nil) {
-			*error = [NSError errorWithDomain: SFHFKeychainUtilsErrorDomain code: -1999 userInfo: nil];
-		}
-	}
-	
-	return [password autorelease];
-}
-
-+ (BOOL) storeUsername: (NSString *) username andPassword: (NSString *) password forServiceName: (NSString *) serviceName updateExisting: (BOOL) updateExisting error: (NSError **) error 
-{		
-	if (!username || !password || !serviceName) 
-	{
-		if (error != nil) 
-		{
-			*error = [NSError errorWithDomain: SFHFKeychainUtilsErrorDomain code: -2000 userInfo: nil];
-		}
-		return NO;
-	}
-	
-	// See if we already have a password entered for these credentials.
-	NSError *getError = nil;
-	NSString *existingPassword = [SFHFKeychainUtils getPasswordForUsername: username andServiceName: serviceName error:&getError];
-	
-	if ([getError code] == -1999) 
-	{
-		// There is an existing entry without a password properly stored (possibly as a result of the previous incorrect version of this code.
-		// Delete the existing item before moving on entering a correct one.
-		
-		getError = nil;
-		
-		[self deleteItemForUsername: username andServiceName: serviceName error: &getError];
-		
-		if ([getError code] != noErr) 
-		{
-			if (error != nil) 
-			{
-				*error = getError;
-			}
-			return NO;
-		}
-	}
-	else if ([getError code] != noErr) 
-	{
-		if (error != nil) 
-		{
-			*error = getError;
-		}
-		return NO;
-	}
-	
-	if (error != nil) 
-	{
-		*error = nil;
-	}
-	
-	OSStatus status = noErr;
-	
-	if (existingPassword) 
-	{
-		// We have an existing, properly entered item with a password.
-		// Update the existing item.
-		
-		if (![existingPassword isEqualToString:password] && updateExisting) 
-		{
-			//Only update if we're allowed to update existing.  If not, simply do nothing.
-			
-			NSArray *keys = [[[NSArray alloc] initWithObjects: (NSString *) kSecClass, 
-							  kSecAttrService, 
-							  kSecAttrLabel, 
-							  kSecAttrAccount, 
-							  nil] autorelease];
-			
-			NSArray *objects = [[[NSArray alloc] initWithObjects: (NSString *) kSecClassGenericPassword, 
-								 serviceName,
-								 serviceName,
-								 username,
-								 nil] autorelease];
-			
-			NSDictionary *query = [[[NSDictionary alloc] initWithObjects: objects forKeys: keys] autorelease];			
-			
-			status = SecItemUpdate((CFDictionaryRef) query, (CFDictionaryRef) [NSDictionary dictionaryWithObject: [password dataUsingEncoding: NSUTF8StringEncoding] forKey: (NSString *) kSecValueData]);
-		}
-	}
-	else 
-	{
-		// No existing entry (or an existing, improperly entered, and therefore now
-		// deleted, entry).  Create a new entry.
-		
-		NSArray *keys = [[[NSArray alloc] initWithObjects: (NSString *) kSecClass, 
-						  kSecAttrService, 
-						  kSecAttrLabel, 
-						  kSecAttrAccount, 
-						  kSecValueData, 
-						  nil] autorelease];
-		
-		NSArray *objects = [[[NSArray alloc] initWithObjects: (NSString *) kSecClassGenericPassword, 
-							 serviceName,
-							 serviceName,
-							 username,
-							 [password dataUsingEncoding: NSUTF8StringEncoding],
-							 nil] autorelease];
-		
-		NSDictionary *query = [[[NSDictionary alloc] initWithObjects: objects forKeys: keys] autorelease];			
-		
-		status = SecItemAdd((CFDictionaryRef) query, NULL);
-	}
-	
-	if (error != nil && status != noErr) 
-	{
-		// Something went wrong with adding the new item. Return the Keychain error code.
-		*error = [NSError errorWithDomain: SFHFKeychainUtilsErrorDomain code: status userInfo: nil];
-		
-		return NO;
-	}
-	
-	return YES;
-}
-
-+ (BOOL) deleteItemForUsername: (NSString *) username andServiceName: (NSString *) serviceName error: (NSError **) error 
-{
-	if (!username || !serviceName) 
-	{
-		if (error != nil) 
-		{
-			*error = [NSError errorWithDomain: SFHFKeychainUtilsErrorDomain code: -2000 userInfo: nil];
-		}
-		return NO;
-	}
-	
-	if (error != nil) 
-	{
-		*error = nil;
-	}
-	
-	NSArray *keys = [[[NSArray alloc] initWithObjects: (NSString *) kSecClass, kSecAttrAccount, kSecAttrService, kSecReturnAttributes, nil] autorelease];
-	NSArray *objects = [[[NSArray alloc] initWithObjects: (NSString *) kSecClassGenericPassword, username, serviceName, kCFBooleanTrue, nil] autorelease];
-	
-	NSDictionary *query = [[[NSDictionary alloc] initWithObjects: objects forKeys: keys] autorelease];
-	
-	OSStatus status = SecItemDelete((CFDictionaryRef) query);
-	
-	if (error != nil && status != noErr) 
-	{
-		*error = [NSError errorWithDomain: SFHFKeychainUtilsErrorDomain code: status userInfo: nil];		
-		
-		return NO;
-	}
-	
-	return YES;
-}
-
-@end
\ No newline at end of file

=== removed file 'Subsonic.h'
--- Subsonic.h	2012-09-17 03:30:01 +0000
+++ Subsonic.h	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-//
-//  Subsonic.h
-//  iSub
-//
-//  Created by Aaron Brethorst on 9/23/10.
-//  Copyright 2010 Canonical 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.
-//	
-//  This program is distributed in the hope that it will be useful, but
-//  WITHOUT ANY WARRANTY; without even the implied warranties of
-//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-//  PURPOSE.  See the GNU Affero 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/>.
-
-#import <Foundation/Foundation.h>
-
-@class Reachability;
-
-
-@interface Subsonic : NSObject
-{
-    NSString *credsURL;
-	NSString *defaultURL;
-	NSString *defaultUserName;
-	NSString *defaultPassword;
-	NSString *cachedIP;
-	NSInteger cachedIPHour;
-}
-@property BOOL hasCredentials;
-@property(nonatomic,retain) NSString *credsURL;
-@property(nonatomic,retain) NSString *metadataURL;
-@property(nonatomic,retain) NSString *streamingURL;
-@property(nonatomic,retain) NSString *defaultUserName;
-@property(nonatomic,retain) NSString *defaultPassword;
-@property(nonatomic,retain) NSString *cachedIP;
-@property(nonatomic,assign) NSInteger cachedIPHour;
-@property (readonly, retain) Reachability *reachability;
-+ (Subsonic *)sharedSubsonic;
-- (NSURL *)getCredsURL;
-- (NSURL *)getMetadataURL:(NSString *)action;
-- (NSURL *)getMetadataURL:(NSString *)action parameters:(NSArray *)extraParameters;
-- (NSURL *)getStreamingURLForSongId:(NSString*)songId;
-- (NSURL *)buildURLWithBase:(NSString *)baseURL action:(NSString *)action parameters:(NSArray *)extraParameters;
-- (void)removeCredentials;
-- (void)storeUsername:(NSString*)username password:(NSString*)password;
-@end

=== removed file 'Subsonic.m'
--- Subsonic.m	2012-09-17 03:30:01 +0000
+++ Subsonic.m	1970-01-01 00:00:00 +0000
@@ -1,148 +0,0 @@
-//
-//  Subsonic.m
-//  iSub
-//
-//  Created by Aaron Brethorst on 9/23/10.
-//  Copyright 2010 Canonical 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.
-//	
-//  This program is distributed in the hope that it will be useful, but
-//  WITHOUT ANY WARRANTY; without even the implied warranties of
-//  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-//  PURPOSE.  See the GNU Affero 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/>.
-
-#import "Subsonic.h"
-#import "SynthesizeSingleton.h"
-#include <netinet/in.h> 
-#include <netdb.h>
-#include <arpa/inet.h>
-#import "NSMutableArray+Extras.h"
-#import "Reachability.h"
-
-/* Added after the fact */
-#import "SFHFKeychainUtils.h"
-#define UBUNTU_ONE_SERVICE_NAME @"com.ubuntu.one"
-#define UBUNTU_ONE_DUMMY_USER_NAME @"_UBUNTU_ONE_USER_NAME"
-/* Done */
-
-
-@interface Subsonic ()
-@property (readwrite, retain) Reachability *reachability;
-@end
-
-
-@implementation Subsonic
-@synthesize credsURL, metadataURL, streamingURL, defaultUserName, defaultPassword, cachedIP, cachedIPHour;
-@synthesize reachability;
-@dynamic hasCredentials;
-
-SYNTHESIZE_SINGLETON_FOR_CLASS(Subsonic);
-
-- (id)init
-{
-	if ((self = [super init]))
-	{
-        self.streamingURL = @"https://streaming.one.ubuntu.com/rest";
-		self.metadataURL = @"https://one.ubuntu.com/music/api/1.0";
-        self.credsURL = @"https://one.ubuntu.com/phones/creds/ios?scheme=x-ubuntuone-music";
-		self.reachability = [Reachability reachabilityWithHostName:[[NSURL URLWithString:self.metadataURL] host]];
-		[self.reachability startNotifer];
-	}
-	return self;
-}
-
-- (void)dealloc;
-{
-	self.metadataURL = nil;
-	self.streamingURL = nil;
-	self.credsURL = nil;
-	[self.reachability stopNotifer];
-	self.reachability = nil;
-	[super dealloc];
-}
-
-- (BOOL)hasCredentials
-{
-	NSString *username = [SFHFKeychainUtils getPasswordForUsername:UBUNTU_ONE_DUMMY_USER_NAME andServiceName:UBUNTU_ONE_SERVICE_NAME error:nil];
-	if (username)
-	{
-		NSString *password = [SFHFKeychainUtils getPasswordForUsername:username andServiceName:UBUNTU_ONE_SERVICE_NAME error:nil];
-		return (password != nil);
-	}
-	else
-	{
-		return NO;
-	}
-}
-
-- (void)removeCredentials
-{
-	NSString *username = [[SFHFKeychainUtils getPasswordForUsername:UBUNTU_ONE_DUMMY_USER_NAME andServiceName:UBUNTU_ONE_SERVICE_NAME error:nil] retain];
-	
-	if (username)
-	{
-		[SFHFKeychainUtils deleteItemForUsername:UBUNTU_ONE_DUMMY_USER_NAME andServiceName:UBUNTU_ONE_SERVICE_NAME error:nil];
-		[SFHFKeychainUtils deleteItemForUsername:username andServiceName:UBUNTU_ONE_SERVICE_NAME error:nil];
-	}
-	
-	[username release];
-}
-
-- (void)storeUsername:(NSString*)username password:(NSString*)password
-{
-	[SFHFKeychainUtils storeUsername:UBUNTU_ONE_DUMMY_USER_NAME andPassword:username forServiceName:UBUNTU_ONE_SERVICE_NAME updateExisting:YES error:nil];
-	[SFHFKeychainUtils storeUsername:username andPassword:password forServiceName:UBUNTU_ONE_SERVICE_NAME updateExisting:YES error:nil];
-	
-	self.defaultUserName = username;
-	self.defaultPassword = password;
-}
-
-- (NSURL *)getStreamingURLForSongId:(NSString*)songId
-{
-    NSMutableArray *parameters = [NSMutableArray array];
-    [parameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", songId, nil]];
-	return [self buildURLWithBase:self.streamingURL action:@"stream.view" parameters:parameters];
-}
-
-- (NSURL *)getCredsURL
-{
-    return [NSURL URLWithString:self.credsURL];
-}
-
-- (NSURL *)getMetadataURL:(NSString *)action;
-{
-	return [self buildURLWithBase:self.metadataURL action:action parameters:nil];
-}
-
-- (NSURL *)getMetadataURL:(NSString *)action parameters:(NSArray *)extraParameters;
-{
-	return [self buildURLWithBase:self.metadataURL action:action parameters:extraParameters];
-}
-
-- (NSURL *)buildURLWithBase:(NSString *)baseURL action:(NSString *)action parameters:(NSArray *)extraParameters;
-{
-	if (self.defaultUserName && self.defaultPassword)
-	{
-		NSMutableArray *params = [NSMutableArray arrayWithArray:extraParameters];
-		
-		[params addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"u", self.defaultUserName, nil]];
-		[params addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"p", self.defaultPassword, nil]];
-		[params addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"v", @"1.1.0", nil]];
-		[params addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"c", @"Ubuntu One Music iOS", nil]];
-        
-		NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@/%@?%@", baseURL, action, [params urlEncodedString]]];
-        return url;
-	}
-	else
-	{
-		return nil;
-	}
-}
-
-@end

=== removed file 'SynthesizeSingleton.h'
--- SynthesizeSingleton.h	2012-09-17 03:30:01 +0000
+++ SynthesizeSingleton.h	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-//
-//  SynthesizeSingleton.h
-//  CocoaWithLove
-//
-//  Created by Matt Gallagher on 20/10/08.
-//  Copyright 2009 Matt Gallagher. All rights reserved.
-//
-//  Permission is given to use this source code file without charge in any
-//  project, commercial or otherwise, entirely at your risk, with the condition
-//  that any redistribution (in part or whole) of source code must retain
-//  this copyright and permission notice. Attribution in compiled projects is
-//  appreciated but not required.
-//
-
-#define SYNTHESIZE_SINGLETON_FOR_CLASS(classname) \
- \
-static classname *shared##classname = nil; \
- \
-+ (classname *)shared##classname \
-{ \
-	@synchronized(self) \
-	{ \
-		if (shared##classname == nil) \
-		{ \
-			shared##classname = [[self alloc] init]; \
-		} \
-	} \
-	 \
-	return shared##classname; \
-} \
- \
-+ (id)allocWithZone:(NSZone *)zone \
-{ \
-	@synchronized(self) \
-	{ \
-		if (shared##classname == nil) \
-		{ \
-			shared##classname = [super allocWithZone:zone]; \
-			return shared##classname; \
-		} \
-	} \
-	 \
-	return nil; \
-} \
- \
-- (id)copyWithZone:(NSZone *)zone \
-{ \
-	return self; \
-} \
- \
-- (id)retain \
-{ \
-	return self; \
-} \
- \
-- (NSUInteger)retainCount \
-{ \
-	return NSUIntegerMax; \
-} \
- \
-- (oneway void)release \
-{ \
-} \
- \
-- (id)autorelease \
-{ \
-	return self; \
-}

=== modified file 'UbuntuOneAuthKit.xcodeproj/project.pbxproj'
--- UbuntuOneAuthKit.xcodeproj/project.pbxproj	2012-09-17 03:30:01 +0000
+++ UbuntuOneAuthKit.xcodeproj/project.pbxproj	2012-09-25 21:23:23 +0000
@@ -7,6 +7,11 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		523CC106160B6B7000B36474 /* UOKeyManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 523CC104160B6B7000B36474 /* UOKeyManager.h */; };
+		523CC107160B6B7000B36474 /* UOKeyManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 523CC105160B6B7000B36474 /* UOKeyManager.m */; };
+		523CC10C160B81DC00B36474 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 523CC10B160B81DC00B36474 /* Security.framework */; };
+		523CC10E160B81F000B36474 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 523CC10B160B81DC00B36474 /* Security.framework */; };
+		523CC1191612424000B36474 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52B57D92160525AF0031E95C /* UIKit.framework */; };
 		52527AFF16050BA7000F9A90 /* UONetworkStatusCoordinator.h in Headers */ = {isa = PBXBuildFile; fileRef = 52527AFD16050BA7000F9A90 /* UONetworkStatusCoordinator.h */; };
 		52527B0016050BA7000F9A90 /* UONetworkStatusCoordinator.m in Sources */ = {isa = PBXBuildFile; fileRef = 52527AFE16050BA7000F9A90 /* UONetworkStatusCoordinator.m */; };
 		528515671604F16B004A1F7C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 528515661604F16B004A1F7C /* Foundation.framework */; };
@@ -68,15 +73,8 @@
 		52B57DF016057DD80031E95C /* UOSSOMusicCredsFetchOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 52B57DEE16057DD80031E95C /* UOSSOMusicCredsFetchOperation.m */; };
 		52B57DF316057F590031E95C /* UOURLQueryStringParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B57DF116057F590031E95C /* UOURLQueryStringParser.h */; };
 		52B57DF416057F590031E95C /* UOURLQueryStringParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 52B57DF216057F590031E95C /* UOURLQueryStringParser.m */; };
-		52B57DF7160583000031E95C /* Subsonic.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B57DF5160583000031E95C /* Subsonic.h */; };
-		52B57DF8160583000031E95C /* Subsonic.m in Sources */ = {isa = PBXBuildFile; fileRef = 52B57DF6160583000031E95C /* Subsonic.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52B57DFA1605854D0031E95C /* SynthesizeSingleton.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B57DF91605854D0031E95C /* SynthesizeSingleton.h */; };
 		52B57DFD160585880031E95C /* NSMutableArray+Extras.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B57DFB160585880031E95C /* NSMutableArray+Extras.h */; };
 		52B57DFE160585880031E95C /* NSMutableArray+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = 52B57DFC160585880031E95C /* NSMutableArray+Extras.m */; };
-		52B57E011605882C0031E95C /* Reachability.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B57DFF1605882C0031E95C /* Reachability.h */; };
-		52B57E021605882C0031E95C /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 52B57E001605882C0031E95C /* Reachability.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		52B57E05160631C70031E95C /* SFHFKeychainUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B57E03160631C60031E95C /* SFHFKeychainUtils.h */; };
-		52B57E06160631C70031E95C /* SFHFKeychainUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 52B57E04160631C60031E95C /* SFHFKeychainUtils.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -90,6 +88,9 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		523CC104160B6B7000B36474 /* UOKeyManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UOKeyManager.h; sourceTree = "<group>"; };
+		523CC105160B6B7000B36474 /* UOKeyManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UOKeyManager.m; sourceTree = "<group>"; };
+		523CC10B160B81DC00B36474 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		52527AFD16050BA7000F9A90 /* UONetworkStatusCoordinator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UONetworkStatusCoordinator.h; sourceTree = "<group>"; };
 		52527AFE16050BA7000F9A90 /* UONetworkStatusCoordinator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UONetworkStatusCoordinator.m; sourceTree = "<group>"; };
 		528515631604F16B004A1F7C /* UbuntuOneAuthKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = UbuntuOneAuthKit.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -156,15 +157,8 @@
 		52B57DEE16057DD80031E95C /* UOSSOMusicCredsFetchOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UOSSOMusicCredsFetchOperation.m; sourceTree = "<group>"; };
 		52B57DF116057F590031E95C /* UOURLQueryStringParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UOURLQueryStringParser.h; sourceTree = "<group>"; };
 		52B57DF216057F590031E95C /* UOURLQueryStringParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UOURLQueryStringParser.m; sourceTree = "<group>"; };
-		52B57DF5160583000031E95C /* Subsonic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Subsonic.h; sourceTree = "<group>"; };
-		52B57DF6160583000031E95C /* Subsonic.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Subsonic.m; sourceTree = "<group>"; };
-		52B57DF91605854D0031E95C /* SynthesizeSingleton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SynthesizeSingleton.h; sourceTree = "<group>"; };
 		52B57DFB160585880031E95C /* NSMutableArray+Extras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableArray+Extras.h"; sourceTree = "<group>"; };
 		52B57DFC160585880031E95C /* NSMutableArray+Extras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableArray+Extras.m"; sourceTree = "<group>"; };
-		52B57DFF1605882C0031E95C /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
-		52B57E001605882C0031E95C /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
-		52B57E03160631C60031E95C /* SFHFKeychainUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFHFKeychainUtils.h; sourceTree = "<group>"; };
-		52B57E04160631C60031E95C /* SFHFKeychainUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFHFKeychainUtils.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -172,6 +166,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				523CC10C160B81DC00B36474 /* Security.framework in Frameworks */,
 				52B57D93160525AF0031E95C /* UIKit.framework in Frameworks */,
 				528515671604F16B004A1F7C /* Foundation.framework in Frameworks */,
 			);
@@ -181,6 +176,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				523CC1191612424000B36474 /* UIKit.framework in Frameworks */,
+				523CC10E160B81F000B36474 /* Security.framework in Frameworks */,
 				528515761604F16B004A1F7C /* SenTestingKit.framework in Frameworks */,
 				528515791604F16B004A1F7C /* Foundation.framework in Frameworks */,
 				5285157C1604F16B004A1F7C /* UbuntuOneAuthKit.a in Frameworks */,
@@ -190,16 +187,18 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		523CC0FE160B697E00B36474 /* Utilities */ = {
+			isa = PBXGroup;
+			children = (
+				523CC104160B6B7000B36474 /* UOKeyManager.h */,
+				523CC105160B6B7000B36474 /* UOKeyManager.m */,
+			);
+			name = Utilities;
+			sourceTree = "<group>";
+		};
 		52527B0216052179000F9A90 /* Dependencies */ = {
 			isa = PBXGroup;
 			children = (
-				52B57DFF1605882C0031E95C /* Reachability.h */,
-				52B57E001605882C0031E95C /* Reachability.m */,
-				52B57E03160631C60031E95C /* SFHFKeychainUtils.h */,
-				52B57E04160631C60031E95C /* SFHFKeychainUtils.m */,
-				52B57DF5160583000031E95C /* Subsonic.h */,
-				52B57DF6160583000031E95C /* Subsonic.m */,
-				52B57DF91605854D0031E95C /* SynthesizeSingleton.h */,
 				52527B0316052194000F9A90 /* Categories */,
 				52B57D98160528FF0031E95C /* oauthconsumer */,
 			);
@@ -220,6 +219,7 @@
 		528515581604F16B004A1F7C = {
 			isa = PBXGroup;
 			children = (
+				523CC10B160B81DC00B36474 /* Security.framework */,
 				528515681604F16B004A1F7C /* UbuntuOneAuthKit */,
 				52527B0216052179000F9A90 /* Dependencies */,
 				528515651604F16B004A1F7C /* Frameworks */,
@@ -250,6 +250,7 @@
 		528515681604F16B004A1F7C /* UbuntuOneAuthKit */ = {
 			isa = PBXGroup;
 			children = (
+				523CC0FE160B697E00B36474 /* Utilities */,
 				528515AE1605034A004A1F7C /* UOAbstractNetworkOperation.h */,
 				528515AF1605034A004A1F7C /* UOAbstractNetworkOperation.m */,
 				5285159A1604F473004A1F7C /* UOAuthManager.h */,
@@ -394,11 +395,8 @@
 				52B57DEB16052C710031E95C /* UOHTTPFetchOperation.h in Headers */,
 				52B57DEF16057DD80031E95C /* UOSSOMusicCredsFetchOperation.h in Headers */,
 				52B57DF316057F590031E95C /* UOURLQueryStringParser.h in Headers */,
-				52B57DF7160583000031E95C /* Subsonic.h in Headers */,
-				52B57DFA1605854D0031E95C /* SynthesizeSingleton.h in Headers */,
 				52B57DFD160585880031E95C /* NSMutableArray+Extras.h in Headers */,
-				52B57E011605882C0031E95C /* Reachability.h in Headers */,
-				52B57E05160631C70031E95C /* SFHFKeychainUtils.h in Headers */,
+				523CC106160B6B7000B36474 /* UOKeyManager.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -526,10 +524,8 @@
 				52B57DEC16052C710031E95C /* UOHTTPFetchOperation.m in Sources */,
 				52B57DF016057DD80031E95C /* UOSSOMusicCredsFetchOperation.m in Sources */,
 				52B57DF416057F590031E95C /* UOURLQueryStringParser.m in Sources */,
-				52B57DF8160583000031E95C /* Subsonic.m in Sources */,
 				52B57DFE160585880031E95C /* NSMutableArray+Extras.m in Sources */,
-				52B57E021605882C0031E95C /* Reachability.m in Sources */,
-				52B57E06160631C70031E95C /* SFHFKeychainUtils.m in Sources */,
+				523CC107160B6B7000B36474 /* UOKeyManager.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

=== modified file 'UbuntuOneAuthKit/UOAuthManager.h'
--- UbuntuOneAuthKit/UOAuthManager.h	2012-09-19 16:42:39 +0000
+++ UbuntuOneAuthKit/UOAuthManager.h	2012-09-25 21:23:23 +0000
@@ -8,6 +8,11 @@
 
 #import <Foundation/Foundation.h>
 
+static NSString *UOSubsonicUsernameKey = @"UOSubsonicUsername";
+static NSString *UOSubsonicPasswordKey = @"UOSubsonicPassword";
+
+static const NSString *UOSingleSignOnBaseURL = @"https://login.ubuntu.com/api/1.0/";
+
 @interface UOAuthManager : NSObject
 + (UOAuthManager *)sharedAuthManager;
 - (void)loginWithUsername:(NSString *)username andPassword:(NSString *)password tokenName:(NSString *)tokenName completionBlock:(void(^)())completionBlock errorBlock:(void(^)(NSError *))errorBlock;

=== modified file 'UbuntuOneAuthKit/UOAuthManager.m'
--- UbuntuOneAuthKit/UOAuthManager.m	2012-09-19 16:42:39 +0000
+++ UbuntuOneAuthKit/UOAuthManager.m	2012-09-25 21:23:23 +0000
@@ -10,15 +10,14 @@
 #import "UOJSONFetchOperation.h"
 #import "UOHTTPFetchOperation.h"
 #import "UOSSOMusicCredsFetchOperation.h"
+#import "UOKeyManager.h"
 
 #import "NSString+Extras.h"
 #import "OAConsumer.h"
 #import "OAToken.h"
 #import "OAPlaintextSignatureProvider.h"
 #import "OAMutableURLRequest.h"
-#import "Subsonic.h"
 
-static NSString *const UOSingleSignOnBaseURL = @"https://login.ubuntu.com/api/1.0/";
 static NSString *UOSSOEncodedStringFromParametersDictionary(NSDictionary *arguments) {
 	NSMutableArray *encodedArguments = [NSMutableArray array];
 	[arguments enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL *stop) {
@@ -32,8 +31,6 @@
 }
 
 @interface UOAuthManager () {
-    NSString *subsonicUsername;
-    NSString *subsonicPassword;
     NSOperationQueue *operationQueue;
     
     /* rockstar (16 Sept 2012) - I don't like this interface. It does not persist,
@@ -64,7 +61,6 @@
 }
 
 -(void)loginWithUsername:(NSString *)username andPassword:(NSString *)password tokenName:(NSString *)tokenName completionBlock:(void (^)())completionBlock errorBlock:(void (^)(NSError *))errorBlock {
-    if (consumer || token || signatureProvider) { return; }
     
     NSDictionary *params = [NSDictionary dictionaryWithObjectsAndKeys:@"authenticate", @"ws.op", tokenName, @"token_name", nil];
 	NSString *paramsString = UOSSOEncodedStringFromParametersDictionary(params);
@@ -116,7 +112,6 @@
 #pragma mark Subsonic specific methods
 
 -(void)fetchSubsonicCredentials:(void (^)(NSString *))completionBlock errorBlock:(void (^)(NSError *))errorBlock {
-    if (consumer == nil) { return; }
     
     NSURL *credsURL = [NSURL URLWithString:@"https://one.ubuntu.com/phones/creds/ios?scheme=x-ubuntuone-music"];
     OAMutableURLRequest *credsRequest = [[OAMutableURLRequest alloc] initWithURL:credsURL consumer:consumer token:token realm:nil signatureProvider:signatureProvider];
@@ -132,13 +127,22 @@
             return;
         }
         
-        subsonicUsername = credsOperation.username;
-        subsonicPassword = credsOperation.password;
+        NSString *subsonicUsername = credsOperation.username;
+        NSString *subsonicPassword = credsOperation.password;
         
         if (subsonicUsername && subsonicPassword) {
-            [[Subsonic sharedSubsonic] storeUsername:subsonicUsername password:subsonicPassword];
-            if (completionBlock) {
-                completionBlock(subsonicUsername);
+            UOKeyManager *manager = [UOKeyManager sharedManager];
+            if ([manager createKey:UOSubsonicUsernameKey withValue:subsonicUsername] &&
+                [manager createKey:UOSubsonicPasswordKey withValue:subsonicPassword]) {
+                if (completionBlock) {
+                    completionBlock(subsonicUsername);
+                }
+            } else {
+                NSString *message = NSLocalizedString(@"An error occurred storing credentials", nil);
+                NSError *error = [NSError errorWithDomain:@"UOAuthManagerErrorDomain"
+                                                     code:-2
+                                                 userInfo:[NSDictionary dictionaryWithObjectsAndKeys:message, NSLocalizedDescriptionKey, nil]];
+                errorBlock(error);
             }
         } else {
             if (errorBlock) {
@@ -154,21 +158,17 @@
 }
 
 -(NSString *)subsonicUsername {
-    if (!subsonicUsername) {
-        subsonicUsername = [[Subsonic sharedSubsonic] defaultUserName];
-    }
-    return subsonicUsername;
+    return [[UOKeyManager sharedManager] readKey:UOSubsonicUsernameKey];
 }
 
 -(NSString *)subsonicPassword {
-    if (!subsonicPassword) {
-        subsonicPassword = [[Subsonic sharedSubsonic] defaultPassword];
-    }
-    return subsonicPassword;
+    return [[UOKeyManager sharedManager] readKey:UOSubsonicPasswordKey];
 }
 
 -(void)clearSubsonicCredentials {
-    [[Subsonic sharedSubsonic] removeCredentials];
+    UOKeyManager *manager = [UOKeyManager sharedManager];
+    [manager deleteKey:UOSubsonicUsernameKey];
+    [manager deleteKey:UOSubsonicPasswordKey];
 }
 
 @end

=== added file 'UbuntuOneAuthKit/UOKeyManager.h'
--- UbuntuOneAuthKit/UOKeyManager.h	1970-01-01 00:00:00 +0000
+++ UbuntuOneAuthKit/UOKeyManager.h	2012-09-25 21:23:23 +0000
@@ -0,0 +1,16 @@
+//
+//  UOKeyManager.h
+//  UbuntuOneAuthKit
+//
+//  Created by Paul Hummer on 9/20/12.
+//  Copyright (c) 2012 Canonical, Ltd. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface UOKeyManager : NSObject
++(UOKeyManager *)sharedManager;
+-(BOOL)createKey:(NSString *)identifier withValue:(NSString *)value;
+-(NSString *)readKey:(NSString *)identifier;
+-(BOOL)deleteKey:(NSString *)identifier;
+@end

=== added file 'UbuntuOneAuthKit/UOKeyManager.m'
--- UbuntuOneAuthKit/UOKeyManager.m	1970-01-01 00:00:00 +0000
+++ UbuntuOneAuthKit/UOKeyManager.m	2012-09-25 21:23:23 +0000
@@ -0,0 +1,92 @@
+//
+//  UOKeyManager.m
+//  UbuntuOneAuthKit
+//
+//  Created by Paul Hummer on 9/20/12.
+//  Copyright (c) 2012 Canonical, Ltd. All rights reserved.
+//
+
+#import "UOKeyManager.h"
+#import <Security/Security.h>
+
+static NSString *serviceName = @"[Ubuntu One Keychain]";
+
+@implementation UOKeyManager
+
++(UOKeyManager *)sharedManager {
+    static UOKeyManager *sharedInstance = nil;
+    static dispatch_once_t once;
+    dispatch_once(&once, ^{
+        sharedInstance = [[UOKeyManager alloc] init];
+    });
+    return sharedInstance;
+}
+
+-(NSMutableDictionary *)serviceDictionary:(NSString *)identifier {
+    NSMutableDictionary *dictionary = [[NSMutableDictionary alloc] init];
+    [dictionary setObject:(__bridge id)kSecClassGenericPassword forKey:(__bridge id)kSecClass];
+    
+    [dictionary setObject:identifier forKey:(__bridge id)kSecAttrAccount];
+    [dictionary setObject:serviceName forKey:(__bridge id)kSecAttrService];
+    [dictionary setObject:serviceName forKey:(__bridge id)kSecAttrLabel];
+    
+    return dictionary;
+}
+
+-(BOOL)createKey:(NSString *)identifier withValue:(NSString *)value {
+    
+    NSString *existing = [self readKey:identifier];
+    if (existing) {
+        [self deleteKey:identifier];
+    }
+    
+    NSMutableDictionary *dictionary = [self serviceDictionary:identifier];
+#if TARGET_IPHONE_SIMULATOR
+    /* This isn't required, but the example app does it, and we may want to add the access group
+     later on, and I don't want to have to go figure this obscure thing out.
+     */
+    [dictionary removeObjectForKey:(__bridge id)kSecAttrAccessGroup];
+#endif
+    
+    [dictionary setObject:[value dataUsingEncoding:NSUTF8StringEncoding] forKey:(__bridge id)kSecValueData];
+    
+    OSStatus status = SecItemAdd((__bridge CFDictionaryRef)dictionary, NULL);
+    if (status == errSecSuccess) { // -25299 means duplicate item
+        return YES;
+    }
+    return NO;
+}
+
+-(BOOL)deleteKey:(NSString *)identifier {
+    NSMutableDictionary *dictionary = [self serviceDictionary:identifier];
+    
+    OSStatus status = SecItemDelete((__bridge CFDictionaryRef)dictionary);
+    if (status == errSecSuccess) {
+        return YES;
+    }
+    return NO;
+}
+
+-(NSString *)readKey:(NSString *)identifier {
+    NSMutableDictionary *dictionary = [self serviceDictionary:identifier];
+    
+    [dictionary setObject:(__bridge id)kSecMatchLimitOne forKey:(__bridge id)kSecMatchLimit];
+    [dictionary setObject:(__bridge id)kCFBooleanTrue forKey:(__bridge id)kSecReturnData];
+    
+    CFDataRef resultData = NULL;
+    OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)dictionary,  (CFTypeRef *)&resultData);
+    
+    if (status != errSecSuccess) {
+        /* We should really be handling the error here */
+        return nil;
+    }
+    
+    NSData *result = (__bridge_transfer NSData *)resultData;
+    if (result) {
+        NSString *resultString = [[NSString alloc] initWithData:result encoding:NSUTF8StringEncoding];
+        return resultString;
+    }
+    return nil;
+}
+
+@end

=== modified file 'UbuntuOneAuthKitTests/UbuntuOneAuthKitTests.m'
--- UbuntuOneAuthKitTests/UbuntuOneAuthKitTests.m	2012-09-15 17:33:52 +0000
+++ UbuntuOneAuthKitTests/UbuntuOneAuthKitTests.m	2012-09-25 21:23:23 +0000
@@ -8,6 +8,12 @@
 
 #import "UbuntuOneAuthKitTests.h"
 
+#import "UOAuthManager.h"
+#import "UOKeyManager.h"
+
+static NSString *TestKey = @"Ubuntu One Test Key";
+static NSString *TestValue = @"Super Cool Wrist Bands";
+
 @implementation UbuntuOneAuthKitTests
 
 - (void)setUp
@@ -19,14 +25,60 @@
 
 - (void)tearDown
 {
-    // Tear-down code here.
+    UOKeyManager *manager = [UOKeyManager sharedManager];
+    NSArray *keys = [NSArray arrayWithObjects:TestKey, UOSubsonicUsernameKey, UOSubsonicPasswordKey, nil];
+    for (NSString *key in keys) {
+        [manager deleteKey:key];
+    }
     
     [super tearDown];
 }
 
-- (void)testExample
-{
-    STFail(@"Unit tests are not implemented yet in UbuntuOneAuthKitTests");
+#pragma mark
+#pragma mark UOKeyManager Tests
+
+- (void)testUOKeyManagerCreateKey {
+    STAssertTrue([[UOKeyManager sharedManager] createKey:TestKey withValue:TestValue], nil);
+}
+
+- (void)testUOKeyManagerDeleteKey {
+    [[UOKeyManager sharedManager] createKey:TestKey withValue:TestValue];
+    
+    STAssertTrue([[UOKeyManager sharedManager] deleteKey:TestKey], nil);
+}
+
+- (void)testUOKeyManagerGetKey {
+    [[UOKeyManager sharedManager] createKey:TestKey withValue:TestValue];
+    STAssertEqualObjects([[UOKeyManager sharedManager] readKey:TestKey], TestValue, nil);
+}
+
+#pragma mark
+#pragma mark UOAuthManager Tests
+
+- (void)testUOAuthManagerSubsonicUsername {
+    NSString *username = @"Test User";
+    [[UOKeyManager sharedManager] createKey:UOSubsonicUsernameKey withValue:username];
+    
+    STAssertEqualObjects([[UOAuthManager sharedAuthManager] subsonicUsername], username, nil);
+}
+
+- (void)testUOAuthManagerSubsonicPassword {
+    NSString *password = @"password1234";
+    [[UOKeyManager sharedManager] createKey:UOSubsonicPasswordKey withValue:password];
+    
+    STAssertEqualObjects([[UOAuthManager sharedAuthManager] subsonicPassword], password, nil);
+}
+
+- (void)testUOAuthManagerClearCredentials {
+    NSString *username = @"Test User";
+    NSString *password = @"password1234";
+    [[UOKeyManager sharedManager] createKey:UOSubsonicUsernameKey withValue:username];
+    [[UOKeyManager sharedManager] createKey:UOSubsonicPasswordKey withValue:password];
+    
+    [[UOAuthManager sharedAuthManager] clearSubsonicCredentials];
+    
+    STAssertNil([[UOKeyManager sharedManager] readKey:UOSubsonicUsernameKey], nil);
+    STAssertNil([[UOKeyManager sharedManager] readKey:UOSubsonicPasswordKey], nil);
 }
 
 @end