StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6154

Browse Source 
bodwok (1):
      fix(chathistory): file transfers sometimes show wrong author name
This commit is contained in:
Anthony Bilinski 2020-05-25 00:54:16 -07:00
commit c73cedf2a0
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/model/chathistory.cpp
View File

@ -215,13 +215,16 @@ void ChatHistory::onFileUpdated(const ToxPk& sender, const ToxFile& file)
if (canUseHistory()) {
switch (file.status) {
case ToxFile::INITIALIZING: {
auto selfPk = coreIdHandler.getSelfPublicKey();
QString username(selfPk == sender ? coreIdHandler.getUsername() : f.getDisplayedName());
// Note: There is some implcit coupling between history and the current
// chat log. Both rely on generating a new id based on the state of
// initializing. If this is changed in the session chat log we'll end up
// with a different order when loading from history
history->addNewFileMessage(f.getPublicKey(), file.resumeFileId, file.fileName,
file.filePath, file.filesize, sender,
QDateTime::currentDateTime(), f.getDisplayedName());
QDateTime::currentDateTime(), username);
break;
}
case ToxFile::CANCELED: