Merge lp:~rockstar/ubuntuone-ios-music/kill-deps into lp:ubuntuone-ios-music

[Paul Hummer]

Kill the need for SFHFKeychainUtils

This branch requires the changes in https://code.launchpad.net/~rockstar/ubuntuoneauthkit/more-cleanup/+merge/126339

Kill the need for SFHFKeychainUtils

[Zachery Bir (urbanape)]

review: Approve

=== modified file 'Other Sources/U1MusicAppDelegate.m'
--- Other Sources/U1MusicAppDelegate.m	2012-09-20 04:09:46 +0000
+++ Other Sources/U1MusicAppDelegate.m	2012-09-25 21:30:30 +0000
@@ -42,11 +42,11 @@
 #import "U1LocalMusicServer.h"
 #import "U1MigrationViewController.h"
 #import "UOSSOCredentialsViewController.h"
+#import "UOAuthManager.h"
 
 @interface U1MusicAppDelegate () <UOSSOCredentialsViewControllerDelegate>
 @property (retain) UOSSOCredentialsViewController *loginController;
 @property (retain) U1LocalMusicServer *musicServer;
-- (void)parseQueryCredentials:(NSURL*)anURL;
 - (BOOL)configureUsernamePassword;
 - (void)presentLoginView;
 - (void)prepareTestFlight;
@@ -145,27 +145,15 @@
 	[self presentLoginView];
 }
 
