Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Decrypt redaction events #1589

Merged
merged 2 commits into from
Feb 4, 2021

Conversation

SimonBrandner
Copy link
Contributor

This PR adds support for decrypting redaction events. This is useful for displaying encrypted redaction reasons

Signed-off-by: Šimon Brandner <[email protected]>
@jryans
Copy link
Collaborator

jryans commented Feb 3, 2021

@SimonBrandner Hmm, since the React PR was closed, should we close this side as well, or did you still want to pursue this?

@SimonBrandner
Copy link
Contributor Author

@jryans I'd like to leave this open if you don't mind. But there's definitely no rush with the review

Copy link
Collaborator

@jryans jryans left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems reasonable overall, thanks!

src/crypto/index.js Outdated Show resolved Hide resolved
Signed-off-by: Šimon Brandner <[email protected]>
Copy link
Collaborator

@jryans jryans left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, looks good to me! 😄

@jryans jryans merged commit 9d45e6a into matrix-org:develop Feb 4, 2021
@SimonBrandner SimonBrandner deleted the decrypt-redaction-reason branch February 4, 2021 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants