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: images form iOS are blocked when restrictions are applied [WPB-10830] 🍒 🍒 #3016

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Sep 16, 2024

BugWPB-10830 [Android] Receiving images is prohibited when shared from iOS from col3 backend

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

Original PR description:


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

images form iOS are blocked when restrictions are applied

Solutions

  1. check if file extention or mime type are valid
  2. if not then and only then. we check if the message have complete meta data

Dependencies (Optional)

If there are some other pull requests related to this one (e.g. new releases of frameworks), specify them here.

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.

@github-actions github-actions bot added cherry-pick PR is cherry-picking changes from another banch echoes: unplanned Any work item that isn’t part of the product or technical roadmap. type: bug / fix 🐞 👕 size: S labels Sep 16, 2024
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.

Conflicts to solve

…f-restrictions-are-on-mages-from-iOS-are-not-recived-cherry-pick-cherry-pick

# Conflicts:
#	logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/asset/AssetMessageHandler.kt
#	logic/src/jvmTest/kotlin/com/wire/kalium/logic/sync/receiver/asset/AssetMessageHandlerTest.kt
Copy link

Copy link
Contributor Author

github-actions bot commented Sep 25, 2024

Test Results

3 202 tests  ±0   3 095 ✅ ±0   3m 55s ⏱️ +2s
  551 suites ±0     107 💤 ±0 
  551 files   ±0       0 ❌ ±0 

Results for commit da855a0. ± Comparison against base commit 3d4468b.

♻️ This comment has been updated with latest results.

@MohamadJaara MohamadJaara added this pull request to the merge queue Sep 25, 2024
@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 20.00000% with 4 lines in your changes missing coverage. Please review.

Project coverage is 52.50%. Comparing base (3d4468b) to head (da855a0).
Report is 1 commits behind head on develop.

Files with missing lines Patch % Lines
...m/logic/sync/receiver/asset/AssetMessageHandler.kt 20.00% 3 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3016      +/-   ##
===========================================
- Coverage    52.52%   52.50%   -0.02%     
===========================================
  Files         1301     1301              
  Lines        50043    50039       -4     
  Branches      4663     4662       -1     
===========================================
- Hits         26286    26274      -12     
- Misses       21884    21891       +7     
- Partials      1873     1874       +1     
Files with missing lines Coverage Δ
...m/logic/sync/receiver/asset/AssetMessageHandler.kt 66.66% <20.00%> (-11.42%) ⬇️

... and 1 file 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 3d4468b...da855a0. Read the comment docs.

@datadog-wireapp
Copy link

Datadog Report

Branch report: fix/if-restrictions-are-on-mages-from-iOS-are-not-recived-cherry-pick-cherry-pick
Commit report: bfb44af
Test service: kalium-jvm

✅ 0 Failed, 3095 Passed, 107 Skipped, 10.8s Total Time

Merged via the queue into develop with commit ee5615f Sep 25, 2024
21 of 22 checks passed
@MohamadJaara MohamadJaara deleted the fix/if-restrictions-are-on-mages-from-iOS-are-not-recived-cherry-pick-cherry-pick branch September 25, 2024 13:08
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: unplanned Any work item that isn’t part of the product or technical roadmap. 👕 size: S type: bug / fix 🐞
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants