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): update migrated conversation with correct group id and cipher suites (WPB-9169) 🍒 🍒 #2788

Merged
merged 2 commits into from
Jun 5, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented May 27, 2024

BugWPB-9169 [Android] Can not send or receive messages on android after migration 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?

Set MLS groupId and correct cipher suite to the migrated conversation.

Issues

Due to changes to the ciphersuites we needed to cover rare and edge cases, also one missing part for persisting MLS groupId after receiving protocol updated event.

Testing

Test Coverage (Optional)

  • I have added automated test to this contribution

How to Test

Briefly describe how this change was tested and if applicable the exact steps taken to verify that it works as expected.

Notes (Optional)

Specify here any other facts that you think are important for this issue.

Attachments (Optional)

Attachments like images, videos, etc. (drag and drop in the text box)


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.

…er suites (WPB-9169) 🍒 (#2771)

* Commit with unresolved merge conflicts

* Commit with unresolved merge conflicts

* trigger CI

* fix tests to match candidate changes

* fix tests

---------

Co-authored-by: Mojtaba Chenani <[email protected]>
@vitorhugods vitorhugods enabled auto-merge June 4, 2024 10:48
Copy link

sonarqubecloud bot commented Jun 4, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

Copy link
Contributor Author

github-actions bot commented Jun 4, 2024

Test Results

3 043 tests  ±0   2 939 ✔️ ±0   3m 37s ⏱️ +23s
   528 suites ±0      104 💤 ±0 
   528 files   ±0          0 ±0 

Results for commit 54820cd. ± Comparison against base commit 6fd59d4.

This pull request removes 1 and adds 1 tests. Note that renamed tests count towards both.
com.wire.kalium.logic.data.conversation.ConversationRepositoryTest ‑ givenNoChange_whenUpdatingProtocolToMls_thenShouldNotUpdateLocally[jvm]
com.wire.kalium.logic.data.conversation.ConversationRepositoryTest ‑ givenNoChange_whenUpdatingProtocolToMls_thenShouldUpdateLocally[jvm]

♻️ This comment has been updated with latest results.

@vitorhugods vitorhugods added this pull request to the merge queue Jun 4, 2024
@datadog-wireapp
Copy link

Datadog Report

Branch report: fix/mls-migration-cs-cherry-pick-cherry-pick
Commit report: a475619
Test service: kalium-jvm

✅ 0 Failed, 2939 Passed, 104 Skipped, 13.32s Total Time

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 4, 2024
@vitorhugods vitorhugods added this pull request to the merge queue Jun 5, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 5, 2024
@vitorhugods vitorhugods added this pull request to the merge queue Jun 5, 2024
Merged via the queue into develop with commit 6e038eb Jun 5, 2024
21 checks passed
@vitorhugods vitorhugods deleted the fix/mls-migration-cs-cherry-pick-cherry-pick branch June 5, 2024 21:02
@echoes-hq echoes-hq bot added the echoes: unplanned Any work item that isn’t part of the product or technical roadmap. label Jul 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
echoes: unplanned Any work item that isn’t part of the product or technical roadmap. 🚨 Potential breaking changes 👕 size: M type: bug / fix 🐞
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants