Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-29 01:16:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

arranged to show PGP id for friends from short invite. Name not available yet

Browse Source
This commit is contained in:
csoler 2019-06-22 22:07:23 +02:00
parent a52451b72c
commit daec6b33c7
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
retroshare-gui/src/gui/common/FriendList.cpp
View File

@ -871,7 +871,7 @@ void FriendList::insertPeers()
std::list<RsPeerId> ssl_friends ;
rsPeers->getFriendList(ssl_friends);
std::set<RsPgpId> pgp_friends_without_validation;
std::map<RsPgpId,std::list<RsPeerDetails> > pgp_friends_without_validation;
std::cerr << "List of accepted ssl peers: " << std::endl;
for(auto it(ssl_friends.begin());it!=ssl_friends.end();++it)
@ -881,7 +881,7 @@ void FriendList::insertPeers()
{
std::cerr << " adding " << *it << " - " << pd.gpg_id << std::endl;
gpgFriends.push_back(pd.gpg_id);
pgp_friends_without_validation.insert(pd.gpg_id);
pgp_friends_without_validation[pd.gpg_id].push_back(pd);
}
}
@ -1086,7 +1086,8 @@ void FriendList::insertPeers()
}
RsPeerDetails detail;
if ((!rsPeers->getGPGDetails(gpgId, detail) || !detail.accept_connection) && detail.gpg_id != ownId) {
if (pgp_friends_without_validation.find(gpgId) == pgp_friends_without_validation.end() &&
(!rsPeers->getGPGDetails(gpgId, detail) || !detail.accept_connection) && detail.gpg_id != ownId) {
// don't accept anymore connection, remove from the view
if (gpgItem) {
if (groupItem) {
@ -1097,9 +1098,7 @@ void FriendList::insertPeers()
}
// We still want to add the item if it is unvalidated, in which case getGPGDetails returns false.
if(pgp_friends_without_validation.find(gpgId) == pgp_friends_without_validation.end())
continue;
continue;
}
if (gpgItem == NULL)
@ -1150,9 +1149,20 @@ void FriendList::insertPeers()
// update the childs (ssl certs)
PgpItemInfo info;
rsPeers->getAssociatedSSLIds(detail.gpg_id, info.sslContacts);
manageProfileLocations(gpgItem,detail.gpg_id,info);
auto itt = pgp_friends_without_validation.find(gpgId);
if(itt != pgp_friends_without_validation.end())
{
info.sslContacts.clear();
for(auto itt2(itt->second.begin());itt2!=itt->second.end();++itt2)
info.sslContacts.push_back(itt2->id);
detail.name = gpgId.toStdString() + tr(" (Unverified yet)").toStdString();
}
else
rsPeers->getAssociatedSSLIds(gpgId, info.sslContacts);
manageProfileLocations(gpgItem,gpgId,info);
QString gpgName = QString::fromUtf8(detail.name.c_str());
QString gpgText;