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) 🍒 #2838

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jun 24, 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:



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.

Copy link
Contributor Author

github-actions bot commented Jun 26, 2024

Test Results

3 060 tests   2 955 ✔️  3m 34s ⏱️
   530 suites     105 💤
   530 files           0

Results for commit 99512e8.

♻️ This comment has been updated with latest results.

@datadog-wireapp
Copy link

datadog-wireapp bot commented Jun 26, 2024

Datadog Report

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

✅ 0 Failed, 2955 Passed, 105 Skipped, 12.73s Total Time

…tart-migration-4.6-cherry-pick' into fix/set-correct-cs-when-kalium-start-migration-4.6-cherry-pick
Copy link

sonarcloud bot commented Jun 26, 2024

@mchenani mchenani enabled auto-merge (squash) June 26, 2024 14:34
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (release/candidate@6209de3). Learn more about missing BASE report.

Additional details and impacted files
@@                 Coverage Diff                  @@
##             release/candidate    #2838   +/-   ##
====================================================
  Coverage                     ?   58.92%           
====================================================
  Files                        ?     1212           
  Lines                        ?    47274           
  Branches                     ?     4441           
====================================================
  Hits                         ?    27857           
  Misses                       ?    17404           
  Partials                     ?     2013           
Files Coverage Δ
...gic/data/conversation/MLSConversationRepository.kt 82.31% <100.00%> (ø)
...e/kalium/logic/feature/mlsmigration/MLSMigrator.kt 78.37% <100.00%> (ø)

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6209de3...99512e8. Read the comment docs.

@mchenani mchenani merged commit 8b38a32 into release/candidate Jun 26, 2024
19 checks passed
@mchenani mchenani deleted the fix/set-correct-cs-when-kalium-start-migration-4.6-cherry-pick branch June 26, 2024 16:20
github-actions bot added a commit that referenced this pull request Jun 26, 2024
…638) 🍒 (#2838)

* Commit with unresolved merge conflicts

* resolve conflicts

---------

Co-authored-by: Mojtaba Chenani <[email protected]>
github-merge-queue bot pushed a commit that referenced this pull request Jul 1, 2024
…638) 🍒 (#2838) (#2846)

* Commit with unresolved merge conflicts

* resolve conflicts

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Mojtaba Chenani <[email protected]>
Co-authored-by: Vitor Hugo Schwaab <[email protected]>
Co-authored-by: Mohamad Jaara <[email protected]>
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.

3 participants