matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-29 16:43:09 +03:00
Code Activity

Re-check key backup status on version mismatch

Browse Source 
This ensures we will report the updated status when consumer code asks for it.

Fixes part of https://github.com/vector-im/riot-web/issues/8048.
This commit is contained in:
J. Ryan Stinnett
2019-01-08 15:43:49 -06:00
parent e8022e985e
commit 14b42abfa4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/crypto/index.js
View File

@@ -246,11 +246,9 @@ Crypto.prototype._checkAndStartKeyBackup = async function() {
/** /**
* Forces a re-check of the key backup and enables/disables it * Forces a re-check of the key backup and enables/disables it
* as appropriate * as appropriate.
*
* @param {object} backupInfo Backup info from /room_keys/version endpoint
*/ */
Crypto.prototype.checkKeyBackup = async function(backupInfo) { Crypto.prototype.checkKeyBackup = async function() {
this._checkedForBackup = false; this._checkedForBackup = false;
await this._checkAndStartKeyBackup(); await this._checkAndStartKeyBackup();
}; };
@@ -1021,6 +1019,9 @@ Crypto.prototype._scheduleKeyBackupSend = async function() {
err.data.errcode == 'M_NOT_FOUND' || err.data.errcode == 'M_NOT_FOUND' ||
err.data.errcode == 'M_WRONG_ROOM_KEYS_VERSION' err.data.errcode == 'M_WRONG_ROOM_KEYS_VERSION'
) { ) {
// Re-check key backup status on error, so we can be
// sure to present the current situation when asked.
await this.checkKeyBackup();
// Backup version has changed or this backup version // Backup version has changed or this backup version
// has been deleted // has been deleted
this.emit("crypto.keyBackupFailed", err.data.errcode); this.emit("crypto.keyBackupFailed", err.data.errcode);