Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-26 01:31:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed re-parsing of certificate

Browse Source
This commit is contained in:
csoler 2022-02-12 18:32:36 +01:00
parent 24d5fc9eca
commit 2428ebf6c3
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
retroshare-gui/src/gui/HomePage.cpp
View File

@ -207,8 +207,7 @@ HomePage::~HomePage()
void HomePage::getOwnCert(QString& invite,QString& description) const void HomePage::getOwnCert(QString& invite,QString& description) const
{ {
RsPeerDetails detail;
RsPeerDetails detail,parsed_details;
if (!rsPeers->getPeerDetails(rsPeers->getOwnId(), detail)) if (!rsPeers->getPeerDetails(rsPeers->getOwnId(), detail))
{ {
@ -235,19 +234,9 @@ void HomePage::getOwnCert(QString& invite,QString& description) const
std::string short_invite; std::string short_invite;
rsPeers->getShortInvite(short_invite,rsPeers->getOwnId(),invite_flags | RetroshareInviteFlags::RADIX_FORMAT); rsPeers->getShortInvite(short_invite,rsPeers->getOwnId(),invite_flags | RetroshareInviteFlags::RADIX_FORMAT);
invite = QString::fromStdString(short_invite); invite = QString::fromStdString(short_invite);
uint32_t err;
if(!rsPeers->parseShortInvite(short_invite,parsed_details,err))
std::cerr << "Something unexpected happenned while re-parsing a cert just created: error " << err << std::endl;
} }
else else
{
invite = QString::fromStdString(rsPeers->GetRetroshareInvite(detail.id,invite_flags)); invite = QString::fromStdString(rsPeers->GetRetroshareInvite(detail.id,invite_flags));
uint32_t err;
if(!rsPeers->loadDetailsFromStringCert(invite.toStdString(),parsed_details,err))
std::cerr << "Something unexpected happenned while re-parsing a cert just created: error " << err << std::endl;
}
bool include_extra_locators = mIncludeIPHistoryact->isChecked(); bool include_extra_locators = mIncludeIPHistoryact->isChecked();
description = ConfCertDialog::getCertificateDescription(detail,false,!mUseOldFormatact->isChecked(),include_extra_locators); description = ConfCertDialog::getCertificateDescription(detail,false,!mUseOldFormatact->isChecked(),include_extra_locators);

4
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View File

@ -303,13 +303,9 @@ QString ConfCertDialog::getCertificateDescription(const RsPeerDetails& detail,bo
QString infotext; QString infotext;
if(use_short_format) if(use_short_format)
{
infotext += tr("<p>This Retroshare ID contains:") ; infotext += tr("<p>This Retroshare ID contains:") ;
}
else else
{
infotext += tr("<p>This certificate contains:") ; infotext += tr("<p>This certificate contains:") ;
}
infotext += "<UL>" ; infotext += "<UL>" ;