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

Merge branch 'develop' into poljar/seshat-search-pagination

Browse Source
This commit is contained in:
Damir Jelić
2020-06-10 13:34:09 +02:00
parent 398655f1a9 54200519f6
commit eaca8310d3
82 changed files with 3355 additions and 1313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Searching.js
View File

@@ -481,6 +481,29 @@ async function combinedPagination(searchResult) {
searchResult.pendingRequest = null;
// Restore our encryption info so we can properly re-verify the events.
for (let i = 0; i < result.results.length; i++) {
const timeline = result.results[i].context.getTimeline();
for (let j = 0; j < timeline.length; j++) {
const ev = timeline[j];
if (ev.event.curve25519Key) {
ev.makeEncrypted(
"m.room.encrypted",
{ algorithm: ev.event.algorithm },
ev.event.curve25519Key,
ev.event.ed25519Key,
);
ev._forwardingCurve25519KeyChain = ev.event.forwardingCurve25519KeyChain;
delete ev.event.curve25519Key;
delete ev.event.ed25519Key;
delete ev.event.algorithm;
delete ev.event.forwardingCurve25519KeyChain;
}
}
}
return result;
}