Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-16 17:13:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'RetroShare:master' into cleanupoldiconsandnewsvg

Browse source
This commit is contained in:
defnax 2022-02-25 18:05:41 +01:00 • committed by GitHub
commit 701b2e4ca1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 438 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/common/NewFriendList.cpp
View file

@ -1359,7 +1359,7 @@ bool NewFriendList::exportFriendlist(QString &fileName)
if (!rsPeers->getPeerDetails(*list_iter2, detailSSL))
continue;
std::string certificate = rsPeers->GetRetroshareInvite(detailSSL.id, RetroshareInviteFlags::CURRENT_IP | RetroshareInviteFlags::DNS | RetroshareInviteFlags::RADIX_FORMAT);
std::string certificate = rsPeers->GetRetroshareInvite(detailSSL.id, RsPeers::defaultCertificateFlags | RetroshareInviteFlags::RADIX_FORMAT);
// remove \n from certificate
certificate.erase(std::remove(certificate.begin(), certificate.end(), '\n'), certificate.end());