-
-
Notifications
You must be signed in to change notification settings - Fork 585
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Invalidate device lists when encryption is enabled in a room #359
Changes from all commits
a73f898
1c1ba58
bf22750
bd07310
0baea5c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -351,7 +351,6 @@ describe("MatrixClient", function() { | |
|
||
httpBackend.when("POST", "/keys/query").check(function(req) { | ||
expect(req.data).toEqual({device_keys: { | ||
'@alice:localhost': {}, | ||
'boris': {}, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i'm a little surprised that we no longer see our own key here... There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. or rather, our own userId. so... the reason for this is, as per the comment on bd07310, we no longer automatically queue up our own userId as needing a refresh - instead it happens once the initialsync happens. In this test, there is no initialsync, so our own userid isn't invalidated. |
||
'chaz': {}, | ||
}}); | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -64,7 +64,7 @@ OlmEncryption.prototype._ensureSession = function(roomMembers) { | |
} | ||
|
||
const self = this; | ||
this._prepPromise = self._crypto.downloadKeys(roomMembers, true).then(function(res) { | ||
this._prepPromise = self._crypto.downloadKeys(roomMembers).then(function(res) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. is this for the old There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yup. that's why it hasn't been a problem in practice. |
||
return self._crypto.ensureOlmSessionsForUsers(roomMembers); | ||
}).then(function() { | ||
self._sessionPrepared = true; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should I be surprised that the alg here is olm and not megolm, given it's for a room?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Per
matrix-js-sdk/spec/integ/matrix-client-crypto.spec.js
Line 21 in 0baea5c