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.

Sign up for GitHub

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

Jump to bottom

App now prevents redacting own messages if there is no permission #2368

Merged
merged 7 commits into from
Jan 23, 2024
Merged

App now prevents redacting own messages if there is no permission #2368

merged 7 commits into from
Jan 23, 2024

Conversation

Velin92
Copy link
Member

@Velin92 Velin92 commented Jan 22, 2024 •
edited
Loading

requires:
#2367

@Velin92 Velin92 requested a review from a team as a code owner January 22, 2024 15:19
@Velin92 Velin92 requested review from stefanceriu and removed request for a team January 22, 2024 15:19
@Velin92 Velin92 marked this pull request as draft January 22, 2024 15:19
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 22, 2024 •
edited
Loading

Warnings
⚠️ Some of the commits are missing ticket numbers. Please consider squashing all commits that don't have a tracking number.

Generated by 🚫 Danger Swift against 2d00e0f

@stefanceriu
Copy link
Member

Do you maybe need to change this PR's base? doesn't look quite right 🤔

@Velin92
Merge branch 'develop' into mauroromito/can_user_redact_own
c0026b5 
# Conflicts:
#	ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
#	ElementX/Sources/Screens/RoomScreen/RoomScreenInteractionHandler.swift
#	ElementX/Sources/Services/Room/RoomProxyProtocol.swift
@Velin92 Velin92 marked this pull request as ready for review January 22, 2024 18:04
@codecov Codecov
Copy link

codecov bot commented Jan 22, 2024 •
edited
Loading

Codecov Report

Attention: 7 lines in your changes are missing coverage. Please review.

Comparison is base (31286c7) 72.57% compared to head (c0026b5) 73.29%.

❗ Current head c0026b5 differs from pull request most recent head 2d00e0f. Consider uploading reports for the commit 2d00e0f to get more accurate results

Files Patch % Lines
...eens/RoomScreen/RoomScreenInteractionHandler.swift 12.50% 7 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff             @@
##           develop    #2368      +/-   ##
===========================================
+ Coverage    72.57%   73.29%   +0.72%     
===========================================
  Files          517      513       -4     
  Lines        35584    35462     -122     
  Branches     17105    17036      -69     
===========================================
+ Hits         25825    25992     +167     
+ Misses        9134     8846     -288     
+ Partials       625      624       -1
Flag Coverage Δ
unittests 58.05% <12.50%> (+0.38%) ⬆️

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

stefanceriu
stefanceriu approved these changes Jan 23, 2024
View reviewed changes
Copy link
Member

@stefanceriu stefanceriu left a comment

Choose a reason for hiding this comment

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

lgtm 👍

ElementX/Sources/Screens/RoomScreen/RoomScreenInteractionHandler.swift Show resolved Hide resolved
@Velin92 Velin92 enabled auto-merge (squash) January 23, 2024 10:41
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Jan 23, 2024

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@Velin92 Velin92 merged commit 30a0561 into develop Jan 23, 2024
5 checks passed
@Velin92 Velin92 deleted the mauroromito/can_user_redact_own branch January 23, 2024 11:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stefanceriu stefanceriu stefanceriu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Velin92 @stefanceriu