diff options
38 files changed, 88 insertions, 151 deletions
diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj index 0c85b968..a754bf70 100644 --- a/build-mac/mailcore2.xcodeproj/project.pbxproj +++ b/build-mac/mailcore2.xcodeproj/project.pbxproj @@ -115,7 +115,7 @@ C64EA6FF169E847800778456 /* MCMessageHeader.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA69F169E847800778456 /* MCMessageHeader.cc */; }; C64EA701169E847800778456 /* MCAutoreleasePool.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6A2169E847800778456 /* MCAutoreleasePool.cc */; }; C64EA704169E847800778456 /* MCArray.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6A5169E847800778456 /* MCArray.cc */; }; - C64EA706169E847800778456 /* MCAssert.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6A7169E847800778456 /* MCAssert.cc */; }; + C64EA706169E847800778456 /* MCAssert.c in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6A7169E847800778456 /* MCAssert.c */; }; C64EA708169E847800778456 /* MCData.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6A9169E847800778456 /* MCData.cc */; }; C64EA70A169E847800778456 /* MCHash.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6AB169E847800778456 /* MCHash.cc */; }; C64EA70C169E847800778456 /* MCHashMap.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6AD169E847800778456 /* MCHashMap.cc */; }; @@ -435,7 +435,7 @@ C6BA2B9E1705F4E6003F0E9E /* MCMessageHeader.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA69F169E847800778456 /* MCMessageHeader.cc */; }; C6BA2B9F1705F4E6003F0E9E /* MCAutoreleasePool.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6A2169E847800778456 /* MCAutoreleasePool.cc */; }; C6BA2BA01705F4E6003F0E9E /* MCArray.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6A5169E847800778456 /* MCArray.cc */; }; - C6BA2BA11705F4E6003F0E9E /* MCAssert.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6A7169E847800778456 /* MCAssert.cc */; }; + C6BA2BA11705F4E6003F0E9E /* MCAssert.c in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6A7169E847800778456 /* MCAssert.c */; }; C6BA2BA21705F4E6003F0E9E /* MCData.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6A9169E847800778456 /* MCData.cc */; }; C6BA2BA31705F4E6003F0E9E /* MCHash.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6AB169E847800778456 /* MCHash.cc */; }; C6BA2BA41705F4E6003F0E9E /* MCHashMap.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA6AD169E847800778456 /* MCHashMap.cc */; }; @@ -1176,7 +1176,7 @@ C64EA6A4169E847800778456 /* MCBaseTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCBaseTypes.h; sourceTree = "<group>"; }; C64EA6A5169E847800778456 /* MCArray.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCArray.cc; sourceTree = "<group>"; }; C64EA6A6169E847800778456 /* MCArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCArray.h; sourceTree = "<group>"; }; - C64EA6A7169E847800778456 /* MCAssert.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCAssert.cc; sourceTree = "<group>"; }; + C64EA6A7169E847800778456 /* MCAssert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = MCAssert.c; sourceTree = "<group>"; }; C64EA6A8169E847800778456 /* MCAssert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCAssert.h; sourceTree = "<group>"; }; C64EA6A9169E847800778456 /* MCData.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCData.cc; sourceTree = "<group>"; }; C64EA6AA169E847800778456 /* MCData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCData.h; sourceTree = "<group>"; }; @@ -1759,7 +1759,7 @@ C64EA6A4169E847800778456 /* MCBaseTypes.h */, C64EA6A5169E847800778456 /* MCArray.cc */, C64EA6A6169E847800778456 /* MCArray.h */, - C64EA6A7169E847800778456 /* MCAssert.cc */, + C64EA6A7169E847800778456 /* MCAssert.c */, C64EA6A8169E847800778456 /* MCAssert.h */, C64EA6A9169E847800778456 /* MCData.cc */, C64EA6AA169E847800778456 /* MCData.h */, @@ -2303,7 +2303,7 @@ C64EA6FF169E847800778456 /* MCMessageHeader.cc in Sources */, C64EA701169E847800778456 /* MCAutoreleasePool.cc in Sources */, C64EA704169E847800778456 /* MCArray.cc in Sources */, - C64EA706169E847800778456 /* MCAssert.cc in Sources */, + C64EA706169E847800778456 /* MCAssert.c in Sources */, C64EA708169E847800778456 /* MCData.cc in Sources */, C64EA70A169E847800778456 /* MCHash.cc in Sources */, C64EA70C169E847800778456 /* MCHashMap.cc in Sources */, @@ -2481,7 +2481,7 @@ C6BA2B9E1705F4E6003F0E9E /* MCMessageHeader.cc in Sources */, C6BA2B9F1705F4E6003F0E9E /* MCAutoreleasePool.cc in Sources */, C6BA2BA01705F4E6003F0E9E /* MCArray.cc in Sources */, - C6BA2BA11705F4E6003F0E9E /* MCAssert.cc in Sources */, + C6BA2BA11705F4E6003F0E9E /* MCAssert.c in Sources */, C6BA2BA21705F4E6003F0E9E /* MCData.cc in Sources */, C6BA2BA31705F4E6003F0E9E /* MCHash.cc in Sources */, C6BA2BA41705F4E6003F0E9E /* MCHashMap.cc in Sources */, diff --git a/example/ios/iOS UI Test/iOS UI Test/MCTMsgViewController.mm b/example/ios/iOS UI Test/iOS UI Test/MCTMsgViewController.mm index dd2b36ee..ca3aecfc 100755 --- a/example/ios/iOS UI Test/iOS UI Test/MCTMsgViewController.mm +++ b/example/ios/iOS UI Test/iOS UI Test/MCTMsgViewController.mm @@ -91,7 +91,7 @@ MCLog("%s is missing, fetching", partUniqueID.description.UTF8String); if ([_pending containsObject:partUniqueID]) { - return NULL; + return nil; } MCOIMAPPart * part = (MCOIMAPPart *) [_message partForUniqueID:partUniqueID]; @@ -205,7 +205,9 @@ typedef void (^DownloadCallback)(NSError * error); [op setProgress:^(unsigned int current, unsigned int maximum) { MCLog("progress content: %u/%u", current, maximum); }]; - [_ops addObject:op]; + if (op != nil) { + [_ops addObject:op]; + } if (downloadFinished != NULL) { NSMutableArray * blocks; blocks = [_callbacks objectForKey:partUniqueID]; diff --git a/example/mac/macExample/macExample/MCTMsgViewController.m b/example/mac/macExample/macExample/MCTMsgViewController.m index dcb6f41c..f26b783f 100644 --- a/example/mac/macExample/macExample/MCTMsgViewController.m +++ b/example/mac/macExample/macExample/MCTMsgViewController.m @@ -76,7 +76,7 @@ NSLog(@"%@ is missing, fetching", partUniqueID); if ([_pending containsObject:partUniqueID]) { - return NULL; + return nil; } MCOIMAPPart * part = (MCOIMAPPart *) [_message partForUniqueID:partUniqueID]; diff --git a/src/async/imap/MCIMAPFetchFoldersOperation.h b/src/async/imap/MCIMAPFetchFoldersOperation.h index ebc49ca8..c59bf85a 100644 --- a/src/async/imap/MCIMAPFetchFoldersOperation.h +++ b/src/async/imap/MCIMAPFetchFoldersOperation.h @@ -32,7 +32,7 @@ namespace mailcore { virtual void main(); private: - String * mFolder; + String * /* IMAPFolder */ mFolder; bool mFetchSubscribedEnabled; Array * mFolders; void setDelimiterDataOnMainThread(char * delimiterData); diff --git a/src/async/imap/MCIMAPFetchMessagesOperation.h b/src/async/imap/MCIMAPFetchMessagesOperation.h index c719ef6a..64f75bbf 100644 --- a/src/async/imap/MCIMAPFetchMessagesOperation.h +++ b/src/async/imap/MCIMAPFetchMessagesOperation.h @@ -44,7 +44,7 @@ namespace mailcore { bool mFetchByUidEnabled; IndexSet * mIndexes; IMAPMessagesRequestKind mKind; - Array * mMessages; + Array * /* IMAPMessage */ mMessages; IndexSet * mVanishedMessages; uint64_t mModSequenceValue; diff --git a/src/async/imap/MCIMAPIdleOperation.h b/src/async/imap/MCIMAPIdleOperation.h index de19469a..32ed0877 100644 --- a/src/async/imap/MCIMAPIdleOperation.h +++ b/src/async/imap/MCIMAPIdleOperation.h @@ -31,7 +31,7 @@ namespace mailcore { private: uint32_t mLastKnownUid; - bool mSetupSuccess; + bool mSetupSuccess; void prepare(); void unprepare(); }; diff --git a/src/async/imap/MCIMAPStoreLabelsOperation.h b/src/async/imap/MCIMAPStoreLabelsOperation.h index fea31fd8..117a0a83 100644 --- a/src/async/imap/MCIMAPStoreLabelsOperation.h +++ b/src/async/imap/MCIMAPStoreLabelsOperation.h @@ -27,8 +27,8 @@ namespace mailcore { virtual void setKind(IMAPStoreFlagsRequestKind kind); virtual IMAPStoreFlagsRequestKind kind(); - virtual void setLabels(Array * labels); - virtual Array * labels(); + virtual void setLabels(Array * /* String */ labels); + virtual Array * /* String */ labels(); public: // subclass behavior virtual void main(); @@ -36,7 +36,7 @@ namespace mailcore { private: IndexSet * mUids; IMAPStoreFlagsRequestKind mKind; - Array * mLabels; + Array * /* String */ mLabels; }; } diff --git a/src/async/pop/MCPOPFetchMessagesOperation.h b/src/async/pop/MCPOPFetchMessagesOperation.h index e9d68014..74c97d4d 100644 --- a/src/async/pop/MCPOPFetchMessagesOperation.h +++ b/src/async/pop/MCPOPFetchMessagesOperation.h @@ -26,7 +26,7 @@ namespace mailcore { virtual void main(); private: - Array * mMessages; + Array * /* POPMessageInfo */ mMessages; }; } diff --git a/src/core/abstract/MCAbstractMessage.h b/src/core/abstract/MCAbstractMessage.h index 49c4805b..d7384b36 100644 --- a/src/core/abstract/MCAbstractMessage.h +++ b/src/core/abstract/MCAbstractMessage.h @@ -21,8 +21,8 @@ namespace mailcore { virtual AbstractPart * partForContentID(String * contentID); virtual AbstractPart * partForUniqueID(String * uniqueID); - virtual Array * attachments(); - virtual Array * htmlInlineAttachments(); + virtual Array * /* AbstractPart */ attachments(); + virtual Array * /* AbstractPart */ htmlInlineAttachments(); public: //subclass behavior AbstractMessage(AbstractMessage * other); diff --git a/src/core/abstract/MCAbstractMessagePart.cc b/src/core/abstract/MCAbstractMessagePart.cc index 649fcc32..d2cb232e 100644 --- a/src/core/abstract/MCAbstractMessagePart.cc +++ b/src/core/abstract/MCAbstractMessagePart.cc @@ -66,21 +66,6 @@ AbstractPart * AbstractMessagePart::mainPart() void AbstractMessagePart::setMainPart(AbstractPart * mainPart) { MC_SAFE_REPLACE_RETAIN(AbstractPart, mMainPart, mainPart); - applyMessage(); -} - -void AbstractMessagePart::applyMessage() -{ - if (mMainPart == NULL) - return; - - mMainPart->setMessage(message()); -} - -void AbstractMessagePart::setMessage(AbstractMessage * message) -{ - AbstractPart::setMessage(message); - applyMessage(); } AbstractPart * AbstractMessagePart::partForContentID(String * contentID) diff --git a/src/core/abstract/MCAbstractMessagePart.h b/src/core/abstract/MCAbstractMessagePart.h index 1ff1def6..bd2ac4e0 100644 --- a/src/core/abstract/MCAbstractMessagePart.h +++ b/src/core/abstract/MCAbstractMessagePart.h @@ -27,8 +27,6 @@ namespace mailcore { virtual String * description(); virtual Object * copy(); - virtual void setMessage(AbstractMessage * message); - virtual AbstractPart * partForContentID(String * contentID); virtual AbstractPart * partForUniqueID(String * uniqueID); @@ -36,7 +34,6 @@ namespace mailcore { AbstractPart * mMainPart; MessageHeader * mHeader; void init(); - void applyMessage(); }; } diff --git a/src/core/abstract/MCAbstractMultipart.cc b/src/core/abstract/MCAbstractMultipart.cc index 7a2f551e..d70b2974 100644 --- a/src/core/abstract/MCAbstractMultipart.cc +++ b/src/core/abstract/MCAbstractMultipart.cc @@ -39,7 +39,6 @@ Array * AbstractMultipart::parts() void AbstractMultipart::setParts(Array * parts) { MC_SAFE_REPLACE_COPY(Array, mParts, parts); - applyMessage(); } String * AbstractMultipart::description() @@ -70,23 +69,6 @@ Object * AbstractMultipart::copy() return new AbstractMultipart(this); } -void AbstractMultipart::applyMessage() -{ - if (mParts == NULL) - return; - - for(unsigned int i = 0 ; i < mParts->count() ; i ++) { - AbstractPart * part = (AbstractPart *) mParts->objectAtIndex(i); - part->setMessage(message()); - } -} - -void AbstractMultipart::setMessage(AbstractMessage * message) -{ - AbstractPart::setMessage(message); - applyMessage(); -} - AbstractPart * AbstractMultipart::partForContentID(String * contentID) { for(unsigned int i = 0 ; i < parts()->count() ; i ++) { diff --git a/src/core/abstract/MCAbstractMultipart.h b/src/core/abstract/MCAbstractMultipart.h index da77f9a6..11d33666 100644 --- a/src/core/abstract/MCAbstractMultipart.h +++ b/src/core/abstract/MCAbstractMultipart.h @@ -22,14 +22,12 @@ namespace mailcore { virtual String * description(); virtual Object * copy(); - virtual void setMessage(AbstractMessage * message); virtual AbstractPart * partForContentID(String * contentID); virtual AbstractPart * partForUniqueID(String * uniqueID); private: Array * mParts; void init(); - void applyMessage(); }; } diff --git a/src/core/abstract/MCAbstractPart.cc b/src/core/abstract/MCAbstractPart.cc index a1cf57b0..6991e5fc 100644 --- a/src/core/abstract/MCAbstractPart.cc +++ b/src/core/abstract/MCAbstractPart.cc @@ -160,16 +160,6 @@ void AbstractPart::setInlineAttachment(bool inlineAttachment) mInlineAttachment = inlineAttachment; } -AbstractMessage * AbstractPart::message() -{ - return mMessage; -} - -void AbstractPart::setMessage(AbstractMessage * message) -{ - mMessage = message; -} - void AbstractPart::importIMAPFields(struct mailimap_body_fields * fields, struct mailimap_body_ext_1part * extension) { diff --git a/src/core/abstract/MCAbstractPart.h b/src/core/abstract/MCAbstractPart.h index fe8a57d5..b38c1b38 100644 --- a/src/core/abstract/MCAbstractPart.h +++ b/src/core/abstract/MCAbstractPart.h @@ -40,9 +40,6 @@ namespace mailcore { virtual bool isInlineAttachment(); virtual void setInlineAttachment(bool inlineAttachment); - virtual AbstractMessage * message(); - virtual void setMessage(AbstractMessage * message); - virtual AbstractPart * partForContentID(String * contentID); virtual AbstractPart * partForUniqueID(String * uniqueID); @@ -67,7 +64,6 @@ namespace mailcore { String * mContentLocation; bool mInlineAttachment; PartType mPartType; - AbstractMessage * mMessage; // weak void init(); }; diff --git a/src/core/abstract/MCMessageHeader.h b/src/core/abstract/MCMessageHeader.h index 3e481db3..f90c1c2d 100644 --- a/src/core/abstract/MCMessageHeader.h +++ b/src/core/abstract/MCMessageHeader.h @@ -19,11 +19,11 @@ namespace mailcore { virtual void setMessageID(String * messageID); virtual String * messageID(); - virtual void setReferences(Array * references); - virtual Array * references(); + virtual void setReferences(Array * /* String */ references); + virtual Array * /* String */ references(); - virtual void setInReplyTo(Array * inReplyTo); - virtual Array * inReplyTo(); + virtual void setInReplyTo(Array * /* String */ inReplyTo); + virtual Array * /* String */ inReplyTo(); virtual void setDate(time_t date); virtual time_t date(); @@ -37,17 +37,17 @@ namespace mailcore { virtual void setFrom(Address * from); virtual Address * from(); - virtual void setTo(Array * to); - virtual Array * to(); + virtual void setTo(Array * /* Address */ to); + virtual Array * /* Address */ to(); - virtual void setCc(Array * cc); - virtual Array * cc(); + virtual void setCc(Array * /* Address */ cc); + virtual Array * /* Address */ cc(); - virtual void setBcc(Array * bcc); - virtual Array * bcc(); + virtual void setBcc(Array * /* Address */ bcc); + virtual Array * /* Address */ bcc(); - virtual void setReplyTo(Array * replyTo); - virtual Array * replyTo(); + virtual void setReplyTo(Array * /* Address */ replyTo); + virtual Array * /* Address */ replyTo(); virtual void setSubject(String * subject); virtual String * subject(); diff --git a/src/core/basetypes/MCAssert.cc b/src/core/basetypes/MCAssert.c index 82b5de26..ce9b5703 100644 --- a/src/core/basetypes/MCAssert.cc +++ b/src/core/basetypes/MCAssert.c @@ -3,7 +3,7 @@ #include <stdio.h> #include <stdlib.h> -void mailcore::assertInteral(const char * filename, unsigned int line, int cond, const char * condString) +void MCAssertInternal(const char * filename, unsigned int line, int cond, const char * condString) { if (cond) { return; diff --git a/src/core/basetypes/MCAssert.h b/src/core/basetypes/MCAssert.h index f2e1f484..54979d64 100644 --- a/src/core/basetypes/MCAssert.h +++ b/src/core/basetypes/MCAssert.h @@ -2,16 +2,14 @@ #define __MAILCORE_MCASSERT_H_ -#ifdef __cplusplus - -#define MCAssert(cond) mailcore::assertInteral(__FILE__, __LINE__, cond, #cond) - -namespace mailcore { +#define MCAssert(cond) MCAssertInternal(__FILE__, __LINE__, cond, #cond) - void assertInteral(const char * filename, unsigned int line, int cond, const char * condString); - +#ifdef __cplusplus +extern "C" { +#endif + void MCAssertInternal(const char * filename, unsigned int line, int cond, const char * condString); +#ifdef __cplusplus } - #endif #endif diff --git a/src/core/imap/MCIMAPMessage.h b/src/core/imap/MCIMAPMessage.h index 5bc5f843..5a9cadcb 100644 --- a/src/core/imap/MCIMAPMessage.h +++ b/src/core/imap/MCIMAPMessage.h @@ -35,8 +35,8 @@ namespace mailcore { virtual void setMainPart(AbstractPart * mainPart); virtual AbstractPart * mainPart(); - virtual void setGmailLabels(Array * labels); - virtual Array * gmailLabels(); + virtual void setGmailLabels(Array * /* String */ labels); + virtual Array * /* String */ gmailLabels(); virtual AbstractPart * partForPartID(String * partID); @@ -58,7 +58,7 @@ namespace mailcore { MessageFlag mFlags; MessageFlag mOriginalFlags; AbstractPart * mMainPart; - Array * mLabels; + Array * /* String */ mLabels; void init(); }; diff --git a/src/core/imap/MCIMAPNamespace.h b/src/core/imap/MCIMAPNamespace.h index 09c029e2..4ce0b546 100644 --- a/src/core/imap/MCIMAPNamespace.h +++ b/src/core/imap/MCIMAPNamespace.h @@ -18,12 +18,12 @@ namespace mailcore { virtual String * mainPrefix(); virtual char mainDelimiter(); - virtual Array * prefixes(); + virtual Array * /* String */ prefixes(); virtual String * pathForComponents(Array * components); virtual String * pathForComponentsAndPrefix(Array * components, String * prefix); - virtual Array * componentsFromPath(String * path); + virtual Array * /* String */ componentsFromPath(String * path); virtual bool containsFolderPath(String * path); @@ -35,7 +35,7 @@ namespace mailcore { virtual Object * copy(); private: - Array * mItems; + Array * /* String */ mItems; void init(); IMAPNamespaceItem * mainItem(); IMAPNamespaceItem * itemForPath(String * path); diff --git a/src/core/imap/MCIMAPNamespaceItem.h b/src/core/imap/MCIMAPNamespaceItem.h index 4cee0aea..8ab094cc 100644 --- a/src/core/imap/MCIMAPNamespaceItem.h +++ b/src/core/imap/MCIMAPNamespaceItem.h @@ -20,7 +20,7 @@ namespace mailcore { virtual char delimiter(); virtual String * pathForComponents(Array * components); - virtual Array * componentsForPath(String * path); + virtual Array * /* String */ componentsForPath(String * path); virtual bool containsFolder(String * folder); diff --git a/src/core/provider/MCMailProvider.h b/src/core/provider/MCMailProvider.h index 50f3deff..306b180d 100644 --- a/src/core/provider/MCMailProvider.h +++ b/src/core/provider/MCMailProvider.h @@ -26,9 +26,9 @@ namespace mailcore { virtual String * identifier(); - virtual Array * imapServices(); - virtual Array * smtpServices(); - virtual Array * popServices(); + virtual Array * /* NetService */ imapServices(); + virtual Array * /* NetService */ smtpServices(); + virtual Array * /* NetService */ popServices(); virtual bool matchEmail(String * email); virtual bool matchMX(String * hostname); @@ -53,12 +53,12 @@ namespace mailcore { private: String * mIdentifier; - Array * mDomainMatch; - Array * mImapServices; - Array * mSmtpServices; - Array * mPopServices; + Array * /* String */ mDomainMatch; + Array * /* NetService */ mImapServices; + Array * /* NetService */ mSmtpServices; + Array * /* NetService */ mPopServices; HashMap * mMailboxPaths; - Set* mMxSet; + Set * mMxSet; void init(); }; diff --git a/src/core/renderer/MCAddressDisplay.h b/src/core/renderer/MCAddressDisplay.h index d84e55d0..3fe6856d 100644 --- a/src/core/renderer/MCAddressDisplay.h +++ b/src/core/renderer/MCAddressDisplay.h @@ -22,9 +22,9 @@ namespace mailcore { static String * shortDisplayStringForAddress(Address * address); static String * veryShortDisplayStringForAddress(Address * address); - static String * displayStringForAddresses(Array * addresses); - static String * shortDisplayStringForAddresses(Array * addresses); - static String * veryShortDisplayStringForAddresses(Array * addresses); + static String * displayStringForAddresses(Array * /* Address */ addresses); + static String * shortDisplayStringForAddresses(Array * /* Address */ addresses); + static String * veryShortDisplayStringForAddresses(Array * /* Address */ addresses); }; }; diff --git a/src/core/renderer/MCHTMLRenderer.h b/src/core/renderer/MCHTMLRenderer.h index 2a36a9f6..f76510e8 100644 --- a/src/core/renderer/MCHTMLRenderer.h +++ b/src/core/renderer/MCHTMLRenderer.h @@ -31,11 +31,11 @@ namespace mailcore { HTMLRendererIMAPCallback * dataCallback, HTMLRendererTemplateCallback * htmlCallback); - static Array * attachmentsForMessage(AbstractMessage * message); - static Array * htmlInlineAttachmentsForMessage(AbstractMessage * message); + static Array * /* AbstractPart */ attachmentsForMessage(AbstractMessage * message); + static Array * /* AbstractPart */ htmlInlineAttachmentsForMessage(AbstractMessage * message); }; }; #endif -#endif /* defined(__testUI__MCHTMLRenderer__) */ +#endif diff --git a/src/core/rfc822/MCMessageBuilder.cc b/src/core/rfc822/MCMessageBuilder.cc index f8fe0064..435557db 100644 --- a/src/core/rfc822/MCMessageBuilder.cc +++ b/src/core/rfc822/MCMessageBuilder.cc @@ -553,12 +553,6 @@ String * MessageBuilder::textBody() void MessageBuilder::setAttachments(Array * attachments) { - if (attachments != NULL) { - for(unsigned int i = 0 ; i < attachments->count() ; i ++) { - Attachment * attachment = (Attachment *) attachments->objectAtIndex(i); - attachment->setMessage(this); - } - } MC_SAFE_REPLACE_COPY(Array, mAttachments, attachments); } @@ -572,18 +566,11 @@ void MessageBuilder::addAttachment(Attachment * attachment) if (mAttachments == NULL) { mAttachments = new Array(); } - attachment->setMessage(this); mAttachments->addObject(attachment); } void MessageBuilder::setRelatedAttachments(Array * attachments) { - if (attachments != NULL) { - for(unsigned int i = 0 ; i < attachments->count() ; i ++) { - Attachment * attachment = (Attachment *) attachments->objectAtIndex(i); - attachment->setMessage(this); - } - } MC_SAFE_REPLACE_COPY(Array, mRelatedAttachments, attachments); } @@ -597,7 +584,6 @@ void MessageBuilder::addRelatedAttachment(Attachment * attachment) if (mRelatedAttachments == NULL) { mRelatedAttachments = new Array(); } - attachment->setMessage(this); mRelatedAttachments->addObject(attachment); } diff --git a/src/core/rfc822/MCMessageBuilder.h b/src/core/rfc822/MCMessageBuilder.h index 63f325d3..409cd9ee 100644 --- a/src/core/rfc822/MCMessageBuilder.h +++ b/src/core/rfc822/MCMessageBuilder.h @@ -50,8 +50,8 @@ namespace mailcore { private: String * mHTMLBody; String * mTextBody; - Array * mAttachments; - Array * mRelatedAttachments; + Array * /* Attachment */ mAttachments; + Array * /* Attachment */ mRelatedAttachments; String * mBoundaryPrefix; void init(); Data * dataAndFilterBcc(bool filterBcc); diff --git a/src/core/rfc822/MCMessageParser.cc b/src/core/rfc822/MCMessageParser.cc index 2a892e6b..b936fabf 100644 --- a/src/core/rfc822/MCMessageParser.cc +++ b/src/core/rfc822/MCMessageParser.cc @@ -37,7 +37,6 @@ MessageParser::MessageParser(Data * data) msg = data_message_init(data->bytes(), data->length()); mailmessage_get_bodystructure(msg, &mime); mMainPart = (AbstractPart *) Attachment::attachmentsWithMIME(msg->msg_mime)->retain(); - mMainPart->setMessage(this); mMainPart->applyUniquePartID(); header()->importIMFFields(msg->msg_fields); mailmessage_free(msg); diff --git a/src/core/smtp/MCSMTPSession.h b/src/core/smtp/MCSMTPSession.h index dc949731..70237c16 100644 --- a/src/core/smtp/MCSMTPSession.h +++ b/src/core/smtp/MCSMTPSession.h @@ -82,7 +82,7 @@ namespace mailcore { void loginIfNeeded(ErrorCode * pError); bool checkCertificate(); - void sendMessage(Address * from, Array * recipients, Data * messageData, + void sendMessage(Address * from, Array * /* Address */ recipients, Data * messageData, SMTPProgressCallback * callback, ErrorCode * pError); void sendMessage(MessageBuilder * msg, SMTPProgressCallback * callback, ErrorCode * pError); }; diff --git a/src/objc/abstract/MCOAbstractMessage.h b/src/objc/abstract/MCOAbstractMessage.h index a26d5aac..bf442659 100644 --- a/src/objc/abstract/MCOAbstractMessage.h +++ b/src/objc/abstract/MCOAbstractMessage.h @@ -26,11 +26,17 @@ /** Returns the part with the given unique identifier.*/ - (MCOAbstractPart *) partForUniqueID:(NSString *)uniqueID; -/** All attachments in the message */ -- (NSArray *) attachments; - -/** All HTML bodies */ -- (NSArray *) htmlInlineAttachments; +/** All attachments in the message. + It will return an array of MCOIMAPPart for MCOIMAPMessage. + It will return an array of MCOAttachment for MCOMessageParser. + It will return an array of MCOAttachment for MCOMessageBuilder. */ +- (NSArray * /* MCOAbstractPart */) attachments; + +/** All image attachments included inline in the message through cid: URLs. + It will return an array of MCOIMAPPart for MCOIMAPMessage. + It will return an array of MCOAttachment for MCOMessageParser. + It will return an array of MCOAttachment for MCOMessageBuilder. */ +- (NSArray * /* MCOAbstractPart */) htmlInlineAttachments; @end diff --git a/src/objc/abstract/MCOAbstractPart.h b/src/objc/abstract/MCOAbstractPart.h index 0269347a..a3ab44f6 100644 --- a/src/objc/abstract/MCOAbstractPart.h +++ b/src/objc/abstract/MCOAbstractPart.h @@ -66,9 +66,6 @@ typedef enum { /** Returns whether the part is an explicit inline attachment.*/ @property (nonatomic, assign, getter=isInlineAttachment) BOOL inlineAttachment; -/** Returns the owner message of the part.*/ -@property (nonatomic, weak) MCOAbstractMessage * message; - /** Returns the part with the given Content-ID among this part and its subparts.*/ - (MCOAbstractPart *) partForContentID:(NSString *)contentID; diff --git a/src/objc/abstract/MCOAbstractPart.mm b/src/objc/abstract/MCOAbstractPart.mm index 47191ce9..8b2b008d 100644 --- a/src/objc/abstract/MCOAbstractPart.mm +++ b/src/objc/abstract/MCOAbstractPart.mm @@ -57,7 +57,6 @@ MCO_OBJC_SYNTHESIZE_STRING(setUniqueID, uniqueID) MCO_OBJC_SYNTHESIZE_STRING(setContentID, contentID) MCO_OBJC_SYNTHESIZE_STRING(setContentLocation, contentLocation) MCO_OBJC_SYNTHESIZE_BOOL(setInlineAttachment, isInlineAttachment) -MCO_OBJC_SYNTHESIZE(AbstractMessage, setMessage, message) - (MCOAbstractPart *) partForContentID:(NSString *)contentID { diff --git a/src/objc/imap/MCOIMAPMessage.h b/src/objc/imap/MCOIMAPMessage.h index 81dfa9f7..c6d8595b 100644 --- a/src/objc/imap/MCOIMAPMessage.h +++ b/src/objc/imap/MCOIMAPMessage.h @@ -46,8 +46,8 @@ /** Main MIME part of the message */ @property (nonatomic, retain) MCOAbstractPart * mainPart; -/** Any Gmail labels of the message */ -@property (nonatomic, copy) NSArray * gmailLabels; +/** All Gmail labels of the message */ +@property (nonatomic, copy) NSArray * /* NSString */ gmailLabels; /** Returns the part with the given part identifier. diff --git a/src/objc/imap/MCOIMAPNamespace.h b/src/objc/imap/MCOIMAPNamespace.h index f3373c64..5fcda25b 100644 --- a/src/objc/imap/MCOIMAPNamespace.h +++ b/src/objc/imap/MCOIMAPNamespace.h @@ -30,7 +30,7 @@ - (char) mainDelimiter; /** Returns the list of prefixes of this namespace. */ -- (NSArray *) prefixes; +- (NSArray * /* NSString */) prefixes; /** Returns the folder path for the given list of path components in the context @@ -45,7 +45,7 @@ - (NSString *) pathForComponents:(NSArray *)components prefix:(NSString *)prefix; /** Returns the components given a folder path. */ -- (NSArray *) componentsFromPath:(NSString *)path; +- (NSArray * /* NSString */) componentsFromPath:(NSString *)path; /** Returns YES if the namespace contains the given folder path. */ - (BOOL) containsFolderPath:(NSString *)path; diff --git a/src/objc/imap/MCOIMAPNamespaceItem.h b/src/objc/imap/MCOIMAPNamespaceItem.h index b23d0dfc..3063919b 100644 --- a/src/objc/imap/MCOIMAPNamespaceItem.h +++ b/src/objc/imap/MCOIMAPNamespaceItem.h @@ -26,7 +26,7 @@ - (NSString *) pathForComponents:(NSArray *)components; /** Returns components for the given path in the context of this namespace */ -- (NSArray *) componentsForPath:(NSString *)path; +- (NSArray * /* NSString */) componentsForPath:(NSString *)path; /** Returns YES if the namespace contains this folder path */ - (BOOL) containsFolder:(NSString *)folder; diff --git a/src/objc/imap/MCOIMAPSession.h b/src/objc/imap/MCOIMAPSession.h index 4011a00a..1b394eff 100644 --- a/src/objc/imap/MCOIMAPSession.h +++ b/src/objc/imap/MCOIMAPSession.h @@ -309,9 +309,9 @@ MCOIMAPFolderInfoOperation *folderInfo = [session folderInfoOperation:folder]; [folderInfo start:^(NSError *error, MCOIMAPFolderInfo *info) { - int messageCount = [info messageCount]; int numberOfMessages = 50; - MCOIndexSet *numbers = [MCOIndexSet indexSetWithRange:MCORangeMake(messageCount - numberOfMessages, numberOfMessages)]; + numberOfMessages -= 1; + MCOIndexSet *numbers = [MCOIndexSet indexSetWithRange:MCORangeMake([info messageCount] - numberOfMessages, numberOfMessages)]; MCOIMAPFetchMessagesOperation *fetchOperation = [session fetchMessagesByNumberOperationWithFolder:folder requestKind:MCOIMAPMessagesRequestKindUid diff --git a/src/objc/provider/MCOMailProvider.h b/src/objc/provider/MCOMailProvider.h index 53f09736..85a23a8d 100644 --- a/src/objc/provider/MCOMailProvider.h +++ b/src/objc/provider/MCOMailProvider.h @@ -22,19 +22,19 @@ A list of ways that you can connect to the IMAP server @return An array of MCONetService */ -- (NSArray *) imapServices; +- (NSArray * /* MCONetService */) imapServices; /** A list of ways that you can connect to the SMTP server @return An array of MCONetService */ -- (NSArray *) smtpServices; +- (NSArray * /* MCONetService */) smtpServices; /** A list of ways that you can connect to the POP3 server @return An array of MCONetService */ -- (NSArray *) popServices; +- (NSArray * /* MCONetService */) popServices; - (BOOL) matchEmail:(NSString *)email; - (BOOL) matchMX:(NSString *)hostname; diff --git a/src/objc/provider/MCOMailProvider.mm b/src/objc/provider/MCOMailProvider.mm index e8d80407..e35eaec5 100644 --- a/src/objc/provider/MCOMailProvider.mm +++ b/src/objc/provider/MCOMailProvider.mm @@ -59,6 +59,8 @@ return self; } +MCO_OBJC_SYNTHESIZE_STRING(setIdentifier, identifier); + - (NSArray *) imapServices { return MCO_OBJC_BRIDGE_GET(imapServices); diff --git a/src/objc/rfc822/MCOMessageBuilder.h b/src/objc/rfc822/MCOMessageBuilder.h index 4fa78691..217ec49c 100644 --- a/src/objc/rfc822/MCOMessageBuilder.h +++ b/src/objc/rfc822/MCOMessageBuilder.h @@ -41,10 +41,10 @@ @property (nonatomic, copy) NSString * textBody; /** List of file attachments.*/ -@property (nonatomic, copy) NSArray * attachments; +@property (nonatomic, copy) NSArray * /* MCOAttachment */ attachments; /** List of related file attachments (included as cid: link in the HTML part).*/ -@property (nonatomic, copy) NSArray * relatedAttachments; +@property (nonatomic, copy) NSArray * /* MCOAttachment */ relatedAttachments; /** Prefix for the boundary identifier. Default value is nil.*/ @property (nonatomic, copy) NSString * boundaryPrefix; |