Merge to-device retries onto group call branch #2560
Closed
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
dbkr
commented
Aug 3, 2022
| @@ -589,8 +589,7 @@ class MegolmEncryption extends EncryptionAlgorithm { | |||
| * | |||
There was a problem hiding this comment.
This file has new code: updated to not use the return value of encryptAndSendToDevices as it already had all the info it needed.
dbkr
commented
Aug 3, 2022
| * @return {Promise<{contentMap, deviceInfoByDeviceId}>} Promise which | ||
| * resolves once the message has been encrypted and sent to the given | ||
| * userDeviceMap, and returns the { contentMap, deviceInfoByDeviceId } | ||
| * of the successfully sent messages. | ||
| */ | ||
| public encryptAndSendToDevices( | ||
| userDeviceInfoArr: IOlmDevice<DeviceInfo>[], |
There was a problem hiding this comment.
This function updated to use the new API and no longer returns anything.
|
Oh - I might suggest waiting for #2528 to land and then merging that, since I've already resolved the conflicts with the retries PR there. |
|
(and otherwise, #2528 would generate yet another set of conflicts) |
|
ah cool - ok |
|
will re-open as necessary now that's merged |
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.
This merges #2549 onto the group-call branch
Merge is nontrivial though, so may be worth a review - I'll highlight the bits that needed actual new code.
Checklist
This PR currently has none of the required changelog labels.
Add one of:
T-Deprecation,T-Enhancement,T-Defect,T-Taskto indicate what type of change this is plusX-Breaking-Changeif it's a breaking change.