matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-05 17:02:07 +03:00
Code Activity

Document verification methods accepts cross-signing key ID as well

Browse Source
This commit is contained in:
J. Ryan Stinnett
2019-12-09 17:20:10 +00:00
parent 2a2a40af7a
commit 4a3ce640d7
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/client.js
View File

@@ -777,7 +777,8 @@ MatrixClient.prototype.getStoredDevice = async function(userId, deviceId) {
* Mark the given device as verified * Mark the given device as verified
* *
* @param {string} userId owner of the device * @param {string} userId owner of the device
* @param {string} deviceId unique identifier for the device * @param {string} deviceId unique identifier for the device or user's
* cross-signing public key ID.
* *
* @param {boolean=} verified whether to mark the device as verified. defaults * @param {boolean=} verified whether to mark the device as verified. defaults
* to 'true'. * to 'true'.
@@ -805,7 +806,8 @@ MatrixClient.prototype.setDeviceVerified = function(userId, deviceId, verified)
* Mark the given device as blocked/unblocked * Mark the given device as blocked/unblocked
* *
* @param {string} userId owner of the device * @param {string} userId owner of the device
* @param {string} deviceId unique identifier for the device * @param {string} deviceId unique identifier for the device or user's
* cross-signing public key ID.
* *
* @param {boolean=} blocked whether to mark the device as blocked. defaults * @param {boolean=} blocked whether to mark the device as blocked. defaults
* to 'true'. * to 'true'.
@@ -825,7 +827,8 @@ MatrixClient.prototype.setDeviceBlocked = function(userId, deviceId, blocked) {
* Mark the given device as known/unknown * Mark the given device as known/unknown
* *
* @param {string} userId owner of the device * @param {string} userId owner of the device
* @param {string} deviceId unique identifier for the device * @param {string} deviceId unique identifier for the device or user's
* cross-signing public key ID.
* *
* @param {boolean=} known whether to mark the device as known. defaults * @param {boolean=} known whether to mark the device as known. defaults
* to 'true'. * to 'true'.

3
src/crypto/index.js
View File

@@ -1418,7 +1418,8 @@ Crypto.prototype.saveDeviceList = function(delay) {
* Update the blocked/verified state of the given device * Update the blocked/verified state of the given device
* *
* @param {string} userId owner of the device * @param {string} userId owner of the device
* @param {string} deviceId unique identifier for the device * @param {string} deviceId unique identifier for the device or user's
* cross-signing public key ID.
* *
* @param {?boolean} verified whether to mark the device as verified. Null to * @param {?boolean} verified whether to mark the device as verified. Null to
* leave unchanged. * leave unchanged.