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): respect default protocol in one-on-one conversation initialisation (WPB-8975) 🍒 #2769

Conversation

github-actions[bot]
Copy link
Contributor

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

BugWPB-8975 Android creates 1:1 MLS conversation when 2 android phones accept connection request even when feature status of MLS is disabled

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?

  • Respect default protocol comes from team-settings when we want to create/start a one-on-one conversation.
  • Respect if mls-migration is enabled or not addition to start-end date of the migration when we start the mls-migration
  • Respect if MLS is enabled on team-settings before starting migration

Causes (Optional)

  • Default protocol in one-on-one conversations was not respected
  • MLSMigrationWorkers was not covered by tests

Testing

Test Coverage (Optional)

  • I have added automated test to this contribution

How to Test

  • Have an MLS Capable backend
  • Have team with disabled MLS and default protocol as Proteus
  • Login with two users on Android MLS capable app
  • Start a conversation between those two users, the conversation must be Proteus

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.

@MohamadJaara MohamadJaara enabled auto-merge (squash) May 24, 2024 13:33
Copy link

sonarcloud bot commented May 24, 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 May 24, 2024

Test Results

2 923 tests   2 905 ✔️  4m 46s ⏱️
       7 suites       18 💤
       7 files           0

Results for commit 66a4fed.

♻️ This comment has been updated with latest results.

@mchenani mchenani self-requested a review May 24, 2024 14:42
@datadog-wireapp
Copy link

Datadog Report

Branch report: fix/respect-default-protocol-in-1on1-initialisation-cherry-pick
Commit report: fd69603
Test service: kalium-jvm

✅ 0 Failed, 2954 Passed, 105 Skipped, 12.14s Total Time

@@ -73,7 +73,7 @@ internal class MLSMigrationManagerImpl(
incrementalSyncRepository.incrementalSyncState.collect { syncState ->
ensureActive()
if (syncState is IncrementalSyncStatus.Live &&
featureSupport.isMLSSupported &&
isMLSEnabledUseCase() &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
isMLSEnabledUseCase() &&
isMLSEnabled() &&

Just a tiny change.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the note, I'm afraid if I change it now; then in other cherrypicks gonna create other issues!

@mchenani mchenani disabled auto-merge May 24, 2024 14:53
@mchenani mchenani enabled auto-merge (squash) May 24, 2024 14:53
@mchenani mchenani merged commit 1305d57 into release/candidate May 24, 2024
19 checks passed
@mchenani mchenani deleted the fix/respect-default-protocol-in-1on1-initialisation-cherry-pick branch May 24, 2024 15:02
github-actions bot added a commit that referenced this pull request May 24, 2024
…isation (WPB-8975) 🍒 (#2769)

* Commit with unresolved merge conflicts

* trigger CI

* fix tests to match candidate changes

---------

Co-authored-by: Mojtaba Chenani <[email protected]>
github-merge-queue bot pushed a commit that referenced this pull request Jun 4, 2024
…isation (WPB-8975) 🍒 (#2769) (#2787)

* Commit with unresolved merge conflicts

* trigger CI

* fix tests to match candidate changes

---------

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]>
@echoes-hq echoes-hq bot added the echoes: bugs Technical or functional defects in the product label Jul 17, 2024
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