This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
Trust on decrypt #2583
Merged
Trust on decrypt #2583
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add support for trust-on-decrypt (API change, recognise flag on isKeyBackupTrusted). Catch rejection on wrong passphrase / recovery key. Fix remembering whether we are restoring with key or passphrase. Requires matrix-org/matrix-js-sdk#836
turt2live
approved these changes
Feb 7, 2019
| @@ -185,32 +185,31 @@ export default React.createClass({ | |||
| title = _t("Error"); | |||
| content = _t("Unable to load backup status"); | |||
| } else if (this.state.restoreError) { | |||
| title = _t("Error"); | |||
| content = _t("Unable to restore backup"); | |||
| if (this.state.restoreError.errcode === MatrixClientPeg.get().RESTORE_BACKUP_ERROR_BAD_KEY) { | |||
There was a problem hiding this comment.
Can we import MatrixClient from the js-sdk and use that instead? Accessing static properties on an instance variable is not fun :(
| <br /> | ||
| <div>{backupSigStatuses}</div> | ||
| <div>{trustedLocally}</div> | ||
| <br /><br /> |
There was a problem hiding this comment.
imo we should be using block elements rather than breaks - breaks have me concerned for when/if someone changes their zoom level and things don't align anymore, whereas blocks would ensure the layout at least remains somewhat sane.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add support for trust-on-decrypt (API change, recognise flag on
isKeyBackupTrusted). Catch rejection on wrong passphrase / recovery
key. Fix remembering whether we are restoring with key or passphrase.
Requires matrix-org/matrix-js-sdk#836