1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-28 05:03:59 +03:00
This commit is contained in:
Hubert Chathi
2020-06-15 17:53:37 -04:00
parent bc97e7a5ea
commit fd126b8563
2 changed files with 8 additions and 2 deletions

View File

@@ -1978,7 +1978,11 @@ MatrixClient.prototype._restoreKeyBackup = function(
} }
} }
return this.importRoomKeys(keys, { progressCallback, untrusted: true, source: "backup" }); return this.importRoomKeys(keys, {
progressCallback,
untrusted: true,
source: "backup",
});
}).then(() => { }).then(() => {
return this._crypto.setTrustedBackupPubKey(backupPubKey); return this._crypto.setTrustedBackupPubKey(backupPubKey);
}).then(() => { }).then(() => {

View File

@@ -1549,7 +1549,9 @@ MegolmDecryption.prototype._buildKeyForwardingMessage = async function(
* @inheritdoc * @inheritdoc
* *
* @param {module:crypto/OlmDevice.MegolmSessionData} session * @param {module:crypto/OlmDevice.MegolmSessionData} session
* @param {string} source where the key comes from * @param {object} opts options for the import
* @param {boolean} opts.untrusted whether the key should be considered as untrusted
* @param {string} opts.source where the key came from
*/ */
MegolmDecryption.prototype.importRoomKey = function(session, opts) { MegolmDecryption.prototype.importRoomKey = function(session, opts) {
opts = opts || {}; opts = opts || {};