matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

Merge pull request #3985 from matrix-org/jryans/relax-account-data-check

Browse Source 
Relax secret storage account data check
This commit is contained in:
J. Ryan Stinnett
2020-01-29 20:40:13 +00:00
committed by GitHub
parent d362cc0f41 6f0d88a126
commit 786ddb8a7e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/MatrixChat.js
View File

@@ -1864,7 +1864,9 @@ export default createReactClass({
try { try {
masterKeyInStorage = !!await cli.getAccountDataFromServer("m.cross_signing.master"); masterKeyInStorage = !!await cli.getAccountDataFromServer("m.cross_signing.master");
} catch (e) { } catch (e) {
if (e.errcode !== "M_NOT_FOUND") throw e; if (e.errcode !== "M_NOT_FOUND") {
console.warn("Secret storage account data check failed", e);
}
} }
if (masterKeyInStorage) { if (masterKeyInStorage) {