fix: stale participant concurrent modification exeption [WPB-15340] (#…

…3278) (#3280) * fix: stale participant concurrent modification exeption * revert private variable Co-authored-by: Jakub Żerko <[email protected]>
wireapp · Feb 7, 2025 · c7128c5 · c7128c5
1 parent c1b6eba
commit c7128c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/call/CallRepository.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/call/CallRepository.kt
@@ -686,8 +686,11 @@ internal class CallDataSource(
         callJobs.remove(conversationId)?.cancel()
 
         // Cancel all jobs for removing stale participants
-        staleParticipantJobs.values.forEach { it.cancel() }
-        staleParticipantJobs.clear()
+        staleParticipantJobs.block { map ->
+            val jobsSnapshot = map.values.toList()
+            jobsSnapshot.forEach { it.cancel() }
+            map.clear()
+        }
 
         leaveSubconversation(conversationId, CALL_SUBCONVERSATION_ID)
             .onSuccess {

diff --git a/.../kotlin/com/wire/kalium/logic/feature/message/confirmation/ConfirmationDeliveryHandler.kt b/.../kotlin/com/wire/kalium/logic/feature/message/confirmation/ConfirmationDeliveryHandler.kt
@@ -103,7 +103,6 @@ internal class ConfirmationDeliveryHandlerImpl(
                             leadingMessage = "Skipping group conversation: ${conversation.id.toLogString()}",
                             jsonStringKeyValues = mapOf(
                                 "conversationId" to conversation.id.toLogString(),
-                                "messages" to messages.joinToString { it.obfuscateId() },
                                 "messageCount" to messages.size
                             )
                         )