Create lazy in-memory room encryptors #1570
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Anderas
requested review from
a team and
pixlwave
and removed request for
a team
Codecov Report
@@ Coverage Diff @@
## develop #1570 +/- ##
===========================================
+ Coverage 12.46% 12.48% +0.02%
===========================================
Files 521 521
Lines 85025 85051 +26
Branches 36203 36217 +14
===========================================
+ Hits 10598 10622 +24
- Misses 74041 74043 +2
Partials 386 386
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
|
Confirmed that failing integration tests pass locally |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The existing
[MXCrypto getRoomEncryptor]method is used by a variety of codepaths, incl. re-sharing room keys etc. It returns a cached / in-memory value ofMXMegolmEncryptor, but only if it was previously set to memory, typically byensureEncryptionInRoommethod (which performs a bunch of other actions). This method is typically called when a user starts typing in a given room.When a user launches the app the
roomEncryptorsdictionary will be empty for all rooms, and encryptors will only be created if a user types a message in that room, or some message arrives to this device. It is not however created when the user receives am.room_key_requestfor this room, and thus silently fails in re-sharing a given key, leaving the requester with UISIs.To solve this, this PR ensures that
getRoomEncryptorcan instantiate an in-memory encryptor if it does not exist already, rather than waiting onensureEncryptionInRoomto be called. That way we always return an encryptor when needed, and the client will respond to key requests even after fresh app start