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

chore(mls): unify MLSClientIdentity models (WPB-9774) 🍒 #2885

Conversation

github-actions[bot]
Copy link
Contributor

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?

To fetch the MLSClientIdentity from CC we were mapping them in different models, due to different changes we needed more data to be exposed, we needed them to be unified and map all the available data from CC.

Issues

Hard to maintain different models
Due to maturity of CC now we have a rich and solid model we can map full object in Kalium and Android App.

Needs releases with:
With AR

  • GitHub link to other pull request

Testing

Test Coverage (Optional)

  • I have added automated test to this contribution

How to Test

All E2EI features must work as before!


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.

alexandreferris and others added 30 commits April 29, 2024 10:52
* ci: use new cherry-pick action on release cycle 4.6 (#2726)

* ci: adjust cherry-pick for rc-develop

---------

Co-authored-by: Vitor Hugo Schwaab <[email protected]>
* Commit with unresolved merge conflicts

* fix merge issues

---------

Co-authored-by: Mohamad Jaara <[email protected]>
* Commit with unresolved merge conflicts

* Fixed cherry-pick merging conflict

---------

Co-authored-by: boris <[email protected]>
Co-authored-by: Boris Safonov <[email protected]>
* fix: wrong failType for MLS federation errors [WPB-9087]

* detekt
…2773)

* fix: recreate cache directories in case cache is cleared [WPB-7368]

