feat: initiate reset broken mls conversation - WPB-18800 #3348

dmitrysimkin · 2025-07-16T14:07:05Z

WPB-18800 [IOS] Initiate reset broken MLS conversations

Issue

Please describe the issue.

Optional: add details about technical approach, solutions etc.

Optional: reference dependencies to other pull requests etc.

Testing

Describe how to test.

Optional: attachments like images, videos, etc.

Checklist

Title contains a reference JIRA issue number like [WPB-XXX].
Description is filled and free of optional paragraphs.
Adds/updates automated tests.

UI accessibility checklist

If your PR includes UI changes, please utilize this checklist:

Make sure you use the API for UI elements that support large fonts.
All colors are taken from WireDesign.ColorTheme or constructed using WireDesign.BaseColorPalette.
New UI elements have Accessibility strings for VoiceOver.

github-actions · 2025-07-18T14:15:46Z

Test Results

7 files 989 suites 9m 18s ⏱️
7 524 tests 7 496 ✅ 27 💤 1 ❌
7 525 runs 7 498 ✅ 27 💤 0 ❌

For more details on these failures, see this check.

Results for commit ea1f19f.

♻️ This comment has been updated with latest results.

datadog-wireapp · 2025-07-18T14:17:38Z

Datadog Report

Branch report: feature/initiate-reset-broken-MLS-convo-WPB-18800
Commit report: 786bc49
Test service: wire-ios-mono

✅ 0 Failed, 7493 Passed, 27 Skipped, 4m 8.74s Total Time

netbe

looks good, left a couple comments before approving

WireDomain/Sources/WireDomain/Components/ClientSessionComponent.swift

WireDomain/Sources/WireDomain/Helpers/ResetMLSConversationHandler.swift

netbe · 2025-07-22T12:28:14Z

wire-ios-data-model/Source/MLS/Actions/SendMLSMessageFailure.swift

+            "A referenced leaf node index points to a blank or non-existing node: \(message)"
+
+        case let .mlsInvalidLeafNodeSignature(message):
+            "TBD" // TODO:


netbe · 2025-07-22T12:32:14Z

wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession.swift

+            initiateResetMLSConversationUseCaseFactory: { [weak self] context in
+                guard let self else {
+                    fatal("userSession not reachable")
+                }
+                return makeInitiateResetMLSConversationUseCase(context: context)
+            }


question: i know we talked about this? but just to double check, is this the only way?

Maybe could be good to leave a comment here why this is necessary

You mean pass it from ZMUserSession or use factory block instead of passing already created use case instance?

ok actually what would be nice is to leave a comment why we do it:

"Passing useCase from WireDomain to WireRequestStrategy's MessageSender"

wire-ios-request-strategy/Sources/Message Sending/MessageSenderTests.swift

wire-ios-data-model/Source/MLS/MLSService.swift

jullianm

Looks good, nice work

WireDomain/Sources/WireDomain/Helpers/InitiateResetMLSConversationUseCase.swift

This reverts commit e776b3b.

This reverts commit 0eaf543.

This reverts commit ef5fc6c.

netbe

found just one issue with establish group, then we're good

netbe · 2025-07-25T07:23:33Z

WireDomain/Sources/WireDomain/Helpers/InitiateResetMLSConversationUseCase.swift

+            let users = await conversationLocalStore.localParticipantsAsMLSUsers(in: conversation)
+            _ = try await mlsService.establishGroup(for: groupID, with: users, removalKeys: nil)
+
+            WireLogger.mls.info("Initiate reset broken MLS conversation use case finished")


suggestion:
add conversationID as attribute to all logs so we know which conversation we're talking about
i.e.:

.conversationId: message.conversation?.qualifiedID?.safeForLoggingDescription ?? "<nil>"

netbe · 2025-07-25T07:26:34Z

WireDomain/Sources/WireDomain/Helpers/InitiateResetMLSConversationUseCase.swift

+
+            // re-create group and re-add all participants
+            let users = await conversationLocalStore.localParticipantsAsMLSUsers(in: conversation)
+            _ = try await mlsService.establishGroup(for: groupID, with: users, removalKeys: nil)


issue: localParticipants returns all participants including selfUser and establishGroup add the users and internally adds also self. Use localParticipantsExcludingSelf if we use establishGroup

netbe · 2025-07-25T08:06:52Z

wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession.swift

+            initiateResetMLSConversationUseCaseFactory: { [weak self] context in
+                guard let self else {
+                    fatal("userSession not reachable")
+                }
+                return makeInitiateResetMLSConversationUseCase(context: context)
+            }


ok actually what would be nice is to leave a comment why we do it:

