The_Great_Archive/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2026-09-12 19:50:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix "Accept friend request" button persisting after SSL-only friend added

Browse Source 
In the Activity feed, accepting an unknown peer (no PGP key in keyring)
adds it as an SSL-only friend via addSslOnlyFriend(), which sets
skip_pgp_signature_validation instead of the PGP-keyring accept_connection
flag. SecurityItem::updateItem() only tested details.accept_connection to
decide button visibility, so for an accepted SSL-only friend the condition
stayed false and the "Accept friend request" button kept being shown (and
"Remove friend" stayed hidden), even though the peer was already a friend.

Treat skip_pgp_signature_validation == true as accepted too, since that
flag is only set for a peer already present in the friend list.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
jolavillette 2026-07-09 09:27:23 +02:00
parent 6160b39dab
commit f0a5a4687f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
retroshare-gui/src/gui/feeds/SecurityItem.cpp
View File

@ -300,7 +300,12 @@ void SecurityItem::updateItem()
chatButton->hide();
}
if (details.accept_connection)
// accept_connection is a PGP-keyring flag, only set when we own the peer's
// PGP key. An SSL-only friend (accepted unknown peer / short invite) has no
// PGP key, so it is flagged by skip_pgp_signature_validation instead. Treat
// both as accepted, otherwise the "Accept friend request" button keeps being
// shown after an SSL-only friend has already been added.
if (details.accept_connection || details.skip_pgp_signature_validation)
{
friendRequesttoolButton->hide();
requestLabel->hide();