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: update common protocol resolution (WPB-15191) 🍒 #3210

Merged
merged 2 commits into from
Jan 6, 2025

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jan 3, 2025

BugWPB-15191 [Android] User can not create or see MLS conversations, when they still have a proteus client registered to their account

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?

Issues

Resolving protocol for 1:1 was incorrectly taking in consideration teamDefault Protocol

Causes (Optional)

When the migration to MLS is not completed, and I have still valid Proteus clients around. The resolution of these conversations, new or existing, was not possible.

Solutions

Since this was introduced for another bug, that now we are taking care by creating the MLS client at the right moment.
We roll back those lines, see.

Testing

Test Coverage (Optional)

  • I have added automated test to this contribution

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.

@github-actions github-actions bot added cherry-pick PR is cherry-picking changes from another banch echoes: unplanned Any work item that isn’t part of the product or technical roadmap. type: bug / fix 🐞 👕 size: S 🚨 Potential breaking changes labels Jan 3, 2025
@yamilmedina yamilmedina enabled auto-merge January 6, 2025 08:57
Copy link

sonarqubecloud bot commented Jan 6, 2025

Copy link
Contributor Author

github-actions bot commented Jan 6, 2025

Test Results

3 375 tests   - 3   3 268 ✅  - 3   5m 49s ⏱️ -24s
  580 suites ±0     107 💤 ±0 
  580 files   ±0       0 ❌ ±0 

Results for commit a5e6c38. ± Comparison against base commit 1adf523.

This pull request removes 3 tests.
com.wire.kalium.logic.feature.protocol.OneOnOneProtocolSelectorTest ‑ givenSelfUserDoesntSupportsDefaultProtocolButOtherUserDoes_thenShouldReturnNoCommonProtocol[jvm]
com.wire.kalium.logic.feature.protocol.OneOnOneProtocolSelectorTest ‑ givenSelfUserSupportsDefaultProtocolButOtherUserDoesnt_thenShouldReturnNoCommonProtocol[jvm]
com.wire.kalium.logic.feature.protocol.OneOnOneProtocolSelectorTest ‑ givenUsersHaveProtocolInCommonButDiffersWithDefaultProtocol_thenShouldReturnNoCommonProtocol[jvm]

♻️ This comment has been updated with latest results.

Copy link
Contributor Author

github-actions bot commented Jan 6, 2025

@yamilmedina yamilmedina disabled auto-merge January 6, 2025 13:53
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 54.11%. Comparing base (1adf523) to head (a5e6c38).

Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #3210   +/-   ##
========================================
  Coverage    54.10%   54.11%           
========================================
  Files         1264     1264           
  Lines        36802    36806    +4     
  Branches      3735     3735           
========================================
+ Hits         19913    19917    +4     
  Misses       15449    15449           
  Partials      1440     1440           
Files with missing lines Coverage Δ
...logic/feature/protocol/OneOnOneProtocolSelector.kt 91.30% <100.00%> (+1.83%) ⬆️

... and 2 files with indirect coverage changes


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 1adf523...a5e6c38. Read the comment docs.

@datadog-wireapp
Copy link

Datadog Report

Branch report: fix/common-protocol-resolution-cherry-pick
Commit report: a2b5c09
Test service: kalium-jvm

✅ 0 Failed, 3268 Passed, 107 Skipped, 1m 3.74s Total Time

@yamilmedina yamilmedina added this pull request to the merge queue Jan 6, 2025
Merged via the queue into develop with commit 8decf56 Jan 6, 2025
23 checks passed
@yamilmedina yamilmedina deleted the fix/common-protocol-resolution-cherry-pick branch January 6, 2025 16:09
@echoes-hq echoes-hq bot added echoes: product-roadmap/bug Work contributing to resolve a bug not critical enough to have raised an incident. and removed echoes: unplanned Any work item that isn’t part of the product or technical roadmap. labels Jan 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick PR is cherry-picking changes from another banch echoes: product-roadmap/bug Work contributing to resolve a bug not critical enough to have raised an incident. 🚨 Potential breaking changes 👕 size: S type: bug / fix 🐞
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants