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): fetch and set mls-removal keys for 1on1 conversations (WPB-10743) 🍒 🍒 #3044

Merged

Conversation

github-actions[bot]
Copy link
Contributor

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

BugWPB-10743 [Android] Use proper MLS removal key with federated 1:1 conversations

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?

Fetch and set removal-keys from the get-oneonone-conversation response for 1on1 conversations and only APIV6

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: bugs Technical or functional defects in the product echoes: features End-user visible changes intended to create customer value type: bug / fix 🐞 👕 size: M 🚨 Potential breaking changes labels Sep 27, 2024
…ls-1on1-removal-keys-cherry-pick-cherry-pick

# Conflicts:
#	logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationMapper.kt
#	network-model/src/commonMain/kotlin/com/wire/kalium/network/api/authenticated/conversation/ConversationResponse.kt
#	network/src/commonMain/kotlin/com/wire/kalium/network/api/v6/authenticated/ConversationApiV6.kt
Copy link

sonarcloud bot commented Oct 1, 2024

Copy link
Contributor Author

github-actions bot commented Oct 1, 2024

Test Results

3 212 tests  ±0   3 106 ✅ ±0   4m 11s ⏱️ -8s
  551 suites ±0     106 💤 ±0 
  551 files   ±0       0 ❌ ±0 

Results for commit 6b08709. ± Comparison against base commit c667979.

♻️ This comment has been updated with latest results.

Copy link
Contributor Author

github-actions bot commented Oct 1, 2024

🐰 Bencher Report

Branchfix/mls-1on1-removal-keys-cherry-pick-cherry-pick
Testbedubuntu-latest

⚠️ WARNING: The following Measure does not have a Threshold. Without a Threshold, no Alerts will ever be generated!

Click here to create a new Threshold
For more information, see the Threshold documentation.
To only post results if a Threshold exists, set the --ci-only-thresholds CLI flag.

Click to view all benchmark results
BenchmarkLatencynanoseconds (ns)
com.wire.kalium.benchmarks.logic.CoreLogicBenchmark.createObjectInFiles📈 view plot
⚠️ NO THRESHOLD
698,912.63
com.wire.kalium.benchmarks.logic.CoreLogicBenchmark.createObjectInMemory📈 view plot
⚠️ NO THRESHOLD
648,889,047.55
com.wire.kalium.benchmarks.persistence.MessagesNoPragmaTuneBenchmark.messageInsertionBenchmark📈 view plot
⚠️ NO THRESHOLD
951,899,951.83
com.wire.kalium.benchmarks.persistence.MessagesNoPragmaTuneBenchmark.queryMessagesBenchmark📈 view plot
⚠️ NO THRESHOLD
21,508,807.44
🐰 View full continuous benchmarking report in Bencher

@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 39.13043% with 14 lines in your changes missing coverage. Please review.

Project coverage is 52.51%. Comparing base (c667979) to head (6b08709).

Files with missing lines Patch % Lines
.../network/api/v6/authenticated/ConversationApiV6.kt 0.00% 5 Missing ⚠️
...ire/kalium/logic/data/conversation/Conversation.kt 0.00% 2 Missing ⚠️
...in/com/wire/kalium/logic/data/mls/MLSPublicKeys.kt 0.00% 2 Missing ⚠️
.../logic/data/conversation/ConversationRepository.kt 0.00% 2 Missing ⚠️
...conversation/JoinExistingMLSConversationUseCase.kt 80.00% 2 Missing ⚠️
...authenticated/conversation/ConversationResponse.kt 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3044      +/-   ##
===========================================
- Coverage    52.51%   52.51%   -0.01%     
===========================================
  Files         1303     1304       +1     
  Lines        50174    50178       +4     
  Branches      4679     4679              
===========================================
+ Hits         26349    26350       +1     
- Misses       21939    21942       +3     
  Partials      1886     1886              
Files with missing lines Coverage Δ
...lium/logic/data/conversation/ConversationMapper.kt 58.40% <ø> (ø)
...gic/data/conversation/MLSConversationRepository.kt 83.72% <ø> (ø)
...ogic/data/mlspublickeys/MLSPublicKeysRepository.kt 22.22% <ø> (-7.78%) ⬇️
...onversation/mls/MLSOneOnOneConversationResolver.kt 100.00% <100.00%> (ø)
...authenticated/conversation/ConversationResponse.kt 0.00% <0.00%> (ø)
...ire/kalium/logic/data/conversation/Conversation.kt 0.00% <0.00%> (ø)
...in/com/wire/kalium/logic/data/mls/MLSPublicKeys.kt 0.00% <0.00%> (ø)
.../logic/data/conversation/ConversationRepository.kt 62.19% <0.00%> (-0.13%) ⬇️
...conversation/JoinExistingMLSConversationUseCase.kt 80.48% <80.00%> (-0.35%) ⬇️
.../network/api/v6/authenticated/ConversationApiV6.kt 0.00% <0.00%> (ø)

... and 1 file 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 c667979...6b08709. Read the comment docs.

@datadog-wireapp
Copy link

Datadog Report

Branch report: fix/mls-1on1-removal-keys-cherry-pick-cherry-pick
Commit report: 3ca54cd
Test service: kalium-jvm

✅ 0 Failed, 3106 Passed, 106 Skipped, 14.46s Total Time

@MohamadJaara MohamadJaara added this pull request to the merge queue Oct 1, 2024
Merged via the queue into develop with commit 8b65be7 Oct 1, 2024
22 checks passed
@MohamadJaara MohamadJaara deleted the fix/mls-1on1-removal-keys-cherry-pick-cherry-pick branch October 1, 2024 20:49
MohamadJaara added a commit that referenced this pull request Oct 18, 2024
…10743) 🍒 🍒 (#3044)

* Commit with unresolved merge conflicts

* fix merge conflicts

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
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
Labels
cherry-pick PR is cherry-picking changes from another banch echoes: bugs Technical or functional defects in the product echoes: features End-user visible changes intended to create customer value 🚨 Potential breaking changes 👕 size: M type: bug / fix 🐞
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants