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

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

@ -577,14 +577,18 @@ void DistributedChatService::handleRecvChatLobbyList(RsChatLobbyListItem *item)
} }
RsIdentityDetails idd ; RsIdentityDetails idd ;
if(IS_PGP_SIGNED_LOBBY(flags) if(!rsIdentity->getIdDetails(gxsId,idd))
&& (!rsIdentity->getIdDetails(gxsId,idd) std::cerr << "(EE) Lobby auto-subscribe: Can't get Id detail for:" << gxsId.toStdString().c_str() << std::endl;
|| !(idd.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED)) ) else
{ {
std::cerr << "(EE) Attempt to auto-subscribe to signed lobby with non signed Id. Remove it." << std::endl; if(IS_PGP_SIGNED_LOBBY(flags)
setLobbyAutoSubscribe(*it, false); && !(idd.mFlags & RS_IDENTITY_FLAGS_PGP_LINKED) )
} else { {
joinVisibleChatLobby(*it,gxsId); std::cerr << "(EE) Attempt to auto-subscribe to signed lobby with non signed Id. Remove it." << std::endl;
setLobbyAutoSubscribe(*it, false);
} else {
joinVisibleChatLobby(*it,gxsId);
}
} }
} }