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

renamed 'pubkey' to 'certificate' and removed empty location names

Browse Source
This commit is contained in:
sehraf 2015-08-23 09:55:43 +02:00
parent 04a1c10a56
commit ad499e6bd6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1783,10 +1783,11 @@ bool FriendList::exportFriendlist(QString &fileName)
QDomElement sslID = doc.createElement("sslID"); QDomElement sslID = doc.createElement("sslID");
// these values aren't used and just stored for better human readability // these values aren't used and just stored for better human readability
sslID.setAttribute("sslID", QString::fromStdString(detail2.id.toStdString())); sslID.setAttribute("sslID", QString::fromStdString(detail2.id.toStdString()));
sslID.setAttribute("location", QString::fromUtf8(detail2.location.c_str())); if(!detail2.location.empty())
sslID.setAttribute("location", QString::fromUtf8(detail2.location.c_str()));
// required values // required values
sslID.setAttribute("pubkey", QString::fromStdString(invite)); sslID.setAttribute("certificate", QString::fromStdString(invite));
sslID.setAttribute("service_perm_flags", detail2.service_perm_flags.toUInt32()); sslID.setAttribute("service_perm_flags", detail2.service_perm_flags.toUInt32());
pgpID.appendChild(sslID); pgpID.appendChild(sslID);
@ -1915,7 +1916,7 @@ bool FriendList::importFriendlist(QString &fileName, bool &errorPeers, bool &err
rsPgpID.clear(); rsPgpID.clear();
// load everything needed from the pubkey string // load everything needed from the pubkey string
std::string pubkey = sslIDElem.attribute("pubkey").toStdString(); std::string pubkey = sslIDElem.attribute("certificate").toStdString();
if(rsPeers->loadDetailsFromStringCert(pubkey, rsPeerDetails, error_code)) { if(rsPeers->loadDetailsFromStringCert(pubkey, rsPeerDetails, error_code)) {
if(rsPeers->loadCertificateFromString(pubkey, rsPeerID, rsPgpID, error_string)) { if(rsPeers->loadCertificateFromString(pubkey, rsPeerID, rsPgpID, error_string)) {
ServicePermissionFlags service_perm_flags(sslIDElem.attribute("service_perm_flags").toInt()); ServicePermissionFlags service_perm_flags(sslIDElem.attribute("service_perm_flags").toInt());