Element-R: Wire up room rotation #3807
Merged
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
florianduros
force-pushed
the
florianduros/elementr/wire-up-rotation
branch
from
9a1850d to
19eaad5
Compare
florianduros
force-pushed
the
florianduros/elementr/wire-up-rotation
branch
from
19eaad5 to
1609944
Compare
3 tasks
florianduros
force-pushed
the
florianduros/elementr/wire-up-rotation
branch
from
1609944 to
baa2088
Compare
florianduros
force-pushed
the
florianduros/elementr/wire-up-rotation
branch
from
baa2088 to
c9ae562
Compare
florianduros
force-pushed
the
florianduros/elementr/wire-up-rotation
branch
from
c9ae562 to
7bbe247
Compare
florianduros
commented
Oct 23, 2023
| /* FIXME historyVisibility, etc */ | ||
|
|
||
| // We only support megolm | ||
| rustEncryptionSettings.algorithm = EncryptionAlgorithm.MegolmV1AesSha2; |
There was a problem hiding this comment.
Two solutions here:
- Set directly the Megolm algorithm since we currently only supporting megolm and we are checking at the beginning at the function that we are using Megolm.
- Use the value from
this.encryptionSettings, it means that we need to convert the string in the fieldthis.encryptionSettings.algoritmto the rustEncryptionAlgorithmenum
The second solution appears to me useless since we are only using Megolm
richvdh
approved these changes
Oct 23, 2023
| // See https://spec.matrix.org/v1.8/client-server-api/#mroomencryption and | ||
| // https://matrix-org.github.io/matrix-rust-sdk-crypto-wasm/classes/EncryptionSettings.html#rotationPeriod | ||
| if (typeof this.encryptionSettings.rotation_period_ms === "number") { | ||
| rustEncryptionSettings.rotationPeriod = BigInt(this.encryptionSettings.rotation_period_ms * 1000); |
There was a problem hiding this comment.
it's a bit silly that the Rust EncryptionSettings wants a bigint rather than a number, but hohum
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to a conflict with the base branch
# Conflicts: # spec/integ/crypto/crypto.spec.ts # src/rust-crypto/RoomEncryptor.ts
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Checklist
Closes element-hq/element-web#26318
Here's what your changelog entry will look like:
✨ Features
m.room.encryptionrotation_period_* are ignored element-hq/element-web#26318. Contributed by @florianduros.