matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-28 05:03:59 +03:00
Code Activity

Merge pull request #1367 from matrix-org/dbkr/increase_olm_second_phase_timeout

Browse Source 
Increase timeout for 2nd phase of Olm session creation
This commit is contained in:
David Baker
2020-05-01 18:32:25 +01:00
committed by GitHub
parent a5c13041c6 3c9dfc195e
commit cb7e1a9d82
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/crypto/algorithms/megolm.js
View File

@@ -311,7 +311,7 @@ MegolmEncryption.prototype._ensureOutboundSession = async function(
} }
await this._shareKeyWithDevices( await this._shareKeyWithDevices(
session, key, payload, retryDevices, failedDevices, session, key, payload, retryDevices, failedDevices, 30000,
); );
await this._notifyFailedOlmDevices(session, key, failedDevices); await this._notifyFailedOlmDevices(session, key, failedDevices);