Browse Source

fix(chathistory): file transfers sometimes show wrong author name

reviewable/pr6154/r1
bodwok 5 years ago
parent
commit
1bc97ef219
No known key found for this signature in database
GPG Key ID: A279D059178DA7BA
  1. 5
      src/model/chathistory.cpp

5
src/model/chathistory.cpp

@ -215,13 +215,16 @@ void ChatHistory::onFileUpdated(const ToxPk& sender, const ToxFile& file)
if (canUseHistory()) { if (canUseHistory()) {
switch (file.status) { switch (file.status) {
case ToxFile::INITIALIZING: { 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 // 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 // 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 // initializing. If this is changed in the session chat log we'll end up
// with a different order when loading from history // with a different order when loading from history
history->addNewFileMessage(f.getPublicKey(), file.resumeFileId, file.fileName, history->addNewFileMessage(f.getPublicKey(), file.resumeFileId, file.fileName,
file.filePath, file.filesize, sender, file.filePath, file.filesize, sender,
QDateTime::currentDateTime(), f.getDisplayedName()); QDateTime::currentDateTime(), username);
break; break;
} }
case ToxFile::CANCELED: case ToxFile::CANCELED:

Loading…
Cancel
Save