From a4c280a4f927df7de5445d19419fa77f2b603f27 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Tue, 21 Apr 2020 21:42:17 -0400 Subject: Add ability to toggle sidebar messages for encrypted rooms --- src/timeline/TimelineModel.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/timeline/TimelineModel.cpp') 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 #include #include +#include #include #include "ChatPage.h" @@ -504,11 +505,15 @@ isMessage(const mtx::events::Event &) 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>( &event)) { - event = decryptEvent(*e).event; + if (decrypt) { + event = decryptEvent(*e).event; + } } if (!std::visit([](const auto &e) -> bool { return isMessage(e); }, event)) -- cgit 1.5.1 From b298f01d92eac2f7af6fce28cbe5256411e6c386 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Wed, 22 Apr 2020 19:52:30 -0400 Subject: Add signal/slot for decryption changes in last patch --- src/ChatPage.h | 1 + src/MainWindow.cpp | 4 ++++ src/Olm.cpp | 2 +- src/UserSettingsPage.cpp | 1 + src/UserSettingsPage.h | 1 + src/timeline/TimelineModel.cpp | 7 +++++++ src/timeline/TimelineModel.h | 2 +- src/timeline/TimelineViewManager.cpp | 17 +++++++++++++++++ src/timeline/TimelineViewManager.h | 1 + 9 files changed, 34 insertions(+), 2 deletions(-) (limited to 'src/timeline/TimelineModel.cpp') diff --git a/src/ChatPage.h b/src/ChatPage.h index 5182ab99..46630692 100644 --- a/src/ChatPage.h +++ b/src/ChatPage.h @@ -153,6 +153,7 @@ signals: void updateGroupsInfo(const mtx::responses::JoinedGroups &groups); void themeChanged(); + void decryptSidebarChanged(); private slots: void showUnreadMessageNotification(int count); diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index fb64f0fe..c6abdca2 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -117,6 +117,10 @@ MainWindow::MainWindow(QWidget *parent) userSettingsPage_, SIGNAL(trayOptionChanged(bool)), trayIcon_, SLOT(setVisible(bool))); connect( userSettingsPage_, &UserSettingsPage::themeChanged, chat_page_, &ChatPage::themeChanged); + connect(userSettingsPage_, + &UserSettingsPage::decryptSidebarChanged, + chat_page_, + &ChatPage::decryptSidebarChanged); connect(trayIcon_, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, diff --git a/src/Olm.cpp b/src/Olm.cpp index 78b16be7..c8e4c13c 100644 --- a/src/Olm.cpp +++ b/src/Olm.cpp @@ -184,7 +184,7 @@ encrypt_group_message(const std::string &room_id, const std::string &device_id, data.relates_to = relation; auto message_index = olm_outbound_group_session_message_index(res.session); - nhlog::crypto()->info("next message_index {}", message_index); + nhlog::crypto()->debug("next message_index {}", message_index); // We need to re-pickle the session after we send a message to save the new message_index. cache::updateOutboundMegolmSession(room_id, message_index); diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index 537054c7..4db883f5 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -432,6 +432,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer settings, QWidge connect(decryptSidebar_, &Toggle::toggled, this, [this](bool isDisabled) { settings_->setDecryptSidebar(!isDisabled); + emit decryptSidebarChanged(); }); connect(avatarCircles_, &Toggle::toggled, this, [this](bool isDisabled) { diff --git a/src/UserSettingsPage.h b/src/UserSettingsPage.h index aff2525a..6b9834ea 100644 --- a/src/UserSettingsPage.h +++ b/src/UserSettingsPage.h @@ -183,6 +183,7 @@ signals: void moveBack(); void trayOptionChanged(bool value); void themeChanged(); + void decryptSidebarChanged(); private slots: void importSessionKeys(); diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 439a7786..3e2c32fa 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -502,6 +502,13 @@ isMessage(const mtx::events::Event &) return false; } +template +auto +isMessage(const mtx::events::EncryptedEvent &) +{ + return true; +} + void TimelineModel::updateLastMessage() { diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index 84e9ec26..98b183f6 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -189,6 +189,7 @@ public: Q_INVOKABLE void cacheMedia(QString eventId); Q_INVOKABLE bool saveMedia(QString eventId) const; + void updateLastMessage(); void addEvents(const mtx::responses::Timeline &events); template void sendMessage(const T &msg); @@ -257,7 +258,6 @@ private: const std::string &user_id, const mtx::responses::ClaimKeys &res, mtx::http::RequestErr err); - void updateLastMessage(); void readEvent(const std::string &id); QHash events; diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp index 0a339825..4562dd67 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp @@ -16,6 +16,19 @@ Q_DECLARE_METATYPE(mtx::events::collections::TimelineEvents) +void +TimelineViewManager::updateEncryptedDescriptions() +{ + QHash>::iterator i; + for (i = models.begin(); i != models.end(); ++i) { + auto ptr = i.value(); + + if (!ptr.isNull()) { + ptr->updateLastMessage(); + } + } +} + void TimelineViewManager::updateColorPalette() { @@ -83,6 +96,10 @@ TimelineViewManager::TimelineViewManager(QSharedPointer userSettin &ChatPage::themeChanged, this, &TimelineViewManager::updateColorPalette); + connect(dynamic_cast(parent), + &ChatPage::decryptSidebarChanged, + this, + &TimelineViewManager::updateEncryptedDescriptions); } void diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h index 122e4aec..45a603af 100644 --- a/src/timeline/TimelineViewManager.h +++ b/src/timeline/TimelineViewManager.h @@ -84,6 +84,7 @@ public slots: const QString &url, const QString &mime, uint64_t dsize); + void updateEncryptedDescriptions(); private: #ifdef USE_QUICK_VIEW -- cgit 1.5.1 From b00e624fb0a988d69175c0126f98c96a00b9244f Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Thu, 23 Apr 2020 15:28:46 +0200 Subject: Fix own messages not showing as encrypted --- src/timeline/TimelineModel.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/timeline/TimelineModel.cpp') diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 3e2c32fa..ff1f324e 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -477,14 +477,14 @@ TimelineModel::addEvents(const mtx::responses::Timeline &timeline) std::vector ids = internalAddEvents(timeline.events); - if (ids.empty()) - return; - - beginInsertRows(QModelIndex(), 0, static_cast(ids.size() - 1)); - this->eventOrder.insert(this->eventOrder.begin(), ids.rbegin(), ids.rend()); - endInsertRows(); + if (!ids.empty()) { + beginInsertRows(QModelIndex(), 0, static_cast(ids.size() - 1)); + this->eventOrder.insert(this->eventOrder.begin(), ids.rbegin(), ids.rend()); + endInsertRows(); + } - updateLastMessage(); + if (!timeline.events.empty()) + updateLastMessage(); } template -- cgit 1.5.1 From 994edb836c0e812933cabf5e0b57f2f8aaaba9a7 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Thu, 23 Apr 2020 19:05:44 -0400 Subject: Change how decrypt value is retrieved from settings --- .gitignore | 4 +++- src/timeline/TimelineModel.cpp | 6 ++++++ src/timeline/TimelineModel.h | 3 ++- src/timeline/TimelineViewManager.cpp | 3 ++- 4 files changed, 13 insertions(+), 3 deletions(-) (limited to 'src/timeline/TimelineModel.cpp') diff --git a/.gitignore b/.gitignore index 6d178679..5f6725db 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ cscope* /.ccls-cache /.exrc .gdb_history +.hunter # GTAGS GTAGS @@ -70,7 +71,8 @@ install_manifest.txt .LSOverride # Icon must end with two \r -Icon +Icon + # Thumbnails ._* diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index ff1f324e..75819532 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -514,6 +514,12 @@ TimelineModel::updateLastMessage() { // Get the user setting to show decrypted messages in side bar bool decrypt = QSettings().value("user/decrypt_sidebar", true).toBool(); + updateLastMessage(decrypt); +} + +void +TimelineModel::updateLastMessage(bool decrypt) +{ for (auto it = eventOrder.begin(); it != eventOrder.end(); ++it) { auto event = events.value(*it); if (auto e = std::get_if>( diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index 98b183f6..135b31ff 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -189,7 +189,7 @@ public: Q_INVOKABLE void cacheMedia(QString eventId); Q_INVOKABLE bool saveMedia(QString eventId) const; - void updateLastMessage(); + void updateLastMessage(bool); void addEvents(const mtx::responses::Timeline &events); template void sendMessage(const T &msg); @@ -259,6 +259,7 @@ private: const mtx::responses::ClaimKeys &res, mtx::http::RequestErr err); void readEvent(const std::string &id); + void updateLastMessage(); QHash events; QSet read; diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp index 4562dd67..3c870e36 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp @@ -19,12 +19,13 @@ Q_DECLARE_METATYPE(mtx::events::collections::TimelineEvents) void TimelineViewManager::updateEncryptedDescriptions() { + auto decrypt = settings->isDecryptSidebarEnabled(); QHash>::iterator i; for (i = models.begin(); i != models.end(); ++i) { auto ptr = i.value(); if (!ptr.isNull()) { - ptr->updateLastMessage(); + ptr->updateLastMessage(decrypt); } } } -- cgit 1.5.1 From 58933654391c699951b322a153bcc3a85bf40552 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Thu, 23 Apr 2020 19:21:20 -0400 Subject: Change decrypt setting again --- src/timeline/TimelineModel.cpp | 10 +--------- src/timeline/TimelineModel.h | 5 +++-- src/timeline/TimelineViewManager.cpp | 5 ++++- 3 files changed, 8 insertions(+), 12 deletions(-) (limited to 'src/timeline/TimelineModel.cpp') diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 75819532..e3a1a781 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -511,20 +511,12 @@ isMessage(const mtx::events::EncryptedEvent &) void TimelineModel::updateLastMessage() -{ - // Get the user setting to show decrypted messages in side bar - bool decrypt = QSettings().value("user/decrypt_sidebar", true).toBool(); - updateLastMessage(decrypt); -} - -void -TimelineModel::updateLastMessage(bool decrypt) { for (auto it = eventOrder.begin(); it != eventOrder.end(); ++it) { auto event = events.value(*it); if (auto e = std::get_if>( &event)) { - if (decrypt) { + if (decryptDescription) { event = decryptEvent(*e).event; } } diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index 135b31ff..ae468c09 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -189,7 +189,7 @@ public: Q_INVOKABLE void cacheMedia(QString eventId); Q_INVOKABLE bool saveMedia(QString eventId) const; - void updateLastMessage(bool); + void updateLastMessage(); void addEvents(const mtx::responses::Timeline &events); template void sendMessage(const T &msg); @@ -224,6 +224,7 @@ public slots: emit replyChanged(reply_); } } + void setDecryptDescription(bool decrypt) { decryptDescription = decrypt; } private slots: // Add old events at the top of the timeline. @@ -259,7 +260,6 @@ private: const mtx::responses::ClaimKeys &res, mtx::http::RequestErr err); void readEvent(const std::string &id); - void updateLastMessage(); QHash events; QSet read; @@ -271,6 +271,7 @@ private: bool isInitialSync = true; bool paginationInProgress = false; + bool decryptDescription = true; QString currentId; QString reply_; diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp index 3c870e36..b9565be8 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp @@ -25,7 +25,8 @@ TimelineViewManager::updateEncryptedDescriptions() auto ptr = i.value(); if (!ptr.isNull()) { - ptr->updateLastMessage(decrypt); + ptr->setDecryptDescription(decrypt); + ptr->updateLastMessage(); } } } @@ -132,6 +133,8 @@ TimelineViewManager::addRoom(const QString &room_id) { if (!models.contains(room_id)) { QSharedPointer newRoom(new TimelineModel(this, room_id)); + newRoom->setDecryptDescription(settings->isDecryptSidebarEnabled()); + connect(newRoom.data(), &TimelineModel::newEncryptedImage, imgProvider, -- cgit 1.5.1