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

Merge pull request #4057 from matrix-org/foldleft/12221-secret-storage

Browse Source 
Fixed bug where key reset didn't always return the right key
This commit is contained in:
Zoe
2020-02-12 11:18:32 +00:00
committed by GitHub
parent 97ab0636d9 c8e65bfa65
commit 466d4a3e51
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/settings/CrossSigningPanel.js
View File

@@ -103,7 +103,6 @@ export default class CrossSigningPanel extends React.PureComponent {
onDestroyStorage = (act) => {
if (!act) return;
console.log("Destroy secret storage:", act);
this._bootstrapSecureSecretStorage(true);
}
@@ -157,13 +156,13 @@ export default class CrossSigningPanel extends React.PureComponent {
{_t("Bootstrap cross-signing and secret storage")}
</AccessibleButton>
</div>;
} /*else { // TODO https://github.com/vector-im/riot-web/issues/12221
} else {
bootstrapButton = <div className="mx_CrossSigningPanel_buttonRow">
<AccessibleButton kind="danger" onClick={this._destroySecureSecretStorage}>
{_t("Reset cross-signing and secret storage")}
</AccessibleButton>
</div>;
}*/
}
return (
<div>