matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-01 04:43:29 +03:00
Code Activity

Merge pull request #347 from matrix-org/rav/rewrite_device_query_logic

Browse Source 
Rewrite the device key query logic
This commit is contained in:
Richard van der Hoff
2017-02-03 12:49:11 +00:00
committed by GitHub
parent 8441589ce6 7e82ac3620
commit eaa95fb1e5
3 changed files with 111 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/crypto/index.js
View File

@@ -740,7 +740,7 @@ Crypto.prototype._onInitialSyncCompleted = function(rooms) {
this._initialSyncCompleted = true;
// catch up on any m.new_device events which arrived during the initial sync.
this._deviceList.flushNewDeviceRequests();
this._deviceList.refreshOutdatedDeviceLists().done();
if (this._sessionStore.getDeviceAnnounced()) {
return;
@@ -877,7 +877,7 @@ Crypto.prototype._onNewDeviceEvent = function(event) {
// we delay handling these until the intialsync has completed, so that we
// can do all of them together.
if (this._initialSyncCompleted) {
this._deviceList.flushNewDeviceRequests();
this._deviceList.refreshOutdatedDeviceLists().done();
}
};