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: persist mls conversation when mls disabled [WPB-15149] 🍒 #3209

Merged
merged 2 commits into from
Jan 9, 2025

Conversation

github-actions[bot]
Copy link
Contributor

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

BugWPB-15149 [Android] App is stuck after MLS migration

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

MLS conversations was not saved if MLS was disabled, causing further message migration fail.

Solutions

Instead of not saving MLS conversations we save them but with GroupState.PENDING_JOIN state to trigger migration when MLS will be enabled

@Garzas Garzas enabled auto-merge January 9, 2025 08:54
@echoes-hq echoes-hq bot added the echoes: unplanned/incident Work items addressing critical product defects that require immediate action, such as bugs, platf... label Jan 9, 2025
Copy link

sonarqubecloud bot commented Jan 9, 2025

Copy link
Contributor Author

github-actions bot commented Jan 9, 2025

Test Results

3 381 tests  ±0   3 273 ✅ ±0   5m 54s ⏱️ +41s
  580 suites ±0     108 💤 ±0 
  580 files   ±0       0 ❌ ±0 

Results for commit ed2a73e. ± Comparison against base commit e3639ec.

♻️ This comment has been updated with latest results.

Copy link
Contributor Author

github-actions bot commented Jan 9, 2025

@Garzas Garzas added this pull request to the merge queue Jan 9, 2025
@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 72.41379% with 8 lines in your changes missing coverage. Please review.

Project coverage is 54.13%. Comparing base (e3639ec) to head (ed2a73e).

Files with missing lines Patch % Lines
.../logic/data/conversation/ConversationRepository.kt 79.16% 4 Missing and 1 partial ⚠️
...lium/logic/data/conversation/ConversationMapper.kt 50.00% 0 Missing and 2 partials ⚠️
...persistence/dao/conversation/ConversationEntity.kt 0.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #3209   +/-   ##
========================================
  Coverage    54.13%   54.13%           
========================================
  Files         1264     1264           
  Lines        36833    36837    +4     
  Branches      3738     3735    -3     
========================================
+ Hits         19938    19941    +3     
- Misses       15453    15458    +5     
+ Partials      1442     1438    -4     
Files with missing lines Coverage Δ
...persistence/dao/conversation/ConversationEntity.kt 98.41% <0.00%> (ø)
...lium/logic/data/conversation/ConversationMapper.kt 58.02% <50.00%> (ø)
.../logic/data/conversation/ConversationRepository.kt 61.68% <79.16%> (+0.30%) ⬆️

... 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 e3639ec...ed2a73e. Read the comment docs.

@datadog-wireapp
Copy link

Datadog Report

Branch report: fix/persist-mls-conversation-cherry-pick
Commit report: 747e327
Test service: kalium-jvm

✅ 0 Failed, 3273 Passed, 108 Skipped, 1m 4.08s Total Time

Merged via the queue into develop with commit f506f90 Jan 9, 2025
23 checks passed
@Garzas Garzas deleted the fix/persist-mls-conversation-cherry-pick branch January 9, 2025 10:03
@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/incident Work items addressing critical product defects that require immediate action, such as bugs, platf... 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