matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

Searching: Restore the encryption state for the paginated results.

Browse Source
This commit is contained in:
Damir Jelić
2020-06-10 15:41:55 +02:00
parent 0e1e949c49
commit a0934329fe
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Searching.js
View File

@@ -133,6 +133,9 @@ async function combinedSearch(searchTerm) {
const result = client._processRoomEventsSearch(emptyResult, response); const result = client._processRoomEventsSearch(emptyResult, response);
// Restore our encryption info so we can properly re-verify the events.
restoreEncryptionInfo(result.results);
return result; return result;
} }
@@ -197,6 +200,10 @@ async function localPagination(searchResult) {
const localResult = await eventIndex.search(searchArgs); const localResult = await eventIndex.search(searchArgs);
searchResult.seshatQuery.next_batch = localResult.next_batch; searchResult.seshatQuery.next_batch = localResult.next_batch;
// We only need to restore the encryption state for the new results, so
// remember how many of them we got.
const newResultCount = localResult.results.length;
const response = { const response = {
search_categories: { search_categories: {
room_events: localResult, room_events: localResult,
@@ -204,6 +211,11 @@ async function localPagination(searchResult) {
}; };
const result = MatrixClientPeg.get()._processRoomEventsSearch(searchResult, response); const result = MatrixClientPeg.get()._processRoomEventsSearch(searchResult, response);
// Restore our encryption info so we can properly re-verify the events.
const newSlice = result.results.slice(Math.max(result.results.length - newResultCount, 0));
restoreEncryptionInfo(newSlice);
searchResult.pendingRequest = null; searchResult.pendingRequest = null;
return result; return result;
@@ -505,12 +517,17 @@ async function combinedPagination(searchResult) {
}, },
}; };
const oldResultCount = searchResult.results.length;
// Let the client process the combined result. // Let the client process the combined result.
const result = client._processRoomEventsSearch(searchResult, response); const result = client._processRoomEventsSearch(searchResult, response);
searchResult.pendingRequest = null;
// Restore our encryption info so we can properly re-verify the events. // Restore our encryption info so we can properly re-verify the events.
const newResultCount = result.results.length - oldResultCount;
const newSlice = result.results.slice(Math.max(result.results.length - newResultCount, 0));
restoreEncryptionInfo(newSlice);
searchResult.pendingRequest = null;
return result; return result;
} }