From d5e1475a5c9d9701d191456a577083a650941f92 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Thu, 23 Apr 2020 02:29:41 +0200
Subject: [PATCH] Fix encrypted messages not showing a user in the sidebar
---
CHANGELOG.md | 1 +
src/Utils.cpp | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdd4363c4..779d5df66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
- Fix crash when trying to maximize image, that wasn't downloaded yet.
- Fix Binding restorMode flooding logs on Qt 5.14.2+
- Fix with some qml styles hidden menu items leave empty space
+- Fix encrypted messages not showing a user in the sidebar
## [0.7.0] -- 2020-04-19
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 33b758940..464724014 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -179,8 +179,9 @@ utils::getMessageDescription(const TimelineEvent &event,
const auto ts = QDateTime::fromMSecsSinceEpoch(msg->origin_server_ts);
DescInfo info;
- info.userid = sender;
- info.body = QString(" %1").arg(messageDescription<Encrypted>());
+ info.userid = sender;
+ info.body = QString(" %1").arg(
+ messageDescription<Encrypted>(username, "", sender == localUser));
info.timestamp = utils::descriptiveTime(ts);
info.event_id = QString::fromStdString(msg->event_id);
info.datetime = ts;
--
GitLab