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 #2831

Merged
merged 6 commits into from
Jun 24, 2024
Merged

Conversation

MohamadJaara
Copy link
Member


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
Member

@vitorhugods vitorhugods left a comment

Choose a reason for hiding this comment

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

👨🏼‍🍳🤌

Copy link
Contributor

github-actions bot commented Jun 21, 2024

Unit Test Results

   432 files     432 suites   1m 59s ⏱️
2 368 tests 2 270 ✔️ 98 💤 0

Results for commit 4aa439f.

♻️ This comment has been updated with latest results.

@datadog-wireapp
Copy link

datadog-wireapp bot commented Jun 21, 2024

Datadog Report

All test runs 074c71e 🔗

2 Total Test Services: 0 Failed, 2 Passed

Test Services
Service Name Failed Known Flaky New Flaky Passed Skipped Total Time Test Service View
kalium-ios 0 0 0 2153 120 1.35s Link
kalium-jvm 0 0 0 2270 98 2.55s Link

Copy link

sonarcloud bot commented Jun 24, 2024

@yamilmedina yamilmedina merged commit ebcc9f8 into release/android-cycle-4.4.x Jun 24, 2024
15 checks passed
@yamilmedina yamilmedina deleted the fix/asset_restriction branch June 24, 2024 09:08
MohamadJaara added a commit that referenced this pull request Jul 1, 2024
* 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)
MohamadJaara added a commit that referenced this pull request Jul 2, 2024
* 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
MohamadJaara added a commit that referenced this pull request Jul 2, 2024
* 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)
MohamadJaara added a commit that referenced this pull request Jul 3, 2024
* fix: asset restriction [WPB-9947] (#2831) (#2856)

* 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)

* merge conflicts
MohamadJaara 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-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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants