Add support for MobileMe accounts and iCal subscribed calendars. Cred…

…it: David Barroso.

Classes/SPEmailAccount.h

@@ -18,6 +18,7 @@
 	NSString *hostname;
 	NSString *username;
 	NSString *displayName;
+	NSMutableArray *calendars;
 }
 
 @property (nonatomic, retain) NSString *fullname;
@@ -26,6 +27,7 @@
 @property (nonatomic, retain) NSString *hostname;
 @property (nonatomic, retain) NSString *username;
 @property (nonatomic, retain) NSString *displayName;
+@property (nonatomic, retain) NSArray *calendars;
 
 + (SPEmailAccount *)accountWithDictionary:(NSDictionary *)d;
 - (NSArray *)infoArray;

Classes/SPEmailAccount.m

@@ -18,6 +18,7 @@ @implementation SPEmailAccount
 @synthesize hostname;
 @synthesize username;
 @synthesize displayName;
+@synthesize calendars;
 
 - (void)dealloc {
 	[fullname release];
@@ -44,6 +45,10 @@ - (NSArray *)infoArray {
 		for (id emailAddress in emails)
 			[a addObject:[NSString stringWithFormat:@"Email: %@", emailAddress]];
 	}
+	if (calendars) {
+		for (id calendar in calendars)
+			[a addObject:[NSString stringWithFormat:@"Calendar URL: %@", calendar]];
+	}
 
 	return a;
 }

Classes/SPEmailMobileMeAccount.h

@@ -0,0 +1,17 @@
+//
+//  SPEmailMobileMeAccount.h
+//  SpyPhone
+//
+//  Created by Nicolas Seriot on 11/20/09.
+//  Copyright 2009. 
+//  Licensed under GPL 2.0 http://www.gnu.org/licenses/gpl-2.0.txt
+//
+
+#import "SPEmailAccount.h"
+
+
+@interface SPEmailMobileMeAccount : SPEmailAccount {
+
+}
+
+@end

Classes/SPEmailMobileMeAccount.m

@@ -0,0 +1,36 @@
+//
+//  SPEmailMobileMeAccount.m
+//  SpyPhone
+//
+//  Created by Nicolas Seriot on 11/20/09.
+//  Copyright 2009. 
+//  Licensed under GPL 2.0 http://www.gnu.org/licenses/gpl-2.0.txt
+//
+
+#import "SPEmailMobileMeAccount.h"
+
+
+@implementation SPEmailMobileMeAccount
+
++ (SPEmailAccount *)accountWithDictionary:(NSDictionary *)d {
+	SPEmailMobileMeAccount *account = [[SPEmailMobileMeAccount alloc] init];
+
+	account.type = [d valueForKey:@"Short Type String"];
+	account.fullname = [d valueForKey:@"FullUserName"];
+	account.emails = [d valueForKey:@"EmailAddresses"];
+	account.username = [d valueForKey:@"Username"];
+	account.displayName = [d valueForKey:@"DisplayName"];
+
+	NSMutableArray *theCalendars = [NSMutableArray array];
+	NSDictionary *calendars = [d valueForKey:@"Subscribed Calendars"];
+	if (calendars) {
+		for(id calendarItem in [calendars allValues]) {
+			[theCalendars addObject:[calendarItem valueForKey:@"com.apple.ical.urlsubscribe.url"]];
+		}
+
+		account.calendars = theCalendars;
+	}
+	return [account autorelease];
+}
+
+@end

Classes/SPSourceEmailTVC.m

@@ -14,6 +14,7 @@
 #import "SPEmailIToolsAccount.h"
 #import "SPEmailGmailAccount.h"
 #import "SPEmailIMAPAccount.h"
+#import "SPEmailMobileMeAccount.h"
 
 @implementation SPSourceEmailTVC
 
@@ -44,11 +45,12 @@ - (void)loadData {
 	NSArray *accounts = [d valueForKey:@"Accounts"];
 	for(NSDictionary *account in accounts) {
 		NSString *classValue = [account valueForKey:@"Class"];
-		if([classValue isEqualToString:@"ASAccount"])     [accountsFound addObject:[SPEmailASAccount accountWithDictionary:account]];
-		if([classValue isEqualToString:@"POPAccount"])    [accountsFound addObject:[SPEmailPOPAccount accountWithDictionary:account]];
-		if([classValue isEqualToString:@"iToolsAccount"]) [accountsFound addObject:[SPEmailIToolsAccount accountWithDictionary:account]];
-		if([classValue isEqualToString:@"GmailAccount"])  [accountsFound addObject:[SPEmailGmailAccount accountWithDictionary:account]];
-		if([classValue isEqualToString:@"IMAPAccount"])   [accountsFound addObject:[SPEmailIMAPAccount accountWithDictionary:account]];
+		if([classValue isEqualToString:@"ASAccount"])       [accountsFound addObject:[SPEmailASAccount accountWithDictionary:account]];
+		if([classValue isEqualToString:@"POPAccount"])      [accountsFound addObject:[SPEmailPOPAccount accountWithDictionary:account]];
+		if([classValue isEqualToString:@"iToolsAccount"])   [accountsFound addObject:[SPEmailIToolsAccount accountWithDictionary:account]];
+		if([classValue isEqualToString:@"GmailAccount"])    [accountsFound addObject:[SPEmailGmailAccount accountWithDictionary:account]];
+		if([classValue isEqualToString:@"IMAPAccount"])	    [accountsFound addObject:[SPEmailIMAPAccount accountWithDictionary:account]];
+		if([classValue isEqualToString:@"MobileMeAccount"])	[accountsFound addObject:[SPEmailMobileMeAccount accountWithDictionary:account]];
 	}
 
 	for(SPEmailAccount *account in accountsFound) {