From 41b43a19de28c0d62f52bf6c0d63a8b91e09210e Mon Sep 17 00:00:00 2001 From: pfennema Date: Thu, 6 Mar 2014 17:30:25 +0100 Subject: Added IMAPSearchKindNot to MCOMessageConstants.h as well --- src/objc/abstract/MCOConstants.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/objc/abstract/MCOConstants.h') diff --git a/src/objc/abstract/MCOConstants.h b/src/objc/abstract/MCOConstants.h index 6b6407c0..28fa9e05 100644 --- a/src/objc/abstract/MCOConstants.h +++ b/src/objc/abstract/MCOConstants.h @@ -190,6 +190,8 @@ typedef enum { MCOIMAPSearchKindOr, /** And expression.*/ MCOIMAPSearchKindAnd, + /** Not expression.*/ + MCOIMAPSearchKindNot, } MCOIMAPSearchKind; /** Keys for the namespace dictionary.*/ -- cgit v1.2.3 From 6dd20cf12e8b6fc03b0790c96b7279276ffc849a Mon Sep 17 00:00:00 2001 From: Bob Van Osten Date: Mon, 10 Mar 2014 21:46:58 -0700 Subject: Fixes MCOIMAPSearchKind --- src/objc/abstract/MCOConstants.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'src/objc/abstract/MCOConstants.h') diff --git a/src/objc/abstract/MCOConstants.h b/src/objc/abstract/MCOConstants.h index 28fa9e05..e5ab8184 100644 --- a/src/objc/abstract/MCOConstants.h +++ b/src/objc/abstract/MCOConstants.h @@ -184,8 +184,48 @@ typedef enum { MCOIMAPSearchKindUids, /** Match headers of the message.*/ MCOIMAPSearchKindHeader, + /** Match messages that are read.*/ + MCOIMAPSearchKindRead, + /** Match messages that are not read.*/ + MCOIMAPSearchKindUnread, + /** Match messages that are flagged.*/ + MCOIMAPSearchKindFlagged, + /** Match messages that are not flagged.*/ + MCOIMAPSearchKindUnflagged, + /** Match messages that are answered.*/ + MCOIMAPSearchKindAnswered, + /** Match messages that are not answered.*/ + MCOIMAPSearchKindUnanswered, + /** Match messages that are a drafts.*/ + MCOIMAPSearchKindDraft, + /** Match messages that are not drafts.*/ + MCOIMAPSearchKindUndraft, + /** Match messages that are deleted.*/ + MCOIMAPSearchKindDeleted, + /** Match messages that are spam.*/ + MCOIMAPSearchKindSpam, + /** Match messages before the given date.*/ + MCOIMAPSearchKindBeforeDate, + /** Match messages on the given date.*/ + MCOIMAPSearchKindOnDate, + /** Match messages after the given date.*/ + MCOIMAPSearchKindSinceDate, + /** Match messages before the given received date.*/ + MCOIMAPSearchKindBeforeReceivedDate, + /** Match messages on the given received date.*/ + MCOIMAPSearchKindOnReceivedDate, + /** Match messages after the given received date.*/ + MCOIMAPSearchKindSinceReceivedDate, + /** Match messages that are larger than the given size in bytes.*/ + MCOIMAPSearchKindSizeLarger, + /** Match messages that are smaller than the given size in bytes.*/ + MCOIMAPSearchKindSizeSmaller, /** Match X-GM-THRID.*/ MCOIMAPSearchGmailThreadID, + /** Match X-GM-MSGID.*/ + MCOIMAPSearchGmailMessageID, + /** Match X-GM-RAW.*/ + MCOIMAPSearchGmailRaw, /** Or expresssion.*/ MCOIMAPSearchKindOr, /** And expression.*/ -- cgit v1.2.3 From 6e8c2968bc8954728b18a2e97ccf19f46a8ad213 Mon Sep 17 00:00:00 2001 From: "Hoa V. DINH" Date: Thu, 13 Mar 2014 22:29:38 -0700 Subject: Added XOAUTH2 for Outlook authentication type (fixed #637) --- scripts/prepare-libetpan-ios.sh | 2 +- scripts/prepare-libetpan-macos.sh | 2 +- src/core/abstract/MCMessageConstants.h | 1 + src/core/imap/MCIMAPSession.cc | 1 + src/core/smtp/MCSMTPSession.cc | 9 +++++++++ src/objc/abstract/MCOConstants.h | 2 ++ 6 files changed, 15 insertions(+), 2 deletions(-) (limited to 'src/objc/abstract/MCOConstants.h') diff --git a/scripts/prepare-libetpan-ios.sh b/scripts/prepare-libetpan-ios.sh index 02b70a23..8e839978 100755 --- a/scripts/prepare-libetpan-ios.sh +++ b/scripts/prepare-libetpan-ios.sh @@ -15,7 +15,7 @@ else fi url="https://github.com/dinhviethoa/libetpan.git" -rev=da8d464a02bd4f4b27f8dc5fa019061f1c2317ef +rev=f1307f3bb156b28629efe2c8339b522af58898f5 pushd `dirname $0` > /dev/null scriptpath=`pwd` diff --git a/scripts/prepare-libetpan-macos.sh b/scripts/prepare-libetpan-macos.sh index 7996d532..02489156 100755 --- a/scripts/prepare-libetpan-macos.sh +++ b/scripts/prepare-libetpan-macos.sh @@ -1,7 +1,7 @@ #!/bin/sh url="https://github.com/dinhviethoa/libetpan.git" -rev=da8d464a02bd4f4b27f8dc5fa019061f1c2317ef +rev=f1307f3bb156b28629efe2c8339b522af58898f5 pushd `dirname $0` > /dev/null scriptpath=`pwd` diff --git a/src/core/abstract/MCMessageConstants.h b/src/core/abstract/MCMessageConstants.h index 20be3e31..dcc1c7cd 100644 --- a/src/core/abstract/MCMessageConstants.h +++ b/src/core/abstract/MCMessageConstants.h @@ -23,6 +23,7 @@ namespace mailcore { AuthTypeSASLNTLM = 1 << 6, AuthTypeSASLKerberosV4 = 1 << 7, AuthTypeXOAuth2 = 1 << 8, + AuthTypeXOAuth2Outlook = 1 << 9, }; enum IMAPFolderFlag { diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc index 9cdf0ce9..8e45a3a3 100755 --- a/src/core/imap/MCIMAPSession.cc +++ b/src/core/imap/MCIMAPSession.cc @@ -837,6 +837,7 @@ void IMAPSession::login(ErrorCode * pError) break; case AuthTypeXOAuth2: + case AuthTypeXOAuth2Outlook: r = mailimap_oauth2_authenticate(mImap, utf8username, MCUTF8(mOAuth2Token)); break; } diff --git a/src/core/smtp/MCSMTPSession.cc b/src/core/smtp/MCSMTPSession.cc index b9f71cb9..66451dd6 100644 --- a/src/core/smtp/MCSMTPSession.cc +++ b/src/core/smtp/MCSMTPSession.cc @@ -525,6 +525,15 @@ void SMTPSession::login(ErrorCode * pError) r = mailsmtp_oauth2_authenticate(mSmtp, utf8Username, MCUTF8(mOAuth2Token)); break; } + + case AuthTypeXOAuth2Outlook: { + const char * utf8Username = MCUTF8(mUsername); + if (utf8Username == NULL) { + utf8Username = ""; + } + r = mailsmtp_oauth2_outlook_authenticate(mSmtp, utf8Username, MCUTF8(mOAuth2Token)); + break; + } } if (r == MAILSMTP_ERROR_STREAM) { * pError = ErrorConnection; diff --git a/src/objc/abstract/MCOConstants.h b/src/objc/abstract/MCOConstants.h index e5ab8184..eb276e0f 100644 --- a/src/objc/abstract/MCOConstants.h +++ b/src/objc/abstract/MCOConstants.h @@ -35,6 +35,8 @@ typedef enum { MCOAuthTypeSASLKerberosV4 = 1 << 7, /** OAuth2 authentication.*/ MCOAuthTypeXOAuth2 = 1 << 8, + /** OAuth2 authentication on outlook.com.*/ + MCOAuthTypeXOAuth2Outlook = 1 << 9, } MCOAuthType; /** It's the IMAP flags of the folder.*/ -- cgit v1.2.3