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 groups are not usable if I have a proteus client registered to my account but have MLS on current client [WPB-15192] 🍒 #3204

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Dec 31, 2024

BugWPB-15192 [Android] MLS groups are not usable if I have a proteus client registered to my account but have MLS on current client

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

the current client can be MLS capable but it did not announce it yet to the backend (migration is not forced yet)

Solutions

instead of looking at the user in general to know if interactions are allowed only look at the current client
this will result to the current client ignoring any Proteus self clients when sending but this is an acceptable case

Dependencies (Optional)

If there are some other pull requests related to this one (e.g. new releases of frameworks), specify them here.

Needs releases with:

  • GitHub link to other pull request

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.

…to my account but have MLS on current client [WPB-15192] (#3197)

* fix: MLS groups are not usable if I have a proteus client registered to my account but have MLS on current client [WPB-15192]

* detekt

* detekt

* fix: pr comments

---------

Co-authored-by: yamilmedina <[email protected]>
@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: M 🚨 Potential breaking changes labels Dec 31, 2024
…user-have-1-mls-client-after-migration-cherry-pick
@yamilmedina yamilmedina enabled auto-merge January 6, 2025 15:51
Copy link

sonarqubecloud bot commented Jan 6, 2025

Copy link
Contributor Author

github-actions bot commented Jan 6, 2025

Test Results

3 384 tests  +5   3 276 ✅ +4   5m 27s ⏱️ -7s
  580 suites ±0     108 💤 +1 
  580 files   ±0       0 ❌ ±0 

Results for commit d335eff. ± Comparison against base commit f00dd3f.

This pull request skips 1 test.
com.wire.kalium.logic.feature.conversation.ObserveConversationInteractionAvailabilityUseCaseTest ‑ givenProteusConversationAndUserSupportsOnlyMLS_whenObserving_thenShouldReturnUnsupportedProtocol[jvm]

♻️ This comment has been updated with latest results.

@yamilmedina yamilmedina added this pull request to the merge queue Jan 6, 2025
@datadog-wireapp
Copy link

Datadog Report

Branch report: fix/message-composer-is-blocked-when-the-user-have-1-mls-client-after-migration-cherry-pick
Commit report: ca93db5
Test service: kalium-jvm

✅ 0 Failed, 3276 Passed, 108 Skipped, 1m 1.1s Total Time

@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 56.00000% with 11 lines in your changes missing coverage. Please review.

Project coverage is 54.12%. Comparing base (f00dd3f) to head (d335eff).
Report is 1 commits behind head on develop.

Files with missing lines Patch % Lines
...um/logic/feature/conversation/ConversationScope.kt 0.00% 6 Missing ⚠️
.../com/wire/kalium/logic/data/user/UserRepository.kt 0.00% 3 Missing ⚠️
...serveConversationInteractionAvailabilityUseCase.kt 91.66% 1 Missing ⚠️
...ire/kalium/persistence/dao/client/ClientDAOImpl.kt 75.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #3204   +/-   ##
========================================
  Coverage    54.11%   54.12%           
========================================
  Files         1264     1264           
  Lines        36818    36829   +11     
  Branches      3738     3738           
========================================
+ Hits         19925    19934    +9     
- Misses       15451    15454    +3     
+ Partials      1442     1441    -1     
Files with missing lines Coverage Δ
...om/wire/kalium/persistence/dao/client/ClientDAO.kt 100.00% <ø> (ø)
...serveConversationInteractionAvailabilityUseCase.kt 90.90% <91.66%> (+8.30%) ⬆️
...ire/kalium/persistence/dao/client/ClientDAOImpl.kt 78.33% <75.00%> (+3.33%) ⬆️
.../com/wire/kalium/logic/data/user/UserRepository.kt 67.44% <0.00%> (-0.60%) ⬇️
...um/logic/feature/conversation/ConversationScope.kt 0.00% <0.00%> (ø)

... and 3 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 f00dd3f...d335eff. Read the comment docs.

Merged via the queue into develop with commit ff2a93c Jan 6, 2025
23 checks passed
@yamilmedina yamilmedina deleted the fix/message-composer-is-blocked-when-the-user-have-1-mls-client-after-migration-cherry-pick branch January 6, 2025 16:59
@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: M type: bug / fix 🐞
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants