Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #979 from PhenomRetroShare/Fix_LobbyAutoSubscribe

Browse Source 
Fix Lobby auto-subscribe.
This commit is contained in:
csoler 2017-08-03 21:29:52 +02:00 committed by GitHub
commit 4e02c5f262
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libretroshare/src/chat/distributedchat.cc
View File

@ -577,9 +577,12 @@ void DistributedChatService::handleRecvChatLobbyList(RsChatLobbyListItem *item)
} }
RsIdentityDetails idd ; RsIdentityDetails idd ;
if(!rsIdentity->getIdDetails(gxsId,idd))
std::cerr << "(EE) Lobby auto-subscribe: Can't get Id detail for:" << gxsId.toStdString().c_str() << std::endl;
else
{
if(IS_PGP_SIGNED_LOBBY(flags) if(IS_PGP_SIGNED_LOBBY(flags)
&& (!rsIdentity->getIdDetails(gxsId,idd) && !(idd.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED) )
|| !(idd.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED)) )
{ {
std::cerr << "(EE) Attempt to auto-subscribe to signed lobby with non signed Id. Remove it." << std::endl; std::cerr << "(EE) Attempt to auto-subscribe to signed lobby with non signed Id. Remove it." << std::endl;
setLobbyAutoSubscribe(*it, false); setLobbyAutoSubscribe(*it, false);
@ -587,6 +590,7 @@ void DistributedChatService::handleRecvChatLobbyList(RsChatLobbyListItem *item)
joinVisibleChatLobby(*it,gxsId); joinVisibleChatLobby(*it,gxsId);
} }
} }
}
for(std::list<ChatLobbyId>::const_iterator it = invitationNeeded.begin();it!=invitationNeeded.end();++it) for(std::list<ChatLobbyId>::const_iterator it = invitationNeeded.begin();it!=invitationNeeded.end();++it)
invitePeerToLobby(*it,item->PeerId(),false) ; invitePeerToLobby(*it,item->PeerId(),false) ;