mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-29 02:51:45 -04:00
fixed showup of self signatures in certificates that are not in the keyring already
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5438 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
8b7f71b284
commit
9f7d54f91d
3 changed files with 49 additions and 7 deletions
|
@ -260,7 +260,18 @@ void ConnectFriendWizard::initializePage(int id)
|
|||
QString ts;
|
||||
std::list<std::string>::iterator it;
|
||||
for (it = peerDetails.gpgSigners.begin(); it != peerDetails.gpgSigners.end(); ++it) {
|
||||
ts += QString("%1<%2>\n").arg(QString::fromUtf8(rsPeers->getPeerName(*it).c_str()), QString::fromStdString(*it));
|
||||
{
|
||||
std::string peer_name = rsPeers->getPeerName(*it) ;
|
||||
|
||||
// This is baaaad code. We should handle this kind of errors with proper exceptions.
|
||||
// This happens because signers from a unknown key cannt be found in the keyring, including
|
||||
// self-signatures.
|
||||
//
|
||||
if(peer_name == "[Unknown PGP Cert name]" && *it == peerDetails.gpg_id)
|
||||
peer_name = peerDetails.name ;
|
||||
|
||||
ts += QString("%1<%2>\n").arg(QString::fromUtf8(peer_name.c_str()), QString::fromStdString(*it));
|
||||
}
|
||||
}
|
||||
|
||||
ui->nameEdit->setText(QString::fromUtf8(peerDetails.name.c_str()));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue