summary refs log tree commit diff
path: root/src/timeline/TimelineModel.cpp
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2020-04-21 21:42:17 -0400
committerJoseph Donofry <joedonofry@gmail.com>2020-04-21 22:40:58 -0400
commita4c280a4f927df7de5445d19419fa77f2b603f27 (patch)
tree72da9b3f2ef9187086eab233c45419efa58f17e6 /src/timeline/TimelineModel.cpp
parentAdd menu entry to show decrypted source (diff)
downloadnheko-a4c280a4f927df7de5445d19419fa77f2b603f27.tar.xz
Add ability to toggle sidebar messages for encrypted rooms
Diffstat (limited to 'src/timeline/TimelineModel.cpp')
-rw-r--r--src/timeline/TimelineModel.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp

index bb793945..439a7786 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp
@@ -8,6 +8,7 @@ #include <QFileDialog> #include <QMimeDatabase> #include <QRegularExpression> +#include <QSettings> #include <QStandardPaths> #include "ChatPage.h" @@ -504,11 +505,15 @@ isMessage(const mtx::events::Event<T> &) void TimelineModel::updateLastMessage() { + // Get the user setting to show decrypted messages in side bar + bool decrypt = QSettings().value("user/decrypt_sidebar", true).toBool(); for (auto it = eventOrder.begin(); it != eventOrder.end(); ++it) { auto event = events.value(*it); if (auto e = std::get_if<mtx::events::EncryptedEvent<mtx::events::msg::Encrypted>>( &event)) { - event = decryptEvent(*e).event; + if (decrypt) { + event = decryptEvent(*e).event; + } } if (!std::visit([](const auto &e) -> bool { return isMessage(e); }, event))