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

prevent subscribing to a signed chat room without a signed identity

Browse source
This commit is contained in:
csoler 2018-01-03 15:01:04 +01:00
parent eea0c64d1c
commit 0f6006d140
3 changed files with 46 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
retroshare-gui/src/gui/ChatLobbyWidget.cpp
View file

@ -1078,8 +1078,20 @@ void ChatLobbyWidget::readChatLobbyInvites()
RsGxsId default_id ;
rsMsgs->getDefaultIdentityForChatLobby(default_id) ;
std::list<ChatLobbyId> subscribed_lobbies ;
rsMsgs->getChatLobbyList(subscribed_lobbies) ;
for(std::list<ChatLobbyInvite>::const_iterator it(invites.begin());it!=invites.end();++it)
{
// first check if the lobby is already subscribed. If so, just ignore the request.
bool found = false ;
for(auto it2(subscribed_lobbies.begin());it2!=subscribed_lobbies.end() && !found;++it2)
found = found || (*it2 == (*it).lobby_id) ;
if(found)
continue ;
QMessageBox mb(QObject::tr("Join chat room"),
tr("%1 invites you to chat room named %2").arg(QString::fromUtf8(rsPeers->getPeerName((*it).peer_id).c_str())).arg(RsHtml::plainText(it->lobby_name)),
QMessageBox::Question, QMessageBox::Yes,QMessageBox::No, 0);

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

@ -227,6 +227,7 @@ void IdEditDialog::enforceNoAnonIds()
{
ui->radioButton_GpgId->setChecked(true);
ui->radioButton_GpgId->setEnabled(false);
ui->radioButton_Pseudo->setEnabled(false);
}
void IdEditDialog::loadExistingId(uint32_t token)