From 90fef4393df848cc27ffb9f1ff1806f30de9ab9a Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 8 Jan 2019 15:43:49 -0600
Subject: [PATCH] Re-check key backup status on version mismatch

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.
---
 src/crypto/index.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/crypto/index.js b/src/crypto/index.js
index 9e8daf93e1c..e920f28b502 100644
--- a/src/crypto/index.js
+++ b/src/crypto/index.js
@@ -246,11 +246,9 @@ Crypto.prototype._checkAndStartKeyBackup = async function() {
 
 /**
  * Forces a re-check of the key backup and enables/disables it
- * as appropriate
- *
- * @param {object} backupInfo Backup info from /room_keys/version endpoint
+ * as appropriate.
  */
-Crypto.prototype.checkKeyBackup = async function(backupInfo) {
+Crypto.prototype.checkKeyBackup = async function() {
     this._checkedForBackup = false;
     await this._checkAndStartKeyBackup();
 };
@@ -1021,6 +1019,9 @@ Crypto.prototype._scheduleKeyBackupSend = async function() {
                         err.data.errcode == 'M_NOT_FOUND' ||
                         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
                         // has been deleted
                         this.emit("crypto.keyBackupFailed", err.data.errcode);