From 278eccc04086f3033c71a753f0fc0ab35a3cbb66 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sat, 7 Jul 2018 23:59:23 +0300 Subject: Add context menu action to request encryption keys --- src/Cache.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/Cache.cc') diff --git a/src/Cache.cc b/src/Cache.cc index a276f554..1c3fa3dd 100644 --- a/src/Cache.cc +++ b/src/Cache.cc @@ -987,12 +987,11 @@ Cache::getTimelineMessages(lmdb::txn &txn, const std::string &room_id) if (obj.count("event") == 0 || obj.count("token") == 0) continue; - mtx::events::collections::TimelineEvents event; - mtx::events::collections::from_json(obj.at("event"), event); + mtx::events::collections::TimelineEvent event = obj.at("event"); index += 1; - timeline.events.push_back(event); + timeline.events.push_back(event.data); timeline.prev_batch = obj.at("token").get(); } cursor.close(); @@ -1059,12 +1058,11 @@ Cache::getLastMessageInfo(lmdb::txn &txn, const std::string &room_id) if (obj.count("event") == 0) continue; - mtx::events::collections::TimelineEvents event; - mtx::events::collections::from_json(obj.at("event"), event); + mtx::events::collections::TimelineEvent event = obj.at("event"); cursor.close(); return utils::getMessageDescription( - event, local_user, QString::fromStdString(room_id)); + event.data, local_user, QString::fromStdString(room_id)); } cursor.close(); -- cgit 1.5.1