Ensure algorithm instance is created and stored #4924
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
ouchadam
reviewed
Jan 12, 2022
| @@ -578,7 +578,7 @@ internal class DefaultCryptoService @Inject constructor( | |||
| // (for now at least. Maybe we should alert the user somehow?) | |||
| val existingAlgorithm = cryptoStore.getRoomAlgorithm(roomId) | |||
|
|
|||
| if (existingAlgorithm == algorithm) { | |||
| if (existingAlgorithm == algorithm && roomEncryptorsStore.get(roomId) != null) { | |||
There was a problem hiding this comment.
would it be helpful to split the conditions into separate ifs/whens in order to provide unique logs?
ouchadam
approved these changes
Jan 12, 2022
|
can confirm this fixes the issue for me
|
56 tasks
ganfra
approved these changes
Jan 12, 2022
|
Also confirm the bugs are fixed on my side. I do not wait for the CI, only the changelog added. |
bmarty
approved these changes
Jan 12, 2022
56 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.
Ensure that algorithm instance is created and cached when setEncryptionInRoom is called even if no alg change