"Passing useCase from WireDomain to WireRequestStrategy's MessageSender"

dmitrysimkin requested a review from netbe July 16, 2025 14:07

github-actions bot assigned dmitrysimkin Jul 16, 2025

netbe mentioned this pull request Jul 17, 2025

fix: initialSync required flag - WPB-18887 #3351

Merged

6 tasks

dmitrysimkin marked this pull request as ready for review July 18, 2025 14:04

github-actions bot mentioned this pull request Jul 21, 2025

fix: initialSync required flag - WPB-18887 #3369

Merged

6 tasks

dmitrysimkin requested a review from jullianm July 22, 2025 07:18

dmitrysimkin mentioned this pull request Jul 22, 2025

feat: mls reset conversation - WPB-18635 #3333

Merged

netbe reviewed Jul 22, 2025

View reviewed changes

Base automatically changed from feat/WPB-18635-mls-reset-conversation to release/cycle-4.2 July 23, 2025 10:25

dmitrysimkin requested a review from netbe July 23, 2025 13:28

jullianm approved these changes Jul 23, 2025

View reviewed changes

WireDomain/Sources/WireDomain/Helpers/InitiateResetMLSConversationUseCase.swift Outdated Show resolved Hide resolved

WireDomain/Sources/WireDomain/Helpers/InitiateResetMLSConversationUseCase.swift Outdated Show resolved Hide resolved

dmitrysimkin changed the base branch from release/cycle-4.2 to develop July 24, 2025 16:24

dmitrysimkin changed the base branch from develop to release/cycle-4.2 July 24, 2025 16:24

netbe and others added 15 commits July 24, 2025 18:46

wip

72d06f8

add todo

6cc618e

notes

747d7f0

Fix Continue

dd90a60

Format

3aa1ca0

Remove not used

dc122e7

Remove potentially not used

5a4afd1

Add code to trigger reset broken MLS

fb64216

Improve passing group ID

25505d6

Inject reset handler to legacy code

a848c5a

Implement initialte Reset

2d272dd

Rename

5a939e6

Code style

04a0443

Fix tests by removing not used errors

727460a

Connect when to call initiate reset broken MLS conversations

4400d49

dmitrysimkin added 19 commits July 24, 2025 18:50

FOrmat

a3bbc7e

Added debug action to reset conversation

567470a

Fixed coding key to send param

5ecc3e7

Added dev action

5fdb759

format

2bcf11a

Improve tests

3eb607c

Revert "Fix tests by removing not used errors"

51238e5

This reverts commit e776b3b.

Revert "Remove potentially not used"

79ae2ca

This reverts commit 0eaf543.

Revert "Remove not used"

5356f5d

This reverts commit ef5fc6c.

Remove todos

c961a3f

Fixed build error with tests

4016231

Fixed wire sync engine

6dd0e60

Fixed building strategy

1366ff3

Remove not used

07c2c97

Address PR comments

6441805

Code style

ee1aee4

Added wipe group on initiate reset and tests

4049936

Remove not used

3e5ac10

Format

51bdeaf

dmitrysimkin force-pushed the feature/initiate-reset-broken-MLS-convo-WPB-18800 branch from 1a8b9b0 to 51bdeaf Compare July 24, 2025 17:05

dmitrysimkin changed the base branch from release/cycle-4.2 to develop July 24, 2025 17:06

dmitrysimkin closed this Jul 25, 2025

dmitrysimkin reopened this Jul 25, 2025

netbe changed the title ~~feat: Initiate reset broken mls convo - WPB-18800~~ feat: initiate reset broken mls conversation - WPB-18800 Jul 25, 2025

Fixed Lost code during rebase

3b90121

netbe requested changes Jul 25, 2025

View reviewed changes

dmitrysimkin added 2 commits July 25, 2025 12:49

PR comments

d573894

Add comment

ea1f19f

dmitrysimkin requested a review from netbe July 25, 2025 11:02

feat: initiate reset broken mls conversation - WPB-18800 #3348

Are you sure you want to change the base?

feat: initiate reset broken mls conversation - WPB-18800 #3348

Uh oh!

Conversation

dmitrysimkin commented Jul 16, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Issue

Testing

Checklist

UI accessibility checklist

Uh oh!

github-actions bot commented Jul 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results

Uh oh!

datadog-wireapp bot commented Jul 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Datadog Report

Uh oh!

netbe left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jullianm left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

netbe left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dmitrysimkin commented Jul 16, 2025 •

edited by github-actions bot

Loading

github-actions bot commented Jul 18, 2025 •

edited

Loading

datadog-wireapp bot commented Jul 18, 2025 •

edited

Loading