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

Ignore reshares of known megolm sessions #276

Merged
merged 1 commit into from
Nov 10, 2016
Merged

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Nov 10, 2016

If we get a second key for a known megolm session, ignore it.

Fixes element-hq/element-web#2326, one hopes.

If we get a second key for a known megolm session, ignore it.

Fixes element-hq/element-web#2326, one hopes.
@NegativeMjark
Copy link
Contributor

LGTM. It might be nice if it merged the ratchet state into the existing ratchet, but that can wait for another day.

@richvdh richvdh merged commit bc9e290 into develop Nov 10, 2016
@richvdh richvdh deleted the rav/ignore_key_reshares branch November 10, 2016 19:56
manuroe added a commit to matrix-org/matrix-ios-sdk that referenced this pull request Nov 23, 2016
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.

2 participants