Bugfix for initial start. Closes #20

dennisreimann · May 4, 2009 · 8aa7316 · 8aa7316
1 parent 3ec9691
commit 8aa7316
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/Classes/iOctocatAppDelegate.m b/Classes/iOctocatAppDelegate.m
@@ -25,11 +25,10 @@ - (void)applicationDidFinishLaunching:(UIApplication *)application {
 - (GHUser *)currentUser {
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 	NSString *login = [defaults valueForKey:kUsernameDefaultsKey];
-	return ([login isEqualToString:@""]) ? nil : [self userWithLogin:login];
+	return (!login || [login isEqualToString:@""]) ? nil : [self userWithLogin:login];
 }
 
 - (GHUser *)userWithLogin:(NSString *)theUsername {
-	if ([theUsername isEqualToString:@""]) return nil;
 	GHUser *user = [users objectForKey:theUsername];
 	if (user == nil) {
 		user = [[[GHUser alloc] initWithLogin:theUsername] autorelease];
@@ -44,7 +43,7 @@ - (GHUser *)userWithLogin:(NSString *)theUsername {
 // Use this to add credentials (for instance via email) by opening a link:
 // <githubauth://LOGIN:TOKEN@github.com>
 - (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url {
-	if (!url) return NO;
+	if (!url || [[url user] isEqualToString:@""] || [[url password] isEqualToString:@""]) return NO;
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 	[defaults setValue:[url user] forKey:kUsernameDefaultsKey];
 	[defaults setValue:[url password] forKey:kTokenDefaultsKey];