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: asset restriction [WPB-9947] (#2831) (#2856) 🍒 #2862

Merged

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jul 3, 2024

TaskWPB-9947 [Android] Implement asset sending restriction

This PR was automatically cherry-picked based on the following PR:

Original PR description:


  • fix: asset restriction (fix: asset restriction #2831)

  • fix: asset sending restriction

  • add test

  • add error messages and detekt

  • fist test service

  • detekt

  • chore: update gradle-ios-tests.yml for runner at that time


Co-authored-by: Yamil Medina [email protected]

(cherry picked from commit ebcc9f8)

  • fix merge issues

  • fix unresolved reference

(cherry picked from commit 116f276)


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

When sending a new file, assets restrictions are not considered.

Solutions

check the file restrictions status and return the correct error based on that

Needs releases with:

  • GitHub link to other pull request

Testing

Test Coverage (Optional)

  • I have added automated test to this contribution

How to Test

Briefly describe how this change was tested and if applicable the exact steps taken to verify that it works as expected.

Notes (Optional)

Specify here any other facts that you think are important for this issue.

Attachments (Optional)

Attachments like images, videos, etc. (drag and drop in the text box)


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.

Copy link

sonarcloud bot commented Jul 3, 2024

Copy link
Contributor Author

github-actions bot commented Jul 3, 2024

Test Results

2 935 tests   2 917 ✔️  4m 27s ⏱️
       7 suites       18 💤
       7 files           0

Results for commit 1402948.

♻️ This comment has been updated with latest results.

@datadog-wireapp
Copy link

Datadog Report

Branch report: fix/asset-restriction-4.6-cherry-pick
Commit report: 43150b5
Test service: kalium-jvm

✅ 0 Failed, 2966 Passed, 105 Skipped, 14.21s Total Time

Comment on lines +465 to +468
// if the IDE tels you that this casting is unnecessary
// first check kotlin version
// if version < 2 then casting is necessary
// if version >= 2 then casting is unnecessary
Copy link
Member

Choose a reason for hiding this comment

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

I guess you have K2 Mode enabled?

Anyway, we should bump to 2.0 Soon™ :D

@MohamadJaara MohamadJaara merged commit 19b105f into release/candidate Jul 8, 2024
19 checks passed
@MohamadJaara MohamadJaara deleted the fix/asset-restriction-4.6-cherry-pick branch July 8, 2024 08:17
github-actions bot added a commit that referenced this pull request Jul 8, 2024
* Commit with unresolved merge conflicts

* asset restriction

* fix tests

---------

Co-authored-by: Mohamad Jaara <[email protected]>
github-merge-queue bot pushed a commit that referenced this pull request Jul 8, 2024
* Commit with unresolved merge conflicts

* asset restriction

* fix tests

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Mohamad Jaara <[email protected]>
@echoes-hq echoes-hq bot added the echoes: features End-user visible changes intended to create customer value label Jul 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants