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

Simplify event encryption decoration #7440

Merged
merged 1 commit into from
Mar 27, 2023
Merged

Simplify event encryption decoration #7440

merged 1 commit into from
Mar 27, 2023

Conversation

Anderas
Copy link
Contributor

@Anderas Anderas commented Mar 21, 2023

Related SDK change matrix-org/matrix-ios-sdk#1743

Resolves #7441

Move some of the event encryption decoration logic down into the SDK and simplify the model to only mention colors (red, grey, none) rather than reasons (unsafe key, untrusted ...)

@Anderas Anderas requested review from a team and pixlwave and removed request for a team March 21, 2023 11:29
Copy link
Contributor

@pixlwave pixlwave left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, this is a nice simplification 👍

@codecov
Copy link

codecov bot commented Mar 21, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.01 ⚠️

Comparison is base (0914828) 12.29% compared to head (39fdbc9) 12.29%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #7440      +/-   ##
===========================================
- Coverage    12.29%   12.29%   -0.01%     
===========================================
  Files         1645     1645              
  Lines       162976   162979       +3     
  Branches     66913    66912       -1     
===========================================
  Hits         20045    20045              
- Misses      142282   142285       +3     
  Partials       649      649              
Flag Coverage Δ
uitests 55.23% <ø> (ø)
unittests 6.18% <0.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...les/MatrixKit/Models/Room/MXKRoomBubbleComponent.m 30.64% <0.00%> (+1.18%) ⬆️
...t/Views/EncryptionInfoView/MXKEncryptionInfoView.m 0.00% <0.00%> (ø)
...lineCells/Encryption/RoomEncryptedDataBubbleCell.m 0.00% <0.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@sonarcloud
Copy link

sonarcloud bot commented Mar 27, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@Anderas Anderas merged commit 6e48692 into develop Mar 27, 2023
@Anderas Anderas deleted the andy/trust_shields branch March 27, 2023 16:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Integrate Room Shield Support (Verification State PR)
2 participants