ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix notifications for encrypted events

Browse Source 
BUG: 459935
This commit is contained in:
Tobias Fella
2022-10-23 22:11:35 +02:00
parent 510c6d4a90
commit 813a8003c6
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/controller.cpp
View File

@@ -174,6 +174,16 @@ void Controller::handleNotifications()
// The room might have been deleted (for example rejected invitation). // The room might have been deleted (for example rejected invitation).
auto sender = room->user(notification["event"].toObject()["sender"].toString()); auto sender = room->user(notification["event"].toObject()["sender"].toString());
auto body = notification["event"].toObject()["content"].toObject()["body"].toString();
if (notification["event"]["type"] == "m.room.encrypted") {
auto decrypted = m_connection->decryptNotification(notification);
body = decrypted["content"].toObject()["body"].toString();
if (body.isEmpty()) {
body = i18n("Encrypted Message");
}
}
QImage avatar_image; QImage avatar_image;
if (!sender->avatarUrl(room).isEmpty()) { if (!sender->avatarUrl(room).isEmpty()) {
avatar_image = sender->avatar(128, room); avatar_image = sender->avatar(128, room);
@@ -182,7 +192,7 @@ void Controller::handleNotifications()
} }
NotificationsManager::instance().postNotification(dynamic_cast<NeoChatRoom *>(room), NotificationsManager::instance().postNotification(dynamic_cast<NeoChatRoom *>(room),
sender->displayname(room), sender->displayname(room),
notification["event"].toObject()["content"].toObject()["body"].toString(), body,
avatar_image, avatar_image,
notification["event"].toObject()["event_id"].toString(), notification["event"].toObject()["event_id"].toString(),
true); true);