Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-04 20:59:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed problem in ID creation code.

Browse source
This commit is contained in:
csoler 2017-02-07 20:15:55 +01:00
parent 9226ccc5ca
commit 37f3e1a62a
11 changed files with 48 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
View file

@ -795,9 +795,9 @@ void CreateCircleDialog::loadIdentities(uint32_t token)
if (acceptAnonymous)
ok = true;
else if (acceptAllPGP)
ok = idGroup.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID ;
ok = idGroup.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID_kept_for_compatibility ;
else if (idGroup.mPgpKnown)
ok = idGroup.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID ;
ok = idGroup.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID_kept_for_compatibility ;
if (!ok) {
#ifdef DEBUG_CREATE_CIRCLE_DIALOG
@ -816,7 +816,7 @@ void CreateCircleDialog::loadIdentities(uint32_t token)
if(idGroup.mImage.mSize == 0 || !pixmap.loadFromData(idGroup.mImage.mData, idGroup.mImage.mSize, "PNG"))
pixmap = QPixmap::fromImage(GxsIdDetails::makeDefaultIcon(RsGxsId(idGroup.mMeta.mGroupId))) ;
if (idGroup.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID)
if (idGroup.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID_kept_for_compatibility)
{
if (idGroup.mPgpKnown) {
RsPeerDetails details;

6
retroshare-gui/src/gui/Identity/IdDetailsDialog.cpp
View file

@ -204,7 +204,7 @@ void IdDetailsDialog::insertIdDetails(uint32_t token)
}
else
{
if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID)
RSGXSID_GROUPFLAG_REALID_kept_for_compatibilitySID_GROUPFLAG_REALID_deprecated)
{
ui->lineEdit_GpgName->setText(tr("Unknown real name"));
}
@ -236,9 +236,7 @@ void IdDetailsDialog::insertIdDetails(uint32_t token)
ui->lineEdit_Type->setText(tr("Identity owned by you, linked to your Retroshare node")) ;
else
ui->lineEdit_Type->setText(tr("Anonymous identity, owned by you")) ;
else if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID)
{
if (data.mPgpKnown)
else if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLRSGXSID_GROUPFLAG_REALID_kept_for_compatibility.mPgpKnown)
if (rsPeers->isGPGAccepted(data.mPgpId))
ui->lineEdit_Type->setText(tr("Owned by a friend Retroshare node")) ;
else

8
retroshare-gui/src/gui/Identity/IdDialog.cpp
View file

@ -1416,7 +1416,7 @@ bool IdDialog::fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item,
/* do filtering */
bool ok = false;
if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID)
if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID_kept_for_compatibility)
{
if (isLinkedToOwnNode && (accept & RSID_FILTER_YOURSELF))
{
@ -1518,7 +1518,7 @@ bool IdDialog::fillIdListItem(const RsGxsIdGroup& data, QTreeWidgetItem *&item,
QString tooltip;
if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID)
if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID_kept_for_compatibility)
{
if (data.mPgpKnown)
{
@ -1760,7 +1760,7 @@ void IdDialog::insertIdDetails(uint32_t token)
}
else
{
if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID)
if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID_kept_for_compatibility)
ui->lineEdit_GpgName->setText(tr("[Unknown node]"));
else
ui->lineEdit_GpgName->setText(tr("Anonymous Id"));
@ -1796,7 +1796,7 @@ void IdDialog::insertIdDetails(uint32_t token)
ui->lineEdit_Type->setText(tr("Identity owned by you, linked to your Retroshare node")) ;
else
ui->lineEdit_Type->setText(tr("Anonymous identity, owned by you")) ;
else if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID)
else if (data.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID_kept_for_compatibility)
{
if (data.mPgpKnown)
if (rsPeers->isGPGAccepted(data.mPgpId))

2
retroshare-gui/src/gui/Identity/IdEditDialog.cpp
View file

@ -262,7 +262,7 @@ void IdEditDialog::loadExistingId(uint32_t token)
setAvatar(avatar);
bool realid = (mEditGroup.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID);
bool realid = (mEditGroup.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID_kept_for_compatibility);
if (realid)
{