Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 00:49:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed missuse of message flag UNPROCESSED as indicator for a NEW message

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7598 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-10-12 15:53:23 +00:00
parent bec735b60a
commit 1bfa4df911
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/gxs/rsgenexchange.cc
View File

@ -1905,7 +1905,7 @@ void RsGenExchange::publishMsgs()
bool s = msg->metaData->serialise(metaDataBuff, &size); bool s = msg->metaData->serialise(metaDataBuff, &size);
s &= msg->meta.setBinData(metaDataBuff, size); s &= msg->meta.setBinData(metaDataBuff, size);
msg->metaData->mMsgStatus = GXS_SERV::GXS_MSG_STATUS_UNPROCESSED | GXS_SERV::GXS_MSG_STATUS_UNREAD; msg->metaData->mMsgStatus = GXS_SERV::GXS_MSG_STATUS_UNPROCESSED;
msgId = msg->msgId; msgId = msg->msgId;
grpId = msg->grpId; grpId = msg->grpId;
msg->metaData->recvTS = time(NULL); msg->metaData->recvTS = time(NULL);
@ -2493,7 +2493,7 @@ void RsGenExchange::processRecvdMessages()
if(validateReturn == VALIDATE_SUCCESS) if(validateReturn == VALIDATE_SUCCESS)
{ {
meta->mMsgStatus = GXS_SERV::GXS_MSG_STATUS_UNPROCESSED | GXS_SERV::GXS_MSG_STATUS_UNREAD; meta->mMsgStatus = GXS_SERV::GXS_MSG_STATUS_UNPROCESSED | GXS_SERV::GXS_MSG_STATUS_GUI_NEW;
msgs.insert(std::make_pair(msg, meta)); msgs.insert(std::make_pair(msg, meta));
msgIds[msg->grpId].push_back(msg->msgId); msgIds[msg->grpId].push_back(msg->msgId);

8
libretroshare/src/retroshare/rsgxsflags.h
View File

@ -99,9 +99,9 @@ namespace GXS_SERV {
static const uint32_t GXS_MSG_STATUS_UNPROCESSED = 0x00000001; static const uint32_t GXS_MSG_STATUS_UNPROCESSED = 0x00000001;
static const uint32_t GXS_MSG_STATUS_UNREAD = 0x00000002; static const uint32_t GXS_MSG_STATUS_GUI_USER_UNREAD = 0x00000002;
static const uint32_t GXS_MSG_STATUS_READ = 0x00000004; static const uint32_t GXS_MSG_STATUS_GUI_NEW = 0x00000004;
static const uint32_t GXS_MSG_STATUS_KEEP = 0x00000008; static const uint32_t GXS_MSG_STATUS_KEEP = 0x00000008;
@ -120,9 +120,9 @@ namespace GXS_SERV {
// GENERIC GXS MACROS // GENERIC GXS MACROS
#define IS_MSG_NEW(status) (status & GXS_SERV::GXS_MSG_STATUS_UNPROCESSED) #define IS_MSG_NEW(status) (status & GXS_SERV::GXS_MSG_STATUS_GUI_NEW)
#define IS_MSG_UNREAD(status) (status & GXS_SERV::GXS_MSG_STATUS_GUI_USER_UNREAD)
#define IS_MSG_UNREAD(status) (status & GXS_SERV::GXS_MSG_STATUS_UNREAD)
#define IS_GROUP_ADMIN(subscribeFlags) (subscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN) #define IS_GROUP_ADMIN(subscribeFlags) (subscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN)
#define IS_GROUP_PUBLISHER(subscribeFlags) (subscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_PUBLISH) #define IS_GROUP_PUBLISHER(subscribeFlags) (subscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_PUBLISH)
#define IS_GROUP_SUBSCRIBED(subscribeFlags) (subscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED) #define IS_GROUP_SUBSCRIBED(subscribeFlags) (subscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED)

10
libretroshare/src/services/p3gxschannels.cc
View File

@ -804,8 +804,8 @@ void p3GxsChannels::setMessageReadStatus(uint32_t& token, const RsGxsGrpMsgIdPai
std::cerr << std::endl; std::cerr << std::endl;
/* Always remove status unprocessed */ /* Always remove status unprocessed */
uint32_t mask = GXS_SERV::GXS_MSG_STATUS_UNREAD | GXS_SERV::GXS_MSG_STATUS_UNPROCESSED; uint32_t mask = GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_USER_UNREAD;
uint32_t status = GXS_SERV::GXS_MSG_STATUS_UNREAD; uint32_t status = GXS_SERV::GXS_MSG_STATUS_GUI_USER_UNREAD;
if (read) if (read)
{ {
status = 0; status = 0;
@ -1133,7 +1133,7 @@ bool p3GxsChannels::generatePost(uint32_t &token, const RsGxsGroupId &grpId)
msg.mMeta.mThreadId.clear() ; msg.mMeta.mThreadId.clear() ;
msg.mMeta.mParentId.clear() ; msg.mMeta.mParentId.clear() ;
msg.mMeta.mMsgStatus = GXS_SERV::GXS_MSG_STATUS_UNPROCESSED | GXS_SERV::GXS_MSG_STATUS_UNREAD; msg.mMeta.mMsgStatus = GXS_SERV::GXS_MSG_STATUS_UNPROCESSED;
createPost(token, msg); createPost(token, msg);
@ -1156,7 +1156,7 @@ bool p3GxsChannels::generateComment(uint32_t &token, const RsGxsGroupId &grpId,
msg.mMeta.mThreadId = threadId; msg.mMeta.mThreadId = threadId;
msg.mMeta.mParentId = parentId; msg.mMeta.mParentId = parentId;
msg.mMeta.mMsgStatus = GXS_SERV::GXS_MSG_STATUS_UNPROCESSED | GXS_SERV::GXS_MSG_STATUS_UNREAD; msg.mMeta.mMsgStatus = GXS_SERV::GXS_MSG_STATUS_UNPROCESSED;
/* chose a random Id to sign with */ /* chose a random Id to sign with */
std::list<RsGxsId> ownIds; std::list<RsGxsId> ownIds;
@ -1193,7 +1193,7 @@ bool p3GxsChannels::generateVote(uint32_t &token, const RsGxsGroupId &grpId, con
vote.mMeta.mGroupId = grpId; vote.mMeta.mGroupId = grpId;
vote.mMeta.mThreadId = threadId; vote.mMeta.mThreadId = threadId;
vote.mMeta.mParentId = parentId; vote.mMeta.mParentId = parentId;
vote.mMeta.mMsgStatus = GXS_SERV::GXS_MSG_STATUS_UNPROCESSED | GXS_SERV::GXS_MSG_STATUS_UNREAD; vote.mMeta.mMsgStatus = GXS_SERV::GXS_MSG_STATUS_UNPROCESSED;
/* chose a random Id to sign with */ /* chose a random Id to sign with */
std::list<RsGxsId> ownIds; std::list<RsGxsId> ownIds;

6
libretroshare/src/services/p3gxsforums.cc
View File

@ -268,8 +268,8 @@ bool p3GxsForums::createMsg(uint32_t &token, RsGxsForumMsg &msg)
void p3GxsForums::setMessageReadStatus(uint32_t& token, const RsGxsGrpMsgIdPair& msgId, bool read) void p3GxsForums::setMessageReadStatus(uint32_t& token, const RsGxsGrpMsgIdPair& msgId, bool read)
{ {
uint32_t mask = GXS_SERV::GXS_MSG_STATUS_UNREAD | GXS_SERV::GXS_MSG_STATUS_UNPROCESSED; uint32_t mask = GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_USER_UNREAD;
uint32_t status = GXS_SERV::GXS_MSG_STATUS_UNREAD; uint32_t status = GXS_SERV::GXS_MSG_STATUS_GUI_USER_UNREAD;
if (read) if (read)
{ {
status = 0; status = 0;
@ -446,7 +446,7 @@ bool p3GxsForums::generateMessage(uint32_t &token, const RsGxsGroupId &grpId, co
msg.mMeta.mThreadId = threadId; msg.mMeta.mThreadId = threadId;
msg.mMeta.mParentId = parentId; msg.mMeta.mParentId = parentId;
msg.mMeta.mMsgStatus = GXS_SERV::GXS_MSG_STATUS_UNPROCESSED | GXS_SERV::GXS_MSG_STATUS_UNREAD; msg.mMeta.mMsgStatus = GXS_SERV::GXS_MSG_STATUS_UNPROCESSED;
/* chose a random Id to sign with */ /* chose a random Id to sign with */
std::list<RsGxsId> ownIds; std::list<RsGxsId> ownIds;

4
libretroshare/src/services/p3postbase.cc
View File

@ -150,8 +150,8 @@ void p3PostBase::service_tick()
void p3PostBase::setMessageReadStatus(uint32_t& token, const RsGxsGrpMsgIdPair& msgId, bool read) void p3PostBase::setMessageReadStatus(uint32_t& token, const RsGxsGrpMsgIdPair& msgId, bool read)
{ {
uint32_t mask = GXS_SERV::GXS_MSG_STATUS_UNREAD | GXS_SERV::GXS_MSG_STATUS_UNPROCESSED; uint32_t mask = GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_USER_UNREAD;
uint32_t status = GXS_SERV::GXS_MSG_STATUS_UNREAD; uint32_t status = GXS_SERV::GXS_MSG_STATUS_GUI_USER_UNREAD;
if (read) if (read)
{ {
status = 0; status = 0;

4
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
View File

@ -1390,9 +1390,9 @@ void GxsForumThreadWidget::setMsgReadStatus(QList<QTreeWidgetItem*> &rows, bool
uint32_t status = (*row)->data(COLUMN_THREAD_DATA, ROLE_THREAD_STATUS).toUInt(); uint32_t status = (*row)->data(COLUMN_THREAD_DATA, ROLE_THREAD_STATUS).toUInt();
uint32_t statusNew = (status & ~(GXS_SERV::GXS_MSG_STATUS_UNREAD | GXS_SERV::GXS_MSG_STATUS_UNPROCESSED)); // orig status, without UNREAD and UNPROCESSED. uint32_t statusNew = (status & ~(GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_USER_UNREAD)); // orig status, without UNREAD and UNPROCESSED.
if (!read) { if (!read) {
statusNew |= GXS_SERV::GXS_MSG_STATUS_UNREAD; statusNew |= GXS_SERV::GXS_MSG_STATUS_GUI_USER_UNREAD;
} }
if (status != statusNew) // is it different? if (status != statusNew) // is it different?