Implement sharing of megolm keys #454
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
richvdh
force-pushed
the
rav/key_share/incoming
branch
from
665ed05
to
2c54d76
Compare
src/crypto/algorithms/megolm.js
Outdated
| }; | ||
|
|
||
|
|
||
| MegolmDecryption.prototype.shareKeysWithDevice = function(keyRequest) { |
There was a problem hiding this comment.
Do these functions need documentation to explain what they are doing?
There was a problem hiding this comment.
They override the methods in the base class - see
matrix-js-sdk/src/crypto/algorithms/base.js
Line 156 in 2c54d76
ylecollen
pushed a commit
to matrix-org/matrix-android-sdk
that referenced
this pull request
Oct 25, 2017
manuroe
added a commit
to matrix-org/matrix-ios-sdk
that referenced
this pull request
Nov 7, 2017
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.
This builds on previously-landed code (specifically #449) to implement sharing of megolm keys.
When we get a request from one of our other devices we check (via the existing hook
matrix-js-sdk/src/crypto/index.js
Line 1158 in 665ed05