From 5fbf17f6ec6a0a31fbb6ee874c56db507b02ffe9 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 27 Jan 2021 20:29:06 +0100 Subject: Fix request key loops --- src/timeline/EventStore.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/timeline/EventStore.cpp') diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp index b16bf1d2..4748f9c0 100644 --- a/src/timeline/EventStore.cpp +++ b/src/timeline/EventStore.cpp @@ -242,7 +242,9 @@ EventStore::receivedSessionKey(const std::string &session_id) return; auto request = pending_key_requests.at(session_id); - pending_key_requests.erase(session_id); + + // Don't request keys again until Nheko is restarted (for now) + pending_key_requests[session_id].events.clear(); olm::send_key_request_for(request.events.front(), request.request_id, true); @@ -778,7 +780,8 @@ EventStore::fetchMore() if (cache::client()->previousBatchToken(room_id_) != opts.from) { nhlog::net()->warn("Cache cleared while fetching more messages, dropping " "/messages response"); - emit fetchedMore(); + if (!opts.to.empty()) + emit fetchedMore(); return; } if (err) { -- cgit 1.5.1 From 50564985ccfd686dde6f74050c1c3890246bd141 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 27 Jan 2021 21:30:06 +0100 Subject: Fix crash, when keys for no events were requested --- src/timeline/EventStore.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/timeline/EventStore.cpp') diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp index 4748f9c0..be4bc09e 100644 --- a/src/timeline/EventStore.cpp +++ b/src/timeline/EventStore.cpp @@ -246,7 +246,8 @@ EventStore::receivedSessionKey(const std::string &session_id) // Don't request keys again until Nheko is restarted (for now) pending_key_requests[session_id].events.clear(); - olm::send_key_request_for(request.events.front(), request.request_id, true); + if (!request.events.empty()) + olm::send_key_request_for(request.events.front(), request.request_id, true); for (const auto &e : request.events) { auto idx = idToIndex(e.event_id); -- cgit 1.5.1