Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-23 05:44:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2165 from PhenomRetroShare/Fix_MailFriendRequest

Browse source 
Fix Mail for known Friend Request
This commit is contained in:
defnax 2020-12-16 11:08:11 +01:00 • committed by GitHub
commit f93d19f4bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View file

@ -597,7 +597,7 @@ void MessageComposer::addConnectAttemptMsg(const RsPgpId &gpgId, const RsPeerId
// PGPId+SslId are always here. But if the peer is not a friend the SSL id cannot be used. // PGPId+SslId are always here. But if the peer is not a friend the SSL id cannot be used.
// (todo) If the PGP id doesn't get us a PGP key from the keyring, we need to create a short invite // (todo) If the PGP id doesn't get us a PGP key from the keyring, we need to create a short invite
RetroShareLink link = RetroShareLink::createUnknownSslCertificate(sslId); RetroShareLink link = RetroShareLink::createUnknownSslCertificate(sslId, gpgId);
if (!link.valid()) if (!link.valid())
return; return;