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

Merge remote-tracking branch 'g1o/silent_initiate_distant_chat_api' into qml_app_chat_aesthetic

Browse source
This commit is contained in:
Angela Mazzurco 2017-06-08 14:30:18 +02:00
commit 6f718bb6f4
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libresapi/src/api/ChatHandler.cpp
View file

@ -414,16 +414,18 @@ void ChatHandler::tick()
} }
} }
else if(msg.chat_id.isDistantChatId()) else if(msg.chat_id.isDistantChatId())
{ {
RsIdentityDetails details; RsIdentityDetails details;
DistantChatPeerInfo dcpinfo ; DistantChatPeerInfo dcpinfo;
if(!gxs_id_failed && rsMsgs->getDistantChatStatus(msg.chat_id.toDistantChatId(),dcpinfo) if( !gxs_id_failed &&
&& mRsIdentity->getIdDetails(msg.incoming? dcpinfo.to_id: dcpinfo.own_id, details)) rsMsgs->getDistantChatStatus(
{ msg.chat_id.toDistantChatId(), dcpinfo ) &&
info.remote_author_id = details.mId.toStdString(); mRsIdentity->getIdDetails(dcpinfo.to_id, details) )
info.remote_author_name = details.mNickname; {
} info.remote_author_id = details.mId.toStdString();
info.remote_author_name = details.mNickname;
}
else else
{ {
gxs_id_failed = true; gxs_id_failed = true;