Skip to content

Added export & import mails #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
defnax wants to merge 1 commit into
base: master
Choose a base branch
from
+70 −4
Open

Added export & import mails #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/retroshare/rsmail.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,5 +604,14 @@ class RsMail
RS_DEPRECATED_FOR(sendMail)
virtual bool MessageSend(Rs::Mail::MessageInfo &info) = 0;

/**
* @brief addMessage
* @jsonapi{development}
* @param[in] info message info to add
* @param[in] box box to add the message to
* @return true on success
*/
virtual bool addMessage(const Rs::Mail::MessageInfo &info, Rs::Mail::BoxName box) = 0;

virtual ~RsMail() = default;
};
64 changes: 60 additions & 4 deletions src/services/p3msgservice.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1812,6 +1812,59 @@ bool p3MsgService::MessageToDraft(MessageInfo& info, const std::string& msgParen
return true;
}

bool p3MsgService::addMessage(const Rs::Mail::MessageInfo &info, Rs::Mail::BoxName box)
{
RsMailStorageItem *msi = initMIRsMsg(info);
if (!msi)
return false;

uint32_t msgId = getNewUniqueMsgId();
msi->msg.msgId = msgId;

{
RS_STACK_MUTEX(mMsgMtx);

switch (box)
{
case Rs::Mail::BoxName::BOX_INBOX:
msi->msg.msgFlags &= ~RS_MSG_FLAGS_OUTGOING;
mReceivedMessages[msgId] = msi;
break;
case Rs::Mail::BoxName::BOX_SENT:
msi->msg.msgFlags |= RS_MSG_FLAGS_OUTGOING;
mSentMessages[msgId] = msi;
break;
case Rs::Mail::BoxName::BOX_OUTBOX:
msi->msg.msgFlags |= (RS_MSG_FLAGS_OUTGOING | RS_MSG_FLAGS_PENDING);
mSentMessages[msgId] = msi;
break;
case Rs::Mail::BoxName::BOX_DRAFTS:
msi->msg.msgFlags |= (RS_MSG_FLAGS_OUTGOING | RS_MSG_FLAGS_DRAFT);
mDraftMessages[msgId] = msi;
break;
case Rs::Mail::BoxName::BOX_TRASH:
msi->msg.msgFlags |= RS_MSG_FLAGS_TRASH;
mTrashMessages[msgId] = msi;
break;
default:
delete msi;
return false;
}
}

IndicateConfigChanged(RsConfigMgr::CheckPriority::SAVE_NOW);

if (rsEvents)
{
auto pEvent = std::make_shared<RsMailStatusEvent>();
pEvent->mMailStatusEventCode = RsMailStatusEventCode::NEW_MESSAGE;
pEvent->mChangedMsgIds.insert(std::to_string(msgId));
rsEvents->postEvent(pEvent);
}

return true;
}

bool p3MsgService::getMessageTag(const std::string &msgId, Rs::Mail::MsgTagInfo& info)
{
RsStackMutex stack(mMsgMtx); /********** STACK LOCKED MTX ******/
Expand Down Expand Up @@ -2173,7 +2226,7 @@ void p3MsgService::initRsMI(const RsMailStorageItem& msi, const MsgAddress& from
if (flags & RS_MSG_FLAGS_PUBLISH_KEY) mi.msgflags |= RS_MSG_PUBLISH_KEY;
if (flags & RS_MSG_FLAGS_LOAD_EMBEDDED_IMAGES) mi.msgflags |= RS_MSG_LOAD_EMBEDDED_IMAGES;

mi.ts = msg->sendTime;
mi.ts = (msg->sendTime != 0) ? msg->sendTime : msg->recvTime;

mi.from = from;
mi.to = to;
Expand Down Expand Up @@ -2296,7 +2349,7 @@ void p3MsgService::initRsMIS(const RsMailStorageItem& msi, const MsgAddress& fro

mis.title = msg->subject;
mis.count = msg->attachment.items.size();
mis.ts = msg->sendTime;
mis.ts = (msg->sendTime != 0) ? msg->sendTime : msg->recvTime;

MsgTagInfo taginfo;
locked_getMessageTag(mis.msgId,taginfo);
Expand All @@ -2319,11 +2372,14 @@ bool p3MsgService::initMIRsMsg(RsMailStorageItem *msi,const MessageInfo& info)

msg -> msgFlags = 0;
msg -> msgId = 0;
msg -> sendTime = time(NULL);
msg -> recvTime = 0;
msg -> sendTime = info.ts;
msg -> recvTime = info.ts;
msg -> subject = info.title;
msg -> message = info.msg;

msi->from = info.from;
msi->to = info.to;

// We need to use the RsItem format. It's bad, but needed for backward compatibility at the network layer.

for(auto m:info.destinations)
Expand Down
1 change: 1 addition & 0 deletions src/services/p3msgservice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ class p3MsgService :
bool MessageSend(Rs::Mail::MessageInfo &info) override;
bool SystemMessage(const std::string &title, const std::string &message, uint32_t systemFlag) override;
bool MessageToDraft(Rs::Mail::MessageInfo &info, const std::string &msgParentId) override;
bool addMessage(const Rs::Mail::MessageInfo &info, Rs::Mail::BoxName box) override;
bool MessageToTrash(const std::string &mid, bool bTrash) override;

bool getMessageTag(const std::string &msgId, Rs::Mail::MsgTagInfo& info) override;
Expand Down
Loading