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.

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-migration): set correct CS when Kalium start migration (WPB-9638) 🍒 🍒 #2846

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jun 26, 2024

BugWPB-9638 [Android] Can not send or receive messages after migration from proteus to MLS

This PR was automatically cherry-picked based on the following PR:

Original PR description:


This PR was automatically cherry-picked based on the following PR:

Original PR description:



PR Submission Checklist for internal contributors

  • The PR Title

    • conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
    • contains a reference JIRA issue number like SQPIT-764
    • answers the question: If merged, this PR will: ... ³
  • The PR Description

    • is free of optional paragraphs and you have filled the relevant parts to the best of your ability

What's new in this PR?

When Android/Kalium starts the migration flow, we actually creating the MLS Conversation, and due to the agreement that the BE will not set the Correct CS in the Create Conversation Response, we need to ignore that value; in the normal conversation creation this was considered, but not in the migration flow.

Testing

Test Coverage (Optional)

  • I have added automated test to this contribution

How to Test

  • Have a team without MLS enabled
  • Login on android and web
  • Create a Proteus group and send some messages
  • Enable MLS and set the migration to be started
  • Log out and log in on Android, the android app must start the migration to MLS
  • Web ( without reloading the web-app) and android app must be able to send and receive messages and the group must be established as MLS

PR Post Submission Checklist for internal contributors (Optional)

  • Wire's Github Workflow has automatically linked the PR to a JIRA issue

PR Post Merge Checklist for internal contributors

  • If any soft of configuration variable was introduced by this PR, it has been added to the relevant documents and the CI jobs have been updated.

References
  1. https://sparkbox.com/foundry/semantic_commit_messages
  2. https://github.com/wireapp/.github#usage
  3. E.g. feat(conversation-list): Sort conversations by most emojis in the title #SQPIT-764.

…638) 🍒 (#2838)

* Commit with unresolved merge conflicts

* resolve conflicts

---------

Co-authored-by: Mojtaba Chenani <[email protected]>
Copy link
Contributor Author

github-actions bot commented Jun 28, 2024

Test Results

0 tests   - 3 093   0 ✔️  - 2 988   19905d 9h 13m 9s ⏱️ + 19905d 9h 9m 36s
1 suites  -    531   0 💤  -    105 
1 files    -    531   0 ±       0 

Results for commit 82a40eb. ± Comparison against base commit 39e3df5.

♻️ This comment has been updated with latest results.

@datadog-wireapp
Copy link

datadog-wireapp bot commented Jun 28, 2024

Datadog Report

Branch report: fix/set-correct-cs-when-kalium-start-migration-4.6-cherry-pick-cherry-pick
Commit report: 5ffc0fe
Test service: kalium-jvm

✅ 0 Failed, 2988 Passed, 105 Skipped, 11.8s Total Time

Copy link

sonarcloud bot commented Jul 1, 2024

@vitorhugods vitorhugods added this pull request to the merge queue Jul 1, 2024
Merged via the queue into develop with commit 1781cbd Jul 1, 2024
20 of 21 checks passed
@vitorhugods vitorhugods deleted the fix/set-correct-cs-when-kalium-start-migration-4.6-cherry-pick-cherry-pick branch July 1, 2024 11:38
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants