Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1867 from PhenomRetroShare/Fix_Forum_RSLink_SIGSEGV

Browse Source 
Fix Forum RSLink making SIGSEGV
This commit is contained in:
csoler 2020-04-24 21:52:51 +02:00 committed by GitHub
commit 3a3a41835b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 68 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp
View File

@ -53,7 +53,7 @@ RsGxsForumModel::RsGxsForumModel(QObject *parent)
void RsGxsForumModel::preMods()
{
emit layoutAboutToBeChanged();
//emit layoutAboutToBeChanged(); //Generate SIGSEGV when click on button move next/prev.
beginResetModel();
}

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

@ -448,9 +448,14 @@ void GxsForumThreadWidget::processSettings(bool load)
Settings->endGroup();
}
void GxsForumThreadWidget::changedSelection(const QModelIndex& current,const QModelIndex&)
void GxsForumThreadWidget::changedSelection(const QModelIndex& current,const QModelIndex& last)
{
changedThread(current);
if (current!=last
&& ( ( last.row()>=0 && last.column()>=0) //Double call when retrieve focus.
|| mThreadId.isNull() //For first click
)
)
changedThread(current);
}
void GxsForumThreadWidget::groupIdChanged()
@ -507,7 +512,7 @@ void GxsForumThreadWidget::recursSaveExpandedItems(const QModelIndex& index, QLi
}
}
void GxsForumThreadWidget::recursRestoreExpandedItems(const QModelIndex& index, const QList<RsGxsMessageId>& expanded_items)
void GxsForumThreadWidget::recursRestoreExpandedItems(const QModelIndex& /*index*/, const QList<RsGxsMessageId>& expanded_items)
{
for(auto it(expanded_items.begin());it!=expanded_items.end();++it)
ui->threadTreeWidget->setExpanded( mThreadProxyModel->mapFromSource(mThreadModel->getIndexOfMessage(*it)) ,true) ;
@ -792,71 +797,63 @@ void GxsForumThreadWidget::changedVersion()
void GxsForumThreadWidget::changedThread(QModelIndex index)
{
//if(mUpdating)
// return;
if(!index.isValid())
return;
if(!index.isValid())
return;
RsGxsMessageId new_id(index.sibling(index.row(),RsGxsForumModel::COLUMN_THREAD_MSGID).data(Qt::UserRole).toString().toStdString());
RsGxsMessageId new_id(index.sibling(index.row(),RsGxsForumModel::COLUMN_THREAD_MSGID).data(Qt::UserRole).toString().toStdString());
if(new_id == mThreadId)
return;
if(new_id == mThreadId)
return;
mThreadId = mOrigThreadId = new_id;
#ifdef DEBUG_FORUMS
std::cerr << "Switched to new thread ID " << mThreadId << std::endl;
std::cerr << "Switched to new thread ID " << mThreadId << std::endl;
#endif
//ui->postText->resetImagesStatus(Settings->getForumLoadEmbeddedImages()) ;
insertMessage();
QModelIndex src_index = mThreadProxyModel->mapToSource(index);
if(Settings->getForumMsgSetToReadOnActivate())
{
#ifdef DEBUG_FORUMS
std::cerr << "Setting message read status to true" << std::endl;
std::cerr << "Setting message read status to true" << std::endl;
#endif
bool setToReadOnActive = Settings->getForumMsgSetToReadOnActivate();
if(setToReadOnActive)
{
saveExpandedItems(mSavedExpandedMessages);
mThreadModel->setMsgReadStatus(src_index, true,false);
}
markMsgAsReadUnread(true, false, false);
}
}
void GxsForumThreadWidget::clickedThread(QModelIndex index)
{
#ifdef DEBUG_FORUMS
std::cerr << "Clicked on message ID " << mThreadId << ", index=" << index << std::endl;
std::cerr << "Clicked on message ID " << mThreadId << ", index=" << index << std::endl;
#endif
if(!index.isValid())
{
if(!index.isValid())
{
#ifdef DEBUG_FORUMS
std::cerr << " early return because index is invalid" << std::endl;
#endif
return;
}
}
if (index.column() == RsGxsForumModel::COLUMN_THREAD_READ)
{
saveExpandedItems(mSavedExpandedMessages);
ForumModelPostEntry fmpe;
{
QModelIndex src_index = mThreadProxyModel->mapToSource(index);
mThreadModel->getPostData(src_index,fmpe);
ForumModelPostEntry fmpe;
mThreadModel->getPostData(src_index,fmpe);
#ifdef DEBUG_FORUMS
std::cerr << "Setting message read status to false" << std::endl;
#endif
mThreadModel->setMsgReadStatus(src_index, IS_MSG_UNREAD(fmpe.mMsgStatus),false);
// First Load Message (may change read status) to not recall it after index change.
changedThread(index);
// Now index is invalid as model was reloaded, Selection isn't updated.
markMsgAsReadUnread(IS_MSG_UNREAD(static_cast<uint32_t>(fmpe.mMsgStatus)), false, false, mThreadId);
}
#ifdef DEBUG_FORUMS
else
std::cerr << " doing nothing" << std::endl;
else
std::cerr << " doing nothing" << std::endl;
#endif
}
@ -1194,8 +1191,8 @@ void GxsForumThreadWidget::previousMessage()
if (prevItem.isValid()) {
ui->threadTreeWidget->setCurrentIndex(prevItem);
ui->threadTreeWidget->scrollTo(ui->threadTreeWidget->currentIndex());//May change if model reloaded
ui->threadTreeWidget->setFocus();
changedThread(prevItem);
}
}
ui->previousButton->setEnabled(index-1 > 0);
@ -1221,8 +1218,8 @@ void GxsForumThreadWidget::nextMessage()
if (nextItem.isValid()) {
ui->threadTreeWidget->setCurrentIndex(nextItem);
ui->threadTreeWidget->scrollTo(ui->threadTreeWidget->currentIndex()); //May change if model reloaded
ui->threadTreeWidget->setFocus();
changedThread(nextItem);
}
}
ui->previousButton->setEnabled(true);
@ -1266,30 +1263,31 @@ void GxsForumThreadWidget::nextUnreadMessage()
}
ui->threadTreeWidget->setCurrentIndex(index);
ui->threadTreeWidget->scrollTo(index);
changedThread(index);
ui->threadTreeWidget->scrollTo(ui->threadTreeWidget->currentIndex());//May change if model reloaded
}
void GxsForumThreadWidget::markMsgAsReadUnread (bool read, bool children, bool forum)
void GxsForumThreadWidget::markMsgAsReadUnread (bool read, bool children, bool forum, RsGxsMessageId msgId /*= RsGxsMessageId()*/)
{
if (groupId().isNull() || !IS_GROUP_SUBSCRIBED(mForumGroup.mMeta.mSubscribeFlags)) {
return;
}
saveExpandedItems(mSavedExpandedMessages);
if(forum)
mThreadModel->setMsgReadStatus(mThreadModel->root(),read,children);
else
QModelIndex src_index;
if(forum)
src_index = mThreadModel->root();
else
{
QModelIndexList selectedIndexes = ui->threadTreeWidget->selectionModel()->selectedIndexes();
if(selectedIndexes.size() != RsGxsForumModel::COLUMN_THREAD_NB_COLUMNS) // check that a single row is selected
return ;
QModelIndex index = *selectedIndexes.begin();
mThreadModel->setMsgReadStatus(mThreadProxyModel->mapToSource(index),read,children);
if (!msgId.isNull())
src_index = mThreadProxyModel->mapToSource(getCurrentIndex());
else
src_index = mThreadModel->getIndexOfMessage(mThreadId);
}
mThreadModel->setMsgReadStatus(src_index,read,children);
//Restore Selection
whileBlocking(ui->threadTreeWidget)->setCurrentIndex(mThreadProxyModel->mapFromSource(mThreadModel->getIndexOfMessage(mThreadId)));
recursRestoreExpandedItems(QModelIndex(),mSavedExpandedMessages);
}
void GxsForumThreadWidget::markMsgAsRead()
@ -1332,9 +1330,8 @@ bool GxsForumThreadWidget::navigate(const RsGxsMessageId &msgId)
QModelIndex indx = mThreadProxyModel->mapFromSource(source_index);
ui->threadTreeWidget->setCurrentIndex(indx);
ui->threadTreeWidget->scrollTo(indx);
ui->threadTreeWidget->scrollTo(ui->threadTreeWidget->currentIndex());//May change if model reloaded
ui->threadTreeWidget->setFocus();
changedThread(indx);
return true;
}
@ -1679,24 +1676,23 @@ void GxsForumThreadWidget::filterItems(const QString& text)
void GxsForumThreadWidget::postForumLoading()
{
#ifdef DEBUG_FORUMS
std::cerr << "Post forum loading..." << std::endl;
std::cerr << "Post forum loading..." << std::endl;
#endif
if(!mNavigatePendingMsgId.isNull() && mThreadModel->getIndexOfMessage(mNavigatePendingMsgId).isValid())
{
if(!mNavigatePendingMsgId.isNull() && mThreadModel->getIndexOfMessage(mNavigatePendingMsgId).isValid())
{
#ifdef DEBUG_FORUMS
std::cerr << "Pending msg navigation: " << mNavigatePendingMsgId << ". Using it as new thread Id" << std::endl;
std::cerr << "Pending msg navigation: " << mNavigatePendingMsgId << ". Using it as new thread Id" << std::endl;
#endif
QModelIndex source_index = mThreadModel->getIndexOfMessage(mNavigatePendingMsgId);
QModelIndex index = mThreadProxyModel->mapFromSource(source_index);
QModelIndex source_index = mThreadModel->getIndexOfMessage(mNavigatePendingMsgId);
QModelIndex index = mThreadProxyModel->mapFromSource(source_index);
ui->threadTreeWidget->selectionModel()->setCurrentIndex(index,QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
ui->threadTreeWidget->scrollTo(index);
ui->threadTreeWidget->scrollTo(ui->threadTreeWidget->currentIndex());//May change if model reloaded
changedThread(index);
mNavigatePendingMsgId.clear();
}
else
mNavigatePendingMsgId.clear();
}
else
{
QModelIndex source_index = mThreadModel->getIndexOfMessage(mThreadId);
@ -1705,7 +1701,7 @@ void GxsForumThreadWidget::postForumLoading()
{
QModelIndex index = mThreadProxyModel->mapFromSource(source_index);
ui->threadTreeWidget->selectionModel()->setCurrentIndex(index,QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
ui->threadTreeWidget->scrollTo(index);
ui->threadTreeWidget->scrollTo(ui->threadTreeWidget->currentIndex());//May change if model reloaded
#ifdef DEBUG_FORUMS
std::cerr << " re-selecting index of message " << mThreadId << " to " << source_index.row() << "," << source_index.column() << " " << (void*)source_index.internalPointer() << std::endl;
#endif

12
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
View File

@ -101,9 +101,9 @@ private slots:
void changedSelection(const QModelIndex &, const QModelIndex &);
void changedThread(QModelIndex index);
void changedVersion();
void clickedThread (QModelIndex index);
void postForumLoading();
void clickedThread (QModelIndex index);
void postForumLoading();
void reply_with_private_message();
void replytoforummessage();
void editforummessage();
@ -157,9 +157,9 @@ private:
void saveExpandedItems(QList<RsGxsMessageId>& expanded_items) const;
int getSelectedMsgCount(QList<QTreeWidgetItem*> *pRows, QList<QTreeWidgetItem*> *pRowsRead, QList<QTreeWidgetItem*> *pRowsUnread);
void setMsgReadStatus(QList<QTreeWidgetItem*> &rows, bool read);
void markMsgAsReadUnread(bool read, bool children, bool forum);
void calculateUnreadCount();
void setMsgReadStatus(QList<QTreeWidgetItem*> &rows, bool read);
void markMsgAsReadUnread(bool read, bool children, bool forum, RsGxsMessageId msgId = RsGxsMessageId());
void calculateUnreadCount();
void togglethreadview_internal();