* fix detekt
…ublic keys [WPB-8592] 🍒 (#2734)

* Commit with unresolved merge conflicts

* fix tests

* detekt

* Trigger CI

Signed-off-by: MohamadJaara <[email protected]>

---------

Signed-off-by: MohamadJaara <[email protected]>
Co-authored-by: Mohamad Jaara <[email protected]>
* Commit with unresolved merge conflicts

* Commit with unresolved merge conflicts

* fix tests

* detekt

* Trigger CI

Signed-off-by: MohamadJaara <[email protected]>

* Trigger CI

Signed-off-by: MohamadJaara <[email protected]>

---------

Signed-off-by: MohamadJaara <[email protected]>
Co-authored-by: Mohamad Jaara <[email protected]>
* Commit with unresolved merge conflicts

* Commit with unresolved merge conflicts

* Commit with unresolved merge conflicts

* fix tests

* detekt

* Trigger CI

Signed-off-by: MohamadJaara <[email protected]>

* Trigger CI

Signed-off-by: MohamadJaara <[email protected]>

* detekt

* test

* test

* BaseProteusClientTest

* fix merge issues

---------

Signed-off-by: MohamadJaara <[email protected]>
Co-authored-by: Mohamad Jaara <[email protected]>
…ion [WPB-8592] 🍒 (#2745)

* Commit with unresolved merge conflicts

* Commit with unresolved merge conflicts

* Commit with unresolved merge conflicts

* Commit with unresolved merge conflicts

* fix tests

* detekt

* Trigger CI

Signed-off-by: MohamadJaara <[email protected]>

* Trigger CI

Signed-off-by: MohamadJaara <[email protected]>

* detekt

* test

* test

* BaseProteusClientTest

* fix merge issues

* fix merge issues

* fix merge issues

---------

Signed-off-by: MohamadJaara <[email protected]>
Co-authored-by: Mohamad Jaara <[email protected]>
…92] 🍒 (#2746)

* Commit with unresolved merge conflicts

* Commit with unresolved merge conflicts

* Commit with unresolved merge conflicts

* Commit with unresolved merge conflicts

* Commit with unresolved merge conflicts

* fix tests

* detekt

* Trigger CI

Signed-off-by: MohamadJaara <[email protected]>

* Trigger CI

Signed-off-by: MohamadJaara <[email protected]>

* detekt

* test

* test

* BaseProteusClientTest

* fix merge issues

* fix merge issues

* fix merge issues

* fix merge issues

* fix merge issues

* fix test

* detekt

* fix tests

* fix tests

---------

Signed-off-by: MohamadJaara <[email protected]>
Co-authored-by: Mohamad Jaara <[email protected]>
… 🍒 (#2741)

* Commit with unresolved merge conflicts

* fix tests

* Update logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/E2eiCertificate.kt

Co-authored-by: Vitor Hugo Schwaab <[email protected]>

* fix tests

---------

Co-authored-by: Mojtaba Chenani <[email protected]>
Co-authored-by: Mohamad Jaara <[email protected]>
Co-authored-by: Vitor Hugo Schwaab <[email protected]>
… (WPB-9038) 🍒 (#2750)

* Commit with unresolved merge conflicts

* resolve conflicts

* resolve conflicts

---------

Co-authored-by: Mojtaba Chenani <[email protected]>
Co-authored-by: Yamil Medina <[email protected]>
* Commit with unresolved merge conflicts

* Commit with unresolved merge conflicts

* resolve conflicts

* resolve conflicts

* resolve conflicts

---------

Co-authored-by: Mojtaba Chenani <[email protected]>
Co-authored-by: Yamil Medina <[email protected]>
…isation (WPB-8975) 🍒 (#2769)

* Commit with unresolved merge conflicts

* trigger CI

* fix tests to match candidate changes

---------

Co-authored-by: Mojtaba Chenani <[email protected]>
…er suites (WPB-9169) 🍒 (#2771)

* Commit with unresolved merge conflicts

* Commit with unresolved merge conflicts

* trigger CI

* fix tests to match candidate changes

* fix tests

---------

Co-authored-by: Mojtaba Chenani <[email protected]>
* chore: delete unused WireCryptobox bindings

* address PR comments
* remove zip file from test resources

* Trigger CI

Signed-off-by: MohamadJaara <[email protected]>

---------

Signed-off-by: MohamadJaara <[email protected]>
* fix: Split NoCommonProtocol error

* Fixed style

Co-authored-by: boris <[email protected]>
…638) 🍒 (#2838)

* Commit with unresolved merge conflicts

* resolve conflicts

---------

Co-authored-by: Mojtaba Chenani <[email protected]>
* Commit with unresolved merge conflicts

* Resolve problems after cherry-pick

* Fix code-style

---------

Co-authored-by: boris <[email protected]>
Co-authored-by: Boris Safonov <[email protected]>
* fix: Wrong E2EI information for other users [WPB-9409] (#2828)

* fix: Wrong E2EI information for other users

* Added tests

* Empty-Commit

---------

Co-authored-by: boris <[email protected]>
Co-authored-by: Boris Safonov <[email protected]>
…LS migration (WPB-9638) 🍒 (#2852)

* fix(mls-migration): allow skipping users without KeyPackages during MLS migration (WPB-9638) (#2845)

* fix(mls-migration): allow skipping users without KeyPackages during mls migration

* change logs to debug level instead of warning

* trigger CI

---------

Co-authored-by: Mojtaba Chenani <[email protected]>
github-actions bot and others added 5 commits July 8, 2024 10:17
* Commit with unresolved merge conflicts

* asset restriction

* fix tests

---------

Co-authored-by: Mohamad Jaara <[email protected]>
* Commit with unresolved merge conflicts

* Fixed cherry-pick issues

---------

Co-authored-by: boris <[email protected]>
Co-authored-by: Boris Safonov <[email protected]>
…2871)

* Commit with unresolved merge conflicts

* Solved cherry-pick issues

* Fix tests

---------

Co-authored-by: boris <[email protected]>
Co-authored-by: Boris Safonov <[email protected]>
…s [WPB-7425] 🍒 (#2876)

* Commit with unresolved merge conflicts

* Trigger build PR

* Fixed cherry-pick issues

* Fixed build

---------

Co-authored-by: boris <[email protected]>
Co-authored-by: Boris Safonov <[email protected]>
Copy link

sonarcloud bot commented Jul 18, 2024

@echoes-hq echoes-hq bot added the echoes: technical-debt Changes intended at mitigating risks label Jul 18, 2024
@MohamadJaara MohamadJaara added echoes: throughput Changes intended at preserving our ability to evolve the software safely and effectively and removed echoes: technical-debt Changes intended at mitigating risks labels Jul 18, 2024
@mchenani
Copy link
Member

duplicate: #2900

@mchenani mchenani closed this Jul 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
echoes: throughput Changes intended at preserving our ability to evolve the software safely and effectively 🚨 Potential breaking changes 👕 size: XXL type: chore 🧹
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants