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

Fix e2ee regression introduced by #1358 #1369

Merged
merged 3 commits into from
Feb 15, 2022

Conversation

manuroe
Copy link
Contributor

@manuroe manuroe commented Feb 15, 2022

Closes element-hq/element-ios#5564.

The source of truth for the encryption of a room is back to MXRoomSummary.isEncrypted, which is a rollback of #1358.
The additional change of this PR is that on every send, there is a check if this value is aligned with the one in the crypto store.
There is also some error logs if something tries to reset MXRoomSummary.isEncrypted.

The source of truth for the encryption of a room is back to `MXRoomSummary.isEncrypted`, which is a rollback of #1358.
The additional change of this PR is that on every send, there is a check if this value is aligned with the one in the crypto store.
There is also some error logs if something tries to reset `MXRoomSummary.isEncrypted`.
@manuroe manuroe changed the base branch from develop to hotfix/0.22.0 February 15, 2022 08:30
@manuroe manuroe requested a review from BillCarsonFr February 15, 2022 11:01
Copy link
Member

@pixlwave pixlwave left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@manuroe manuroe force-pushed the manu/5564_e2e_regression branch from b53a242 to 21fa803 Compare February 15, 2022 14:01
Copy link
Member

@pixlwave pixlwave left a comment

Choose a reason for hiding this comment

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

So much for my side-by-side review of the old PR and this one 🤦‍♂️
Works great with that last commit.

@manuroe manuroe merged commit 9c66056 into hotfix/0.22.0 Feb 15, 2022
@manuroe manuroe deleted the manu/5564_e2e_regression branch February 15, 2022 15:16
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.

Image sent to encrypted room was not encrypted
2 participants