Skip to content

gui/circles: fix unintended re-invitation of revoked members during circle update #239

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

Merged
defnax merged 1 commit into from
Mar 10, 2026
Merged

gui/circles: fix unintended re-invitation of revoked members during circle update #239

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
15 changes: 11 additions & 4 deletions retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,7 @@ void CreateCircleDialog::addMember(const QString& keyId, const QString& idtype,
member->setIcon(RSCIRCLEID_COL_NICKNAME, icon);
member->setText(RSCIRCLEID_COL_KEYID, keyId);
//member->setText(RSCIRCLEID_COL_IDTYPE, idtype);
member->setData(RSCIRCLEID_COL_STATUS, Qt::UserRole, true); // Manually added members are invited

tree->addTopLevelItem(member);

Expand Down Expand Up @@ -504,6 +505,7 @@ void CreateCircleDialog::createCircle()
{
QTreeWidgetItem *item = tree->topLevelItem(i);
QString keyId = item->text(RSCIRCLEID_COL_KEYID);
bool is_invited = item->data(RSCIRCLEID_COL_STATUS, Qt::UserRole).toBool();

/* insert into circle */
if (mIsExternalCircle)
Expand All @@ -516,9 +518,11 @@ void CreateCircleDialog::createCircle()
continue ;
}

circle.mInvitedMembers.insert(key_id_gxs) ;
if (is_invited) {
circle.mInvitedMembers.insert(key_id_gxs) ;
}
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::createCircle() Inserting Member: " << keyId.toStdString();
std::cerr << "CreateCircleDialog::createCircle() Inserting Member: " << keyId.toStdString() << " (invited: " << is_invited << ")";
std::cerr << std::endl;
#endif
}
Expand All @@ -532,9 +536,11 @@ void CreateCircleDialog::createCircle()
continue ;
}

circle.mLocalFriends.insert(key_id_pgp) ;
if (is_invited) {
circle.mLocalFriends.insert(key_id_pgp) ;
}
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
std::cerr << "CreateCircleDialog::createCircle() Inserting Friend: " << keyId.toStdString();
std::cerr << "CreateCircleDialog::createCircle() Inserting Friend: " << keyId.toStdString() << " (invited: " << is_invited << ")";
std::cerr << std::endl;
#endif
}
Expand Down Expand Up @@ -1138,6 +1144,7 @@ void CreateCircleDialog::updateMemberStatus(QTreeWidgetItem* subitem, bool invit

subitem->setText(RSCIRCLEID_COL_STATUS, statusText);
subitem->setToolTip(RSCIRCLEID_COL_STATUS, tooltip);
subitem->setData(RSCIRCLEID_COL_STATUS, Qt::UserRole, invited);

// Apply bold font for own ID
QFont font = ui.treeWidget_membership->font();
Expand Down
Loading