Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: mls 1on1 race condition [WPB-15395] #3237

Merged
merged 6 commits into from
Jan 22, 2025
+86 −12
Merged

fix: mls 1on1 race condition [WPB-15395] #3237

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
29385d6
fix: race condition during 1on1 mls creation, more logs
Garzas Jan 21, 2025
5e3cae6
Merge branch 'release/candidate' into fix/mls-1on1-race-condition
Garzas Jan 21, 2025
15f4f33
scope init fix
Garzas Jan 21, 2025
dce11b2
test fix
Garzas Jan 21, 2025
e457aa9
added ignore on welcome message when conv already exist, reverted wip…
Garzas Jan 21, 2025
4afcd7c
added warning
Garzas Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Loading
Loading status checks…
added warning
@Garzas
Garzas committed Jan 21, 2025
commit 4afcd7c9fc554e79f85042a01d3e0fa456e11a00
1 change: 1 addition & 0 deletions ...monMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/MLSWelcomeEventHandler.kt
View file
Original file line number Diff line number Diff line change
@@ -81,6 +81,7 @@ internal class MLSWelcomeEventHandlerImpl(
}
.flatMapLeft {
if (it is MLSFailure.ConversationAlreadyExists) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add warning here then? "Discarding welcome since the conversation already exists "

kaliumLogger.w("$TAG: Discarding welcome since the conversation already exists")
Either.Right(Unit)
} else {
Either.Left(it)