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.

Sign up for GitHub

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

Jump to bottom

Make error handling in decryptionLoop more generic #3024

Merged
merged 3 commits into from
Jan 5, 2023
Merged

Make error handling in decryptionLoop more generic #3024

merged 3 commits into from
Jan 5, 2023

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Jan 4, 2023 •
edited by github-actions bot
Loading

Not everything is a DecryptionError, and there's no real reason that we should only do retries for DecryptionErrors.

Part of element-hq/element-web#21972.

This change is marked as an internal change (Task), so will not be included in the changelog.

@richvdh
Make error handling in decryptionLoop more generic
1524522 
Not everything is a `DecryptionError`, and there's no real reason that we
should only do retries for `DecryptionError`s
@richvdh richvdh added the T-Task Tasks for the team like planning label Jan 4, 2023
@richvdh richvdh marked this pull request as ready for review January 4, 2023 18:35
@richvdh richvdh requested a review from a team as a code owner January 4, 2023 18:35
andybalaam
andybalaam approved these changes Jan 5, 2023
View reviewed changes
Copy link
Member

@andybalaam andybalaam left a comment

Choose a reason for hiding this comment

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

Agreed, so long as we won't spin doing rapid retries for e.g. a coding error?

@richvdh
Copy link
Member Author

richvdh commented Jan 5, 2023

Agreed, so long as we won't spin doing rapid retries for e.g. a coding error?

We'll only do a retry if retryDecryption gets set while the decryption takes place, and that only happens if we receive a key that might help decryption. So we might now do a single extra retry for a coding error, but that's not the end of the world.

@richvdh richvdh merged commit d02559c into develop Jan 5, 2023
@richvdh richvdh deleted the rav/element-r/decryption_error_handling branch January 5, 2023 15:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andybalaam andybalaam andybalaam approved these changes

@kerryarchibald kerryarchibald Awaiting requested review from kerryarchibald kerryarchibald is a code owner automatically assigned from matrix-org/element-web-reviewers

Assignees
No one assigned
Labels
T-Task Tasks for the team like planning
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@richvdh @andybalaam