fix(mls-migration): allow skipping users without KeyPackages during M…

…LS migration (WPB-9638) 🍒 🍒 (#2860) * fix(mls-migration): allow skipping users without KeyPackages during MLS migration (WPB-9638) 🍒 (#2852) * fix(mls-migration): allow skipping users without KeyPackages during MLS migration (WPB-9638) (#2845) * fix(mls-migration): allow skipping users without KeyPackages during mls migration * change logs to debug level instead of warning * trigger CI --------- Co-authored-by: Mojtaba Chenani <[email protected]> * trigger CI --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Mojtaba Chenani <[email protected]>
wireapp · Jul 2, 2024 · c01866c · c01866c
1 parent 485bd10
commit c01866c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/...rc/commonMain/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepository.kt b/...rc/commonMain/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepository.kt
@@ -472,12 +472,17 @@ internal class MLSConversationDataSource(
         allowPartialMemberList: Boolean = false,
     ): Either<CoreFailure, MLSAdditionResult> = withContext(serialDispatcher) {
         commitPendingProposals(groupID).flatMap {
-            kaliumLogger.d("adding $userIdList to MLS group: $groupID")
+            kaliumLogger.d("adding ${userIdList.count()} users to MLS group")
             produceAndSendCommitWithRetryAndResult(groupID, retryOnStaleMessage = retryOnStaleMessage) {
                 keyPackageRepository.claimKeyPackages(userIdList, cipherSuite).flatMap { result ->
                     if (result.usersWithoutKeyPackagesAvailable.isNotEmpty() && !allowPartialMemberList) {
+                        kaliumLogger.d(
+                            "add members to MLS Group: failed " +
+                                    "${result.usersWithoutKeyPackagesAvailable.count()} user(s) missing KeyPackages"
+                        )
                         Either.Left(CoreFailure.MissingKeyPackages(result.usersWithoutKeyPackagesAvailable))
                     } else {
+                        kaliumLogger.d("add members to MLS Group: claiming KeyPackages succeed")
                         Either.Right(result)
                     }
                 }.flatMap { result ->

diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/mlsmigration/MLSMigrator.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/mlsmigration/MLSMigrator.kt
@@ -138,7 +138,11 @@ internal class MLSMigratorImpl(
                 when (protocolInfo) {
                     is Conversation.ProtocolInfo.Mixed -> {
                         conversationRepository.getConversationMembers(conversationId).flatMap { members ->
-                            mlsConversationRepository.establishMLSGroup(protocolInfo.groupId, members)
+                            mlsConversationRepository.establishMLSGroup(
+                                protocolInfo.groupId,
+                                members,
+                                allowSkippingUsersWithoutKeyPackages = true
+                            )
                         }
                         Unit.right()
                     }