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

Merge pull request #2350 from csoler/v0.6-BugFixing_10

Browse source 
Bug fixing in FriendList
This commit is contained in:
csoler 2021-02-28 19:59:57 +01:00 • committed by GitHub
commit 2b9a290a85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 218 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libretroshare/src/rsserver/p3peers.cc
View file

@ -121,15 +121,20 @@ p3Peers::p3Peers(p3LinkMgr *lm, p3PeerMgr *pm, p3NetMgr *nm)
:mLinkMgr(lm), mPeerMgr(pm), mNetMgr(nm) {}
/* Updates ... */
bool p3Peers::FriendsChanged(bool add)
bool p3Peers::FriendsChanged(const RsPeerId& pid,bool add)
{
#ifdef P3PEERS_DEBUG
std::cerr << "p3Peers::FriendsChanged()" << std::endl;
std::cerr << "p3Peers::FriendsChanged()" << std::endl;
#endif
RsServer::notify()->notifyListChange(NOTIFY_LIST_FRIENDS, add? NOTIFY_TYPE_ADD : NOTIFY_TYPE_DEL);
if(rsEvents)
{
auto ev = std::make_shared<RsPeerStateChangedEvent>(pid);
rsEvents->postEvent(ev);
}
RsServer::notify()->notifyListChange(NOTIFY_LIST_FRIENDS, add? NOTIFY_TYPE_ADD : NOTIFY_TYPE_DEL); // this is meant to disappear
/* TODO */
return false;
/* TODO */
return false;
}
bool p3Peers::OthersChanged()
@ -769,7 +774,7 @@ bool p3Peers::addFriend(const RsPeerId &ssl_id, const RsPgpId &gpg_id,ServicePe
return true;
}
FriendsChanged(true);
FriendsChanged(ssl_id,true);
/* otherwise - we install as ssl_id.....
* If we are adding an SSL certificate. we flag lastcontact as now.
@ -783,7 +788,7 @@ bool p3Peers::addSslOnlyFriend( const RsPeerId& sslId, const RsPgpId& pgp_id,con
{
if( mPeerMgr->addSslOnlyFriend(sslId, pgp_id,details))
{
FriendsChanged(true);
FriendsChanged(sslId,true);
return true;
}
else
@ -802,8 +807,9 @@ bool p3Peers::removeFriendLocation(const RsPeerId &sslId)
#endif
//will remove if it's a ssl id
mPeerMgr->removeFriend(sslId, false);
return true;
FriendsChanged(sslId,false);
return true;
}
bool p3Peers::removeFriend(const RsPgpId& gpgId)
@ -1641,7 +1647,7 @@ bool p3Peers::loadCertificateFromString(
if(res)
{
mPeerMgr->notifyPgpKeyReceived(gpgid);
FriendsChanged(true);
FriendsChanged(ssl_id,true);
}
return res;

2
libretroshare/src/rsserver/p3peers.h
View file

@ -48,7 +48,7 @@ public:
virtual ~p3Peers() {}
/* Updates ... */
virtual bool FriendsChanged(bool add);
virtual bool FriendsChanged(const RsPeerId &pid, bool add);
virtual bool OthersChanged();
/* Peer Details (Net & Auth) */