diff options
author | Sergei Epatov <sepatov@readdle.com> | 2016-02-01 11:48:15 +0200 |
---|---|---|
committer | Sergei Epatov <sepatov@readdle.com> | 2016-02-01 11:50:54 +0200 |
commit | cd9a226a8e2f3ae69e78a5d4e48a55d92fb484fe (patch) | |
tree | 5e66bfc158c586e433ed500b3a1a1aa93d84eb60 /src | |
parent | d01b7c38666b48f55685d6bf0a6304d7a86e4b3f (diff) |
Change error prefix to RSMErrorYahoo, change error msg substring to 'over the limit'
Diffstat (limited to 'src')
-rw-r--r-- | src/core/abstract/MCMessageConstants.h | 4 | ||||
-rw-r--r-- | src/core/smtp/MCSMTPSession.cpp | 6 | ||||
-rw-r--r-- | src/objc/abstract/MCOConstants.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/core/abstract/MCMessageConstants.h b/src/core/abstract/MCMessageConstants.h index a0522560..d1029b13 100644 --- a/src/core/abstract/MCMessageConstants.h +++ b/src/core/abstract/MCMessageConstants.h @@ -253,8 +253,8 @@ namespace mailcore { ErrorServerDate, ErrorNoValidServerFound, ErrorCustomCommand, - ErrorSendMessageSpamSuspected, - ErrorSendMessageDailyLimitExceeded + ErrorYahooSendMessageSpamSuspected, + ErrorYahooSendMessageDailyLimitExceeded }; enum PartType { diff --git a/src/core/smtp/MCSMTPSession.cpp b/src/core/smtp/MCSMTPSession.cpp index e6f4207b..2693737d 100644 --- a/src/core/smtp/MCSMTPSession.cpp +++ b/src/core/smtp/MCSMTPSession.cpp @@ -682,12 +682,12 @@ void SMTPSession::sendMessage(Address * from, Array * recipients, Data * message goto err; } } - else if (responseCode == 521 && response->locationOfString(MCSTR("limit")) != -1) { - * pError = ErrorSendMessageDailyLimitExceeded; + else if (responseCode == 521 && response->locationOfString(MCSTR("over the limit")) != -1) { + * pError = ErrorYahooSendMessageDailyLimitExceeded; goto err; } else if (responseCode == 554 && response->locationOfString(MCSTR("spam")) != -1) { - * pError = ErrorSendMessageSpamSuspected; + * pError = ErrorYahooSendMessageSpamSuspected; goto err; } diff --git a/src/objc/abstract/MCOConstants.h b/src/objc/abstract/MCOConstants.h index ac87ba28..419d8485 100644 --- a/src/objc/abstract/MCOConstants.h +++ b/src/objc/abstract/MCOConstants.h @@ -414,9 +414,9 @@ typedef NS_ENUM(NSInteger, MCOErrorCode) { /** Error while running custom command */ MCOErrorCustomCommand, /** Spam was suspected by server */ - MCOErrorSendMessageSpamSuspected, + MCOErrorYahooSendMessageSpamSuspected, /** Daily limit of sent messages was hit */ - MCOErrorSendMessageDailyLimitExceeded, + MCOErrorYahooSendMessageDailyLimitExceeded, /** The count of all errors */ MCOErrorCodeCount, }; |