aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/abstract/MCMessageConstants.h3
-rw-r--r--src/core/imap/MCIMAPMessage.cc16
-rw-r--r--src/core/imap/MCIMAPMessage.h5
-rw-r--r--src/core/imap/MCIMAPSearchExpression.cc21
-rw-r--r--src/core/imap/MCIMAPSearchExpression.h6
-rwxr-xr-xsrc/core/imap/MCIMAPSession.cc17
6 files changed, 67 insertions, 1 deletions
diff --git a/src/core/abstract/MCMessageConstants.h b/src/core/abstract/MCMessageConstants.h
index aa252243..92e04c6e 100644
--- a/src/core/abstract/MCMessageConstants.h
+++ b/src/core/abstract/MCMessageConstants.h
@@ -69,6 +69,7 @@ namespace mailcore {
IMAPMessagesRequestKindGmailMessageID = 1 << 7,
IMAPMessagesRequestKindGmailThreadID = 1 << 8,
IMAPMessagesRequestKindExtraHeaders = 1 << 9,
+ IMAPMessagesRequestKindSize = 1 << 10,
};
enum IMAPFetchRequestType {
@@ -184,6 +185,8 @@ namespace mailcore {
IMAPSearchKindBeforeReceivedDate,
IMAPSearchKindOnReceivedDate,
IMAPSearchKindSinceReceivedDate,
+ IMAPSearchKindSizeLarger,
+ IMAPSearchKindSizeSmaller,
IMAPSearchKindGmailThreadID,
IMAPSearchKindOr,
IMAPSearchKindAnd,
diff --git a/src/core/imap/MCIMAPMessage.cc b/src/core/imap/MCIMAPMessage.cc
index 74b3459b..8d3c5c02 100644
--- a/src/core/imap/MCIMAPMessage.cc
+++ b/src/core/imap/MCIMAPMessage.cc
@@ -75,6 +75,17 @@ void IMAPMessage::setUid(uint32_t uid)
mUid = uid;
}
+uint32_t IMAPMessage::size()
+{
+ return mSize;
+}
+
+void IMAPMessage::setSize(uint32_t size)
+{
+ mSize = size;
+
+}
+
void IMAPMessage::setFlags(MessageFlag flags)
{
mFlags = flags;
@@ -213,6 +224,7 @@ HashMap * IMAPMessage::serializable()
HashMap * result = AbstractMessage::serializable();
result->setObjectForKey(MCSTR("modSeqValue"), String::stringWithUTF8Format("%llu", (long long unsigned) modSeqValue()));
result->setObjectForKey(MCSTR("uid"), String::stringWithUTF8Format("%lu", (long unsigned) uid()));
+ result->setObjectForKey(MCSTR("size"), String::stringWithUTF8Format("%lu", (long unsigned) uid()));
result->setObjectForKey(MCSTR("flags"), String::stringWithUTF8Format("%u", (unsigned) flags()));
result->setObjectForKey(MCSTR("originalFlags"), String::stringWithUTF8Format("%u", (unsigned) originalFlags()));
result->setObjectForKey(MCSTR("mainPart"), mMainPart->serializable());
@@ -239,6 +251,10 @@ void IMAPMessage::importSerializable(HashMap * serializable)
if (uid != NULL) {
setUid((uint32_t) uid->unsignedLongValue());
}
+ String * size = (String *) serializable->objectForKey(MCSTR("size"));
+ if (size != NULL) {
+ setSize((uint32_t) size->unsignedLongValue());
+ }
String * flags = (String *) serializable->objectForKey(MCSTR("flags"));
if (flags != NULL) {
setFlags((MessageFlag) flags->unsignedIntValue());
diff --git a/src/core/imap/MCIMAPMessage.h b/src/core/imap/MCIMAPMessage.h
index 435334c7..d01d23a1 100644
--- a/src/core/imap/MCIMAPMessage.h
+++ b/src/core/imap/MCIMAPMessage.h
@@ -23,6 +23,9 @@ namespace mailcore {
virtual uint32_t uid();
virtual void setUid(uint32_t uid);
+ virtual uint32_t size();
+ virtual void setSize(uint32_t size);
+
virtual void setFlags(MessageFlag flags);
virtual MessageFlag flags();
@@ -63,6 +66,8 @@ namespace mailcore {
private:
uint64_t mModSeqValue;
uint32_t mUid;
+ uint32_t mSize;
+
MessageFlag mFlags;
MessageFlag mOriginalFlags;
AbstractPart * mMainPart;
diff --git a/src/core/imap/MCIMAPSearchExpression.cc b/src/core/imap/MCIMAPSearchExpression.cc
index 4e6b6e4e..0aa791d0 100644
--- a/src/core/imap/MCIMAPSearchExpression.cc
+++ b/src/core/imap/MCIMAPSearchExpression.cc
@@ -241,6 +241,22 @@ IMAPSearchExpression * IMAPSearchExpression::searchSinceReceivedDate(time_t date
return (IMAPSearchExpression *) expr->autorelease();
}
+IMAPSearchExpression * IMAPSearchExpression::searchSizeLarger(uint32_t size)
+{
+ IMAPSearchExpression * expr = new IMAPSearchExpression();
+ expr->mKind = IMAPSearchKindSizeLarger;
+ expr->mNumber = size;
+ return (IMAPSearchExpression *) expr->autorelease();
+}
+
+IMAPSearchExpression * IMAPSearchExpression::searchSizeSmaller(uint32_t size)
+{
+ IMAPSearchExpression * expr = new IMAPSearchExpression();
+ expr->mKind = IMAPSearchKindSizeSmaller;
+ expr->mNumber = size;
+ return (IMAPSearchExpression *) expr->autorelease();
+}
+
IMAPSearchExpression * IMAPSearchExpression::searchGmailThreadID(uint64_t number)
{
IMAPSearchExpression * expr = new IMAPSearchExpression();
@@ -287,6 +303,11 @@ uint64_t IMAPSearchExpression::longNumber()
return mLongNumber;
}
+uint32_t IMAPSearchExpression::number()
+{
+ return mNumber;
+}
+
time_t IMAPSearchExpression::date()
{
return mDate;
diff --git a/src/core/imap/MCIMAPSearchExpression.h b/src/core/imap/MCIMAPSearchExpression.h
index 13d934bc..6d313730 100644
--- a/src/core/imap/MCIMAPSearchExpression.h
+++ b/src/core/imap/MCIMAPSearchExpression.h
@@ -18,6 +18,7 @@ namespace mailcore {
virtual String * header();
virtual String * value();
virtual uint64_t longNumber();
+ virtual uint32_t number();
virtual time_t date();
virtual IMAPSearchExpression * leftExpression();
virtual IMAPSearchExpression * rightExpression();
@@ -44,7 +45,9 @@ namespace mailcore {
static IMAPSearchExpression * searchBeforeReceivedDate(time_t date);
static IMAPSearchExpression * searchOnReceivedDate(time_t date);
static IMAPSearchExpression * searchSinceReceivedDate(time_t date);
- static IMAPSearchExpression * searchGmailThreadID(uint64_t number);
+ static IMAPSearchExpression * searchSizeLarger(uint32_t number);
+ static IMAPSearchExpression * searchSizeSmaller(uint32_t size);
+ static IMAPSearchExpression * searchGmailThreadID(uint64_t size);
static IMAPSearchExpression * searchAnd(IMAPSearchExpression * left, IMAPSearchExpression * right);
static IMAPSearchExpression * searchOr(IMAPSearchExpression * left, IMAPSearchExpression * right);
@@ -58,6 +61,7 @@ namespace mailcore {
String * mHeader;
String * mValue;
uint64_t mLongNumber;
+ uint32_t mNumber;
time_t mDate;
IMAPSearchExpression * mLeftExpression;
IMAPSearchExpression * mRightExpression;
diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc
index 0a115e78..009bdc9f 100755
--- a/src/core/imap/MCIMAPSession.cc
+++ b/src/core/imap/MCIMAPSession.cc
@@ -1979,6 +1979,8 @@ static void msg_att_handler(struct mailimap_msg_att * msg_att, void * context)
att_static = att_item->att_data.att_static;
if (att_static->att_type == MAILIMAP_MSG_ATT_INTERNALDATE) {
msg->header()->importIMAPInternalDate(att_static->att_data.att_internal_date);
+ } else if (att_static->att_type == MAILIMAP_MSG_ATT_RFC822_SIZE) {
+ msg->setSize(att_static->att_data.att_rfc822_size);
}
}
}
@@ -2153,6 +2155,13 @@ IMAPSyncResult * IMAPSession::fetchMessages(String * folder, IMAPMessagesRequest
mailimap_fetch_type_new_fetch_att_list_add(fetch_type, fetch_att);
needsHeader = true;
}
+ if ((requestKind & IMAPMessagesRequestKindSize) != 0) {
+ // message structure
+ MCLog("request size");
+ fetch_att = mailimap_fetch_att_new_rfc822_size();
+ mailimap_fetch_type_new_fetch_att_list_add(fetch_type, fetch_att);
+ }
+
if ((requestKind & IMAPMessagesRequestKindStructure) != 0) {
// message structure
MCLog("request bodystructure");
@@ -2730,6 +2739,14 @@ static struct mailimap_search_key * searchKeyFromSearchExpression(IMAPSearchExpr
NULL, NULL, NULL, NULL, NULL,
NULL, 0, NULL, NULL, NULL);
}
+ case IMAPSearchKindSizeLarger:
+ {
+ return mailimap_search_key_new_larger(expression->number());
+ }
+ case IMAPSearchKindSizeSmaller:
+ {
+ return mailimap_search_key_new_smaller(expression->number());
+ }
case IMAPSearchKindOr:
{
return mailimap_search_key_new_or(searchKeyFromSearchExpression(expression->leftExpression()), searchKeyFromSearchExpression(expression->rightExpression()));
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 09:34:18 +0000