LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 77e266118db7711a96eaa7860269a06901b65f60 

Monotone-Revision: 1c9f1cddb35ec2af1a800051b41880aec42781be

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-10-14T21:37:39
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-10-14 21:37:39 +00:00
parent 4a9bc9ddb8
commit 7685b34daf
3 changed files with 167 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
OpenChange/MAPIStoreContext.m
View File

@ -208,7 +208,7 @@ static MAPIStoreMapping *mapping = nil;
- (void) dealloc
{
[self logWithFormat: @"-dealloc"];
[self logWithFormat: @"-dealloc: %@", self];
[messageCache release];
[subfolderCache release];
@ -449,7 +449,7 @@ static MAPIStoreMapping *mapping = nil;
{
[self logWithFormat: @"METHOD '%s' (%d)", __FUNCTION__, __LINE__];
return MAPISTORE_SUCCESS;
return MAPISTORE_ERROR;
}
@ -467,7 +467,7 @@ static MAPIStoreMapping *mapping = nil;
{
[self logWithFormat: @"METHOD '%s' (%d)", __FUNCTION__, __LINE__];
return MAPISTORE_SUCCESS;
return MAPISTORE_ERROR;
}
@ -552,29 +552,34 @@ static MAPIStoreMapping *mapping = nil;
[self logWithFormat: @"METHOD '%s' (%d)", __FUNCTION__, __LINE__];
url = [mapping urlFromID: fid];
if (!url)
[self errorWithFormat: @"No url found for FID: %lld", fid];
switch (tableType)
if (url)
{
case MAPISTORE_FOLDER_TABLE:
ids = [self _subfolderKeysForFolderURL: url];
break;
case MAPISTORE_MESSAGE_TABLE:
ids = [self _messageKeysForFolderURL: url];
break;
default:
rc = MAPISTORE_ERR_INVALID_PARAMETER;
ids = nil;
}
if ([ids isKindOfClass: [NSArray class]])
{
rc = MAPI_E_SUCCESS;
*rowCount = [ids count];
switch (tableType)
{
case MAPISTORE_FOLDER_TABLE:
ids = [self _subfolderKeysForFolderURL: url];
break;
case MAPISTORE_MESSAGE_TABLE:
ids = [self _messageKeysForFolderURL: url];
break;
default:
rc = MAPISTORE_ERR_INVALID_PARAMETER;
ids = nil;
}
if ([ids isKindOfClass: [NSArray class]])
{
rc = MAPI_E_SUCCESS;
*rowCount = [ids count];
}
else
rc = MAPISTORE_ERR_NO_DIRECTORY;
}
else
rc = MAPISTORE_ERR_NO_DIRECTORY;
{
[self errorWithFormat: @"No url found for FID: %lld", fid];
rc = MAPISTORE_ERR_NOT_FOUND;
}
return rc;
}
@ -649,6 +654,12 @@ static MAPIStoreMapping *mapping = nil;
case PR_DEPTH: // TODO: DOUBT
*data = MAPILongLongValue (memCtx, 0);
break;
case PR_ACCESS: // TODO
*data = MAPILongValue (memCtx, 0x02);
break;
case PR_ACCESS_LEVEL: // TODO
*data = MAPILongValue (memCtx, 0x00000000);
break;
case PR_VD_VERSION:
/* mandatory value... wtf? */
*data = MAPILongValue (memCtx, 8);

156
OpenChange/MAPIStoreMailContext.m
View File

