Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-26 09:41:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #791 from PhenomRetroShare/Fix_MissingMessageMarkedRead

Browse Source 
Fix Missing messages when mark all as read.
This commit is contained in:
csoler 2017-04-30 22:39:07 +02:00 committed by GitHub
commit 8aa9be334f
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libretroshare/src/gxs/rsgxsdata.cc
View File

@ -239,17 +239,21 @@ void RsGxsMsgMetaData::clear()
mMsgId.clear(); mMsgId.clear();
mThreadId.clear(); mThreadId.clear();
mParentId.clear(); mParentId.clear();
mAuthorId.clear();
mOrigMsgId.clear(); mOrigMsgId.clear();
mMsgName.clear(); mAuthorId.clear();
mServiceString.clear();
signSet.TlvClear(); signSet.TlvClear();
mMsgName.clear();
mPublishTs = 0; mPublishTs = 0;
mMsgFlags = 0; mMsgFlags = 0;
mServiceString.clear();
mMsgStatus = 0; mMsgStatus = 0;
mMsgSize = 0;
mChildTs = 0; mChildTs = 0;
recvTS = 0; recvTS = 0;
mHash.clear();
validated = false;
} }
bool RsGxsMsgMetaData::serialise(void *data, uint32_t *size) bool RsGxsMsgMetaData::serialise(void *data, uint32_t *size)

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

@ -1844,11 +1844,23 @@ void GxsForumThreadWidget::setMsgReadStatus(QList<QTreeWidgetItem*> &rows, bool
// LIKE THIS BELOW... // LIKE THIS BELOW...
//std::string grpId = (*Row)->data(COLUMN_THREAD_DATA, ROLE_THREAD_GROUPID).toString().toStdString(); //std::string grpId = (*Row)->data(COLUMN_THREAD_DATA, ROLE_THREAD_GROUPID).toString().toStdString();
RsGxsGrpMsgIdPair msgPair = std::make_pair(groupId(), RsGxsMessageId(msgId)); RsGxsGrpMsgIdPair msgPair = std::make_pair( groupId(), RsGxsMessageId(msgId) );
uint32_t token; uint32_t token;
rsGxsForums->setMessageReadStatus(token, msgPair, read); rsGxsForums->setMessageReadStatus(token, msgPair, read);
// Look if older version exist to mark them too
QMap<RsGxsMessageId,QVector<QPair<time_t,RsGxsMessageId> > >::const_iterator it = mPostVersions.find(mOrigThreadId) ;
if(it != mPostVersions.end())
{
std::cerr << (*it).size() << " versions found " << std::endl;
for(int i=0;i<(*it).size();++i)
{
msgPair = std::make_pair( groupId(), (*it)[i].second );
rsGxsForums->setMessageReadStatus(token, msgPair, read);
}
}
/* Add message id to ignore list for the next updateDisplay */ /* Add message id to ignore list for the next updateDisplay */
mIgnoredMsgId.push_back(RsGxsMessageId(msgId)); mIgnoredMsgId.push_back(RsGxsMessageId(msgId));