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

fixed bug causing wrong "from" field in sent messages

Browse source
This commit is contained in:
csoler 2022-12-03 15:59:05 +01:00
parent 6327ccf6ae
commit 8185dba0d8
1 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

32
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View file

@ -1370,6 +1370,23 @@ bool MessageComposer::buildMessage(MessageInfo& mi)
{ {
// add a GXS signer/from in case the message is to be sent to a distant peer // add a GXS signer/from in case the message is to be sent to a distant peer
bool at_least_one_gxsid = false;
for(auto m:mi.destinations)
if(m.type() == MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
{
at_least_one_gxsid=true;
break;
}
if(!at_least_one_gxsid)
mi.from = Rs::Msgs::MsgAddress(rsPeers->getOwnId(),MsgAddress::MSG_ADDRESS_MODE_TO);
else if(mi.from.type() != MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
{
QMessageBox::warning(this, tr("RetroShare"), tr("Please create an identity to sign distant messages, or remove the distant peers from the destination list."), QMessageBox::Ok);
return false; // Don't send if cannot sign.
}
else
mi.from = MsgAddress(RsGxsId(ui.respond_to_CB->itemData(ui.respond_to_CB->currentIndex()).toString().toStdString()),MsgAddress::MSG_ADDRESS_MODE_TO) ; mi.from = MsgAddress(RsGxsId(ui.respond_to_CB->itemData(ui.respond_to_CB->currentIndex()).toString().toStdString()),MsgAddress::MSG_ADDRESS_MODE_TO) ;
//std::cerr << "MessageSend: setting 'from' field to GXS id = " << mi.rsgxsid_srcId << std::endl; //std::cerr << "MessageSend: setting 'from' field to GXS id = " << mi.rsgxsid_srcId << std::endl;
@ -1526,22 +1543,9 @@ bool MessageComposer::sendMessage_internal(bool bDraftbox)
return false; // Don't send with no recipient return false; // Don't send with no recipient
} }
bool at_least_one_gxsid = false;
for(auto m:mi.destinations)
if(m.type() == MsgAddress::MSG_ADDRESS_TYPE_RSGXSID)
{
at_least_one_gxsid=true;
break;
}
if(at_least_one_gxsid && mi.from.type() != MsgAddress::MSG_ADDRESS_TYPE_RSGXSID) if (rsMail->MessageSend(mi) == false)
{
QMessageBox::warning(this, tr("RetroShare"), tr("Please create an identity to sign distant messages, or remove the distant peers from the destination list."), QMessageBox::Ok);
return false; // Don't send if cannot sign.
}
if (rsMail->MessageSend(mi) == false) {
return false; return false;
}
if (m_msgParentId.empty() == false) { if (m_msgParentId.empty() == false) {
switch (m_msgType) { switch (m_msgType) {