From b6ef30af8f286576f17773bce13c333bcb8baab2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 9 Apr 2020 13:40:46 +0100
Subject: [PATCH] Retry the request for the master key from SSSS on login

If this failed we assumed it didn't exist which would erroneously
prompt people to upgrade encryption.
---
 src/components/structures/MatrixChat.js | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 7d3b7dd0d9..da416142f8 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1907,13 +1907,19 @@ export default createReactClass({
         }
 
         // Test for the master cross-signing key in SSSS as a quick proxy for
-        // whether cross-signing has been set up on the account.
-        let masterKeyInStorage = false;
-        try {
-            masterKeyInStorage = !!await cli.getAccountDataFromServer("m.cross_signing.master");
-        } catch (e) {
-            if (e.errcode !== "M_NOT_FOUND") {
-                console.warn("Secret storage account data check failed", e);
+        // whether cross-signing has been set up on the account. We can't
+        // really continue until we know whether it's there or not so retry
+        // if this fails.
+        let masterKeyInStorage;
+        while (masterKeyInStorage === undefined) {
+            try {
+                masterKeyInStorage = !!await cli.getAccountDataFromServer("m.cross_signing.master");
+            } catch (e) {
+                if (e.errcode === "M_NOT_FOUND") {
+                    masterKeyInStorage = false;
+                } else {
+                    console.warn("Secret storage account data check failed: retrying...", e);
+                }
             }
         }