Restore previously-selected account after launch on iPad

omz · May 26, 2012 · 2b43c86 · 2b43c86
1 parent 4dc8656
commit 2b43c86
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/Classes/AppSalesAppDelegate.m b/Classes/AppSalesAppDelegate.m
@@ -82,7 +82,17 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
 	[self showPasscodeLockIfNeeded];
 	if (iPad) {
-		[self selectAccount:nil];
+		//Restore previously-selected account:
+		NSString *accountIDURIString = [[NSUserDefaults standardUserDefaults] stringForKey:kSettingSelectedAccountID];
+		if (accountIDURIString) {
+			NSManagedObjectID *accountID = [self.managedObjectContext.persistentStoreCoordinator managedObjectIDForURIRepresentation:[NSURL URLWithString:accountIDURIString]];
+			ASAccount *account = (ASAccount *)[self.managedObjectContext objectWithID:accountID];
+			if (account) {
+				[self accountsViewController:nil didSelectAccount:account];
+			}
+		} else {
+			[self selectAccount:nil];
+		}
 	}
 
 	return YES;
@@ -99,6 +109,9 @@ - (void)accountsViewController:(AccountsViewController *)viewController didSelec
 {
 	[self.accountsPopover dismissPopoverAnimated:YES];
 	[self loadAccount:account];
+
+	NSString *accountIDURIString = [[[account objectID] URIRepresentation] absoluteString];
+	[[NSUserDefaults standardUserDefaults] setObject:accountIDURIString forKey:kSettingSelectedAccountID];
 }
 
 - (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex

diff --git a/OtherSources/GlobalSettings.h b/OtherSources/GlobalSettings.h
@@ -13,4 +13,6 @@
 #define kSettingDashboardShowWeeks		@"DashboardShowWeeks"
 #define kSettingDownloadPayments		@"DownloadPayments"
 
+#define kSettingSelectedAccountID		@"SelectedAccountID"
+
 #define ASWillShowPasscodeLockNotification	@"ASWillShowPasscodeLockNotification"