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

fixed bug causing lack of passwd request on group edit

Browse source
This commit is contained in:
csoler 2021-02-10 21:47:06 +01:00
parent 499753f873
commit 43fbd6f76a
3 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/retroshare/rsidentity.h
View file

@ -143,6 +143,7 @@ struct RsGxsIdGroup : RsSerializable
rstime_t mLastUsageTS ; rstime_t mLastUsageTS ;
// Not Serialised - for GUI's benefit. // Not Serialised - for GUI's benefit.
bool mPgpLinked;
bool mPgpKnown; bool mPgpKnown;
bool mIsAContact; // change that into flags one day bool mIsAContact; // change that into flags one day
RsPgpId mPgpId; RsPgpId mPgpId;

1
libretroshare/src/services/p3idservice.cc
View file

@ -2017,6 +2017,7 @@ bool p3IdService::getGroupData(const uint32_t &token, std::vector<RsGxsIdGroup>
} }
group.mIsAContact = (mContacts.find(RsGxsId(group.mMeta.mGroupId)) != mContacts.end()); group.mIsAContact = (mContacts.find(RsGxsId(group.mMeta.mGroupId)) != mContacts.end());
group.mPgpLinked = (!!(group.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID_kept_for_compatibility)) || !!(group.mMeta.mGroupFlags & RSGXSID_GROUPFLAG_REALID);
groups.push_back(group); groups.push_back(group);
delete(item); delete(item);

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

@ -637,7 +637,7 @@ void IdEditDialog::updateId()
RsGxsId keyId; RsGxsId keyId;
std::string gpg_password; std::string gpg_password;
if(!mEditGroup.mPgpId.isNull()) if(mEditGroup.mPgpLinked)
{ {
std::string gpg_name = rsPeers->getGPGName(rsPeers->getGPGOwnId()); std::string gpg_name = rsPeers->getGPGName(rsPeers->getGPGOwnId());
bool cancelled; bool cancelled;