Handle case of encryption key for an index to be undefined #2646
+3
−1
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
As per matrix-org/matrix-js-sdk#4423 the key can be undefined and so we should handle this rather than waiting for SubtleCrypto.importKey() to fail.
AndrewFerr
requested changes
Sep 23, 2024
| @@ -41,7 +41,9 @@ export class MatrixKeyProvider extends BaseKeyProvider { | |||
| encryptionKeys, | |||
| ] of this.rtcSession.getEncryptionKeys()) { | |||
| for (const [index, encryptionKey] of encryptionKeys.entries()) { | |||
There was a problem hiding this comment.
As it is currently written (and is sufficiently captured in type hints), the array returned by getEncryptionKeys is a sparse array, which contains empty slots that are skipped by array iteration methods.
Thus, instead of using a for...of loop and having to check for undefined, this could simply use forEach:
Suggested change
| for (const [index, encryptionKey] of encryptionKeys.entries()) { | |
| encryptionKeys.forEach((encryptionKey, index) => { |
Note that this will work only if the array returned by getEncryptionKeys remains typed as Array<Uint8Array> instead of Array<Uint8Array | undefined>.
4 tasks
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.
As per matrix-org/matrix-js-sdk#4423 the key can be undefined and so we should handle this rather than waiting for SubtleCrypto.importKey() to fail.