index : matrix-js-sdk

My fork of matrix-js-sdk

diff options
context:
space:
mode:
authorHubert Chathi <[email protected]>2020-06-15 17:53:37 -0400
committerHubert Chathi <[email protected]>2020-06-15 17:53:37 -0400
commitfd126b8563cd85878cda458fa8fe0507dc29d942 (patch)
tree23df3e91963d7249080928a2323210ad9ebfc929
parentbc97e7a5ea3011fcd2c60b273dfa679498dcd0d9 (diff)
downloadmatrix-js-sdk-fd126b8563cd85878cda458fa8fe0507dc29d942.tar.gz
lint
-rw-r--r--src/client.js6
-rw-r--r--src/crypto/algorithms/megolm.js4
2 files changed, 8 insertions, 2 deletions
diff --git a/src/client.js b/src/client.js
index 5b716c28..1cbfff94 100644
--- a/src/client.js
+++ b/src/client.js
@@ -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(() => {
return this._crypto.setTrustedBackupPubKey(backupPubKey);
}).then(() => {
diff --git a/src/crypto/algorithms/megolm.js b/src/crypto/algorithms/megolm.js
index b247299d..b8d0572d 100644
--- a/src/crypto/algorithms/megolm.js
+++ b/src/crypto/algorithms/megolm.js
@@ -1549,7 +1549,9 @@ MegolmDecryption.prototype._buildKeyForwardingMessage = async function(
* @inheritdoc
*
* @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) {
opts = opts || {};