@ -139,6 +139,9 @@ static Class SOGoUserFolderK;
case PR_HASATTACH: // TODO
*data = MAPIBoolValue (memCtx, NO);
break;
case PR_CREATION_TIME: // DOUBT
case PR_LAST_MODIFICATION_TIME: // DOUBT
case PR_LATEST_DELIVERY_TIME: // DOUBT
case PR_MESSAGE_DELIVERY_TIME:
child = [self lookupObject: childURL];
offsetDate = [[child date] addYear: -1 month: 0 day: 0
@ -157,6 +160,7 @@ static Class SOGoUserFolderK;
case PR_FLAG_STATUS: // TODO
case PR_SENSITIVITY: // TODO
case PR_ORIGINAL_SENSITIVITY: // TODO
case PR_FOLLOWUP_ICON: // TODO
*data = MAPILongValue (memCtx, 0);
break;
@ -173,36 +177,49 @@ static Class SOGoUserFolderK;
NSArray *acceptedTypes;
child = [self lookupObject: childURL];
acceptedTypes = [NSArray arrayWithObject: @"text/plain"];
acceptedTypes = [NSArray arrayWithObjects: @"text/plain",
@"text/html", nil];
keys = [NSMutableArray array];
[child addRequiredKeysOfStructure: [child bodyStructure]
path: @"" toArray: keys
acceptedTypes: acceptedTypes];
if ([keys count] > 0)
{
id result;
NSData *content;
NSString *key, *stringContent;
result = [child fetchParts: [keys objectsForKey: @"key"
notFoundMarker: nil]];
result = [[result valueForKey: @"RawResponse"] objectForKey:
@"fetch"];
key = [[keys objectAtIndex: 0] objectForKey: @"key"];
content = [[result objectForKey: key] objectForKey: @"data"];
stringContent = [[NSString alloc] initWithData: content
encoding: NSISOLatin1StringEncoding];
// *data = NULL;
// rc = MAPISTORE_ERR_NOT_FOUND;
*data = [stringContent asUnicodeInMemCtx: memCtx];
}
else
if ([keys count] == 0 || [keys count] == 2)
{
*data = NULL;
rc = MAPISTORE_ERR_NOT_FOUND;
}
else
{
acceptedTypes = [NSArray arrayWithObject: @"text/plain"];
[keys removeAllObjects];
[child addRequiredKeysOfStructure: [child bodyStructure]
path: @"" toArray: keys
acceptedTypes: acceptedTypes];
if ([keys count] > 0)
{
id result;
NSData *content;
NSString *key, *stringContent;
result = [child fetchParts: [keys objectsForKey: @"key"
notFoundMarker: nil]];
result = [[result valueForKey: @"RawResponse"] objectForKey: @"fetch"];
key = [[keys objectAtIndex: 0] objectForKey: @"key"];
content = [[result objectForKey: key] objectForKey: @"data"];
stringContent = [[NSString alloc] initWithData: content
encoding: NSISOLatin1StringEncoding];
// *data = NULL;
// rc = MAPISTORE_ERR_NOT_FOUND;
*data = [stringContent asUnicodeInMemCtx: memCtx];
}
else
{
*data = NULL;
rc = MAPISTORE_ERR_NOT_FOUND;
}
}
}
break;
@ -244,14 +261,15 @@ static Class SOGoUserFolderK;
/* We don't handle any RTF content. */
case PR_RTF_COMPRESSED:
case PR_RTF_IN_SYNC:
*data = NULL;
rc = MAPISTORE_ERR_NOT_FOUND;
break;
case PR_RTF_IN_SYNC:
*data = MAPIBoolValue (memCtx, NO);
break;
// #define PR_ITEM_TEMPORARY_FLAGS PROP_TAG(PT_LONG , 0x1097) /* 0x10970003 */
// #define PR_SEARCH_KEY PROP_TAG(PT_BINARY , 0x300b) /* 0x300b0102 */
// 36030003 - PR_CONTENT_UNREAD
// 36020003 - PR_CONTENT_COUNT
@ -281,6 +299,96 @@ static Class SOGoUserFolderK;
case PR_READ_RECEIPT_REQUESTED: // TODO
*data = MAPIBoolValue (memCtx, NO);
break;
/* BOOL */
case PR_ALTERNATE_RECIPIENT_ALLOWED:
case PR_AUTO_FORWARDED:
case PR_DL_EXPANSION_PROHIBITED:
case PR_RESPONSE_REQUESTED:
case PR_REPLY_REQUESTED:
case PR_DELETE_AFTER_SUBMIT:
case PR_PROCESSED:
case PR_ORIGINATOR_DELIVERY_REPORT_REQUESTED:
case PR_RECIPIENT_REASSIGNMENT_PROHIBITED:
*data = MAPIBoolValue (memCtx, NO);
break;
/* PT_SYSTIME */
case PR_START_DATE:
case PR_END_DATE:
case PR_ACTION_DATE:
case PR_FLAG_COMPLETE:
case PR_DEFERRED_DELIVERY_TIME:
case PR_REPORT_TIME:
case PR_CLIENT_SUBMIT_TIME:
case PR_DEFERRED_SEND_TIME:
case PR_ORIGINAL_SUBMIT_TIME:
/* PT_BINARY */
case PR_CONVERSATION_KEY:
case PR_ORIGINALLY_INTENDED_RECIPIENT_NAME:
case PR_PARENT_KEY:
case PR_REPORT_TAG:
case PR_SENT_REPRESENTING_SEARCH_KEY:
case PR_RECEIVED_BY_ENTRYID:
case PR_SENT_REPRESENTING_ENTRYID:
case PR_RCVD_REPRESENTING_ENTRYID:
case PR_ORIGINAL_AUTHOR_ENTRYID:
case PR_REPLY_RECIPIENT_ENTRIES:
case PR_RECEIVED_BY_SEARCH_KEY:
case PR_RCVD_REPRESENTING_SEARCH_KEY:
case PR_SEARCH_KEY:
case PR_CHANGE_KEY:
case PR_ORIGINAL_AUTHOR_SEARCH_KEY:
case PR_CONVERSATION_INDEX:
case PR_SENDER_ENTRYID:
case PR_SENDER_SEARCH_KEY:
/* PT_SVREID*/
case PR_SENT_MAILSVR_EID:
*data = NULL;
rc = MAPISTORE_ERR_NOT_FOUND;
break;
/* PR_LONG */
case PR_OWNER_APPT_ID:
case PR_ACTION_FLAG:
case PR_INTERNET_CPID:
case PR_INET_MAIL_OVERRIDE_FORMAT:
*data = NULL;
rc = MAPISTORE_ERR_NOT_FOUND;
break;
case PR_MSG_EDITOR_FORMAT:
{
NSMutableArray *keys;
NSArray *acceptedTypes;
uint32_t format;
child = [self lookupObject: childURL];
format = 0; /* EDITOR_FORMAT_DONTKNOW */
acceptedTypes = [NSArray arrayWithObject: @"text/plain"];
keys = [NSMutableArray array];
[child addRequiredKeysOfStructure: [child bodyStructure]
path: @"" toArray: keys
acceptedTypes: acceptedTypes];
if ([keys count] == 1)
format = EDITOR_FORMAT_PLAINTEXT;
acceptedTypes = [NSArray arrayWithObject: @"text/html"];
[keys removeAllObjects];
[child addRequiredKeysOfStructure: [child bodyStructure]
path: @"" toArray: keys
acceptedTypes: acceptedTypes];
if ([keys count] == 1)
format = EDITOR_FORMAT_HTML;
*data = MAPILongValue (memCtx, format);
}
break;
default:
rc = [super getMessageTableChildproperty: data
atURL: childURL

1
OpenChange/MAPIStoreMapping.m
View File

@ -37,6 +37,7 @@
- (void) _setupFixedMapping
{
[self registerURL: @"sogo://openchange:openchange@mail/folderINBOX" withID: 0x160001];
[self registerURL: @"sogo://openchange:openchange@mail/folderxxxc0001" withID: 0x0c0001];
[self registerURL: @"sogo://openchange:openchange@contacts/personal" withID: 0x1a0001];
[self registerURL: @"sogo://openchange:openchange@calendar/personal" withID: 0x190001];
[self registerURL: @"sogo://openchange:openchange@tasks/personal" withID: 0x1d0001];