-- (void)parseQueryCredentials:(NSURL*)anURL
-{
-	URLQueryStringParser *queryStringParser = [[URLQueryStringParser alloc] initWithURL:anURL];
-	NSString *user = [queryStringParser queryStringValueForKey:@"u"];
-	NSString *pass = [queryStringParser queryStringValueForKey:@"p"];
-	
-	if (user != nil && pass != nil)
-	{
-		[[Subsonic sharedSubsonic] storeUsername:user password:pass];
-	}
-}
-
 - (BOOL)configureUsernamePassword
 {
 	BOOL needToRetrieveCredentials = NO;
 	
-	NSString *username = [SFHFKeychainUtils getPasswordForUsername:UBUNTU_ONE_DUMMY_USER_NAME andServiceName:UBUNTU_ONE_SERVICE_NAME error:nil];
+    NSString *username = [[UOAuthManager sharedAuthManager] subsonicUsername];
 	if (username)
 	{
 		[[Subsonic sharedSubsonic] setDefaultUserName:username];
-		[[Subsonic sharedSubsonic] setDefaultPassword:[SFHFKeychainUtils getPasswordForUsername:username andServiceName:UBUNTU_ONE_SERVICE_NAME error:nil]];
+		[[Subsonic sharedSubsonic] setDefaultPassword:[[UOAuthManager sharedAuthManager] subsonicPassword]];
 	}
 	else
 	{

=== modified file 'U1Music.xcodeproj/project.pbxproj'
--- U1Music.xcodeproj/project.pbxproj	2012-09-20 04:07:45 +0000
+++ U1Music.xcodeproj/project.pbxproj	2012-09-25 21:30:30 +0000
@@ -171,7 +171,6 @@
 		93DFFE54135D72420061F29F /* NSManagedObjectContext+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 93DFFE53135D72420061F29F /* NSManagedObjectContext+Additions.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		93EE2AF0124993F100E7E060 /* ArtistListParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EE2AEF124993F100E7E060 /* ArtistListParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		93EE2BA31249F33D00E7E060 /* ArtistParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EE2BA21249F33D00E7E060 /* ArtistParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
-		93F334471247F9DE006C6707 /* SFHFKeychainUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334461247F9DE006C6707 /* SFHFKeychainUtils.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		93F3344D1247FA0B006C6707 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3344C1247FA0B006C6707 /* Reachability.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		93F334521247FA2C006C6707 /* Album.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F3344F1247FA2C006C6707 /* Album.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		93F334531247FA2C006C6707 /* Artist.m in Sources */ = {isa = PBXBuildFile; fileRef = 93F334511247FA2C006C6707 /* Artist.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
@@ -503,8 +502,6 @@
 		93EE2AEF124993F100E7E060 /* ArtistListParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArtistListParser.m; sourceTree = "<group>"; };
 		93EE2BA11249F33D00E7E060 /* ArtistParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArtistParser.h; sourceTree = "<group>"; };
 		93EE2BA21249F33D00E7E060 /* ArtistParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArtistParser.m; sourceTree = "<group>"; };
-		93F334451247F9DE006C6707 /* SFHFKeychainUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFHFKeychainUtils.h; sourceTree = "<group>"; };
-		93F334461247F9DE006C6707 /* SFHFKeychainUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFHFKeychainUtils.m; sourceTree = "<group>"; };
 		93F3344B1247FA0B006C6707 /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
 		93F3344C1247FA0B006C6707 /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
 		93F3344E1247FA2C006C6707 /* Album.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Album.h; sourceTree = "<group>"; };
@@ -986,8 +983,6 @@
 				93F334741247FB9F006C6707 /* AudioStreamer.m */,
 				93F3344B1247FA0B006C6707 /* Reachability.h */,
 				93F3344C1247FA0B006C6707 /* Reachability.m */,
-				93F334451247F9DE006C6707 /* SFHFKeychainUtils.h */,
-				93F334461247F9DE006C6707 /* SFHFKeychainUtils.m */,
 				93BC52A5124C1E6900B7587C /* StreamingPlayer.h */,
 				93BC52A6124C1E6900B7587C /* StreamingPlayer.m */,
 				93D6B5491252CE57007880B0 /* URLQueryStringParser.h */,
@@ -1395,7 +1390,6 @@
 				936F20681227364200070F43 /* Playlist.m in Sources */,
 				936F209012273D9000070F43 /* Song.m in Sources */,
 				936F230A12284D1900070F43 /* NamedTextFieldCell.m in Sources */,
-				93F334471247F9DE006C6707 /* SFHFKeychainUtils.m in Sources */,
 				93F3344D1247FA0B006C6707 /* Reachability.m in Sources */,
 				93F334521247FA2C006C6707 /* Album.m in Sources */,
 				93F334531247FA2C006C6707 /* Artist.m in Sources */,

=== modified file 'U1Music_Prefix.pch'
--- U1Music_Prefix.pch	2012-02-10 17:38:18 +0000
+++ U1Music_Prefix.pch	2012-09-25 21:30:30 +0000
@@ -16,7 +16,6 @@
 	#import "MOC.h"
 	#import "NSManagedObjectContext+Additions.h"
 	#import "NSString+Extras.h"
-	#import "SFHFKeychainUtils.h"
     #import "TestFlight.h"
  	#define RELEASE_SAFELY(__obj) [__obj release], __obj = nil;
 

=== removed file 'utilities/SFHFKeychainUtils.h'
--- utilities/SFHFKeychainUtils.h	2010-09-20 20:32:15 +0000
+++ utilities/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 'utilities/SFHFKeychainUtils.m'
--- utilities/SFHFKeychainUtils.m	2010-09-24 05:34:15 +0000
+++ utilities/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

=== modified file 'utilities/Subsonic.h'
--- utilities/Subsonic.h	2011-11-05 00:42:21 +0000
+++ utilities/Subsonic.h	2012-09-25 21:30:30 +0000
@@ -47,5 +47,4 @@
 - (NSURL *)getStreamingURLForSongId:(NSString*)songId;
 - (NSURL *)buildURLWithBase:(NSString *)baseURL action:(NSString *)action parameters:(NSArray *)extraParameters;
 - (void)removeCredentials;
-- (void)storeUsername:(NSString*)username password:(NSString*)password;
 @end

=== modified file 'utilities/Subsonic.m'
--- utilities/Subsonic.m	2011-11-05 00:42:21 +0000
+++ utilities/Subsonic.m	2012-09-25 21:30:30 +0000
@@ -24,6 +24,7 @@
 #include <arpa/inet.h>
 #import "NSMutableArray+Extras.h"
 #import "Reachability.h"
+#import "UOAuthManager.h"
 
 @interface Subsonic ()
 @property (readwrite, retain) Reachability *reachability;
@@ -62,10 +63,10 @@
 
 - (BOOL)hasCredentials
 {
-	NSString *username = [SFHFKeychainUtils getPasswordForUsername:UBUNTU_ONE_DUMMY_USER_NAME andServiceName:UBUNTU_ONE_SERVICE_NAME error:nil];
+    NSString *username = [[UOAuthManager sharedAuthManager] subsonicUsername];
 	if (username)
 	{
-		NSString *password = [SFHFKeychainUtils getPasswordForUsername:username andServiceName:UBUNTU_ONE_SERVICE_NAME error:nil];
+        NSString *password = [[UOAuthManager sharedAuthManager] subsonicPassword];
 		return (password != nil);
 	}
 	else
@@ -76,24 +77,7 @@
 
 - (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;
+    [[UOAuthManager sharedAuthManager] clearSubsonicCredentials];
 }
 
 - (NSURL *)getStreamingURLForSongId:(NSString*)songId