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 #1150 from matrix-org/dbkr/dont_error_on_unknown_devices

Browse Source 
Add an option to ignore unverified devices
This commit is contained in:
David Baker
2020-01-14 17:11:47 +00:00
committed by GitHub
parent 564b8276bf 81ab2aca37
commit 6a583d2ba6
3 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -736,7 +736,9 @@ MegolmEncryption.prototype.encryptMessage = async function(room, eventType, cont
// check if any of these devices are not yet known to the user.
// if so, warn the user so they can verify or ignore.
self._checkForUnknownDevices(devicesInRoom);
if (this._crypto.getGlobalErrorOnUnknownDevices()) {
self._checkForUnknownDevices(devicesInRoom);
}
const session = await self._ensureOutboundSession(devicesInRoom, blocked);
const payloadJson = {