Merge pull request #5747 from vector-im/feature/adm/concurrent-new-session-crash

Fixing crash when navigating the app whilst room keys are being processed
This commit is contained in:
Adam Brown 2022-04-13 10:43:10 +01:00 committed by GitHub
commit 0bf84341af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

1
changelog.d/5746.bugfix Normal file
View file

@ -0,0 +1 @@
Fixes crash when navigating the app whilst processing new room keys

View file

@ -74,7 +74,7 @@ internal class RoomDecryptorProvider @Inject constructor(
this.newSessionListener = object : NewSessionListener { this.newSessionListener = object : NewSessionListener {
override fun onNewSession(roomId: String?, senderKey: String, sessionId: String) { override fun onNewSession(roomId: String?, senderKey: String, sessionId: String) {
// PR reviewer: the parameter has been renamed so is now in conflict with the parameter of getOrCreateRoomDecryptor // PR reviewer: the parameter has been renamed so is now in conflict with the parameter of getOrCreateRoomDecryptor
newSessionListeners.forEach { newSessionListeners.toList().forEach {
try { try {
it.onNewSession(roomId, senderKey, sessionId) it.onNewSession(roomId, senderKey, sessionId)
} catch (e: Throwable) { } catch (e: Throwable) {