amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-05 08:34:30 +00:00
Code Issues Projects Releases Wiki Activity

Finished vList implementation

Browse Source 
Monotone-Parent: 2570bc0c998646aa6c0501c971a29d77357cb7a1
Monotone-Revision: b798ab587b14c946102732e79770636904870654

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-08-24T20:26:52
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert
2009-08-24 20:26:52 +00:00
parent 2f39baacc1
commit 7a4b84b9b6
22 changed files with 571 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/MailerUI/UIxMailMainFrame.m
+67 -38
View File
@@ -25,6 +25,7 @@
#import <Foundation/NSUserDefaults.h>
#import <NGCards/NGVCard.h>
#import <NGCards/NGVList.h>
#import <NGObjWeb/WOContext.h>
#import <NGObjWeb/WORequest.h>
#import <NGObjWeb/WOResponse.h>
@@ -32,6 +33,8 @@
#import <NGExtensions/NSString+misc.h>
#import <Contacts/SOGoContactObject.h>
#import <Contacts/SOGoContactGCSList.h>
#import <Contacts/SOGoContactGCSEntry.h>
#import <Contacts/SOGoContactFolders.h>
#import <SoObjects/Mailer/SOGoMailObject.h>
@@ -154,18 +157,18 @@
- (id <WOActionResults>) composeAction
{
id <SOGoContactObject> contact;
NSArray *accounts, *contactsId, *n;
NSString *firstAccount, *newLocation, *parameters, *folderId, *uid, *email;
NSMutableString *fn;
id contact;
NSArray *accounts, *contactsId, *cards;
NSString *firstAccount, *newLocation, *parameters, *folderId, *uid;
NSEnumerator *uids;
NSMutableArray *addresses;
NGVCard *card;
NGVList *list;
SOGoMailAccounts *co;
SOGoContactFolders *folders;
SOGoParentFolder *folder;
WORequest *request;
unsigned int max;
int i, count;
parameters = nil;
co = [self clientObject];
@@ -198,43 +201,21 @@
contact = [folder lookupName: uid
inContext: [self context]
acquire: NO];
if (![(NSObject*)contact isKindOfClass: [NSException class]])
if ([contact isKindOfClass: [SOGoContactGCSList class]])
{
list = [contact vList];
cards = [list cardReferences];
count = [cards count];
for (i = 0; i < count; i++)
[addresses addObject:
[self formattedMailtoString: [cards objectAtIndex: i]]];
}
else if ([contact isKindOfClass: [SOGoContactGCSEntry class]])
{
// We fetch the preferred email address of the contact or
// the first defined email address
card = [contact vCard];
email = [card preferredEMail];
if (email == nil)
email = (NSString*)[card firstChildWithTag: @"EMAIL"];
if (email)
{
email = [NSString stringWithFormat: @"<%@>", email];
// We append the contact's name
fn = [NSMutableString stringWithString: [card fn]];
if ([fn length] == 0)
{
n = [card n];
if (n)
{
max = [n count];
if (max > 0)
{
if (max > 1)
fn = [NSMutableString stringWithFormat: @"%@ %@", [n objectAtIndex: 1], [n objectAtIndex: 0]];
else
fn = [NSMutableString stringWithString: [n objectAtIndex: 0]];
}
}
}
if (fn)
{
[fn appendFormat: @" %@", email];
[addresses addObject: fn];
}
else
[addresses addObject: email];
}
[addresses addObject: [self formattedMailtoString: card]];
}
uid = [uids nextObject];
}
@@ -259,6 +240,54 @@
return [self redirectToLocation: newLocation];
}
- (NSString *) formattedMailtoString: (NGVCard *) card
{
NSString *email;
NSMutableString *fn, *rc = nil;
NSArray *n;
unsigned int max;
if ([card respondsToSelector: @selector (preferredEMail)])
email = [card preferredEMail];
else
email = [card email];
if (email == nil)
email = (NSString*)[card firstChildWithTag: @"EMAIL"];
if (email)
{
email = [NSString stringWithFormat: @"<%@>", email];
// We append the contact's name
fn = [NSMutableString stringWithString: [card fn]];
if ([fn length] == 0)
{
n = [card n];
if (n)
{
max = [n count];
if (max > 0)
{
if (max > 1)
fn = [NSMutableString stringWithFormat: @"%@ %@", [n objectAtIndex: 1], [n objectAtIndex: 0]];
else
fn = [NSMutableString stringWithString: [n objectAtIndex: 0]];
}
}
}
if (fn)
{
[fn appendFormat: @" %@", email];
rc = fn;
}
else
rc = email;
}
return rc;
}
- (WOResponse *) getFoldersStateAction
{
NSString *expandedFolders;