Initial content scanner integration by jmartinesp · Pull Request #7139 · element-hq/element-x-android

jmartinesp · 2026-07-01T17:31:02Z

Content

Create the base APIs to be able to use an optional content scanner for the media in the app:

Create :features:contentscanner modules.
Create a ContentScanner wrapper for the RustContentScanner one.
Create a ContentScannerUrlProvider interface and implement a noop version for the FOSS app so we don't instantiate a content scanner in that case.
Add the shared code to use a provided content scanner (coming from the enterprise code) to set it up in the SDK and expose it in the @SessionScope.
Split the code for fetching the Element well-known and caching it so the caching part can be used by other components - it will be used by enterprise.

Motivation and context

Closes #7122.

Tests

Check with FOSS that everything works as before.

With Pro, use the counterpart branch to check the element-well known file is fetched. Sadly, we have no example HS with this value, so the most you can probably do is using Proxyman or some other MITM proxy to override the response for that endpoint and point to a content scanner instance you have running somewhere. Details on how to run a content scanner server are detailed in the parent story.

Tested devices

Physical
Emulator
OS version(s): 15

Checklist

github-actions · 2026-07-01T17:45:06Z

📱 Scan the QR code below to install the build (arm64 only) for this PR.

If you can't scan the QR code you can install the build via this link: https://i.diawi.com/cfBk9t

codecov · 2026-07-02T07:04:37Z

Codecov Report

❌ Patch coverage is 77.98165% with 24 lines in your changes missing coverage. Please review.
✅ Project coverage is 80.57%. Comparing base (7c3d1e2) to head (8bf068e).
⚠️ Report is 1 commits behind head on develop.

Files with missing lines	Patch %	Lines
...d/libraries/matrix/impl/RustMatrixClientFactory.kt	33.33%	5 Missing and 3 partials ⚠️
...wellknown/impl/DefaultSessionWellknownRetriever.kt	84.00%	2 Missing and 2 partials ⚠️
...ibraries/matrix/impl/scanner/RustContentScanner.kt	72.72%	1 Missing and 2 partials ⚠️
...atures/wellknown/test/FakeElementWellknownStore.kt	80.00%	3 Missing ⚠️
...x/impl/scanner/DefaultContentScannerUrlProvider.kt	0.00%	2 Missing ⚠️
...id/libraries/matrix/impl/di/SessionMatrixModule.kt	0.00%	1 Missing ⚠️
...ibraries/matrix/test/scanner/FakeContentScanner.kt	50.00%	1 Missing ⚠️
...element/android/libraries/network/NetworkModule.kt	0.00%	1 Missing ⚠️
...ibraries/wellknown/api/WellknownRetrieverResult.kt	50.00%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #7139      +/-   ##
===========================================
+ Coverage    80.53%   80.57%   +0.03%     
===========================================
  Files         2705     2710       +5     
  Lines        78030    78114      +84     
  Branches     10532    10544      +12     
===========================================
+ Hits         62843    62938      +95     
+ Misses       11128    11110      -18     
- Partials      4059     4066       +7

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

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

bmarty

Only small remarks, I let @ganfra do the proper review

bmarty · 2026-07-06T08:00:20Z

+    } else {
+        error("Either response or error must be provided")
+    }
+}


We could use mockwebserver but it's also OK.

I just tried using MockWebServer and while it works, it's also harder to set up and in some cases I end up having to use a mix of mocking (for spies) and the web server, so I'm not sure it's worth it. If @ganfra thinks we should change this too I can upload those changes.

Ok for me like this

ganfra

Some remarks

ganfra

Thanks for the changes, LGTM now!

- Add `:features:contentscanner:api` module with the interface. - Implement the concrete component using the Rust SDK in `:libraries:matrix:impl`. This can be used to both set up the content scanner media fetching in the SDK Client and manually scanning media sources from the Android side

…api` module as a noop implementation Use it as a placeholder for the code to instantiate a `RustContentScanner` with the fetched URL and set it as part of the SDK client.

…be reused for the non-session bound retriever. Also add the new `content_scanner_url` field to it. This will be used by the enterprise code to fetch the actual content scanner url.

…rl provider implementation

This needed some tweaks to `RetrofitFactory`

Co-authored-by: Benoit Marty <benoitm@element.io>

…ent side

… checking if we're running unit tests in `MediaSource.toRustMediaSource`

sonarqubecloud · 2026-07-08T07:28:40Z

Quality Gate passed

Issues
2 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

jmartinesp force-pushed the feat/content-scanner-integration branch from d227064 to e96b0f2 Compare July 1, 2026 20:44

jmartinesp added the PR-Wip For anything that isn't ready to ship and will be enabled at a later date label Jul 2, 2026

jmartinesp force-pushed the feat/content-scanner-integration branch from ca86d89 to 1df9a59 Compare July 2, 2026 06:24

jmartinesp marked this pull request as ready for review July 2, 2026 11:43

jmartinesp requested a review from a team as a code owner July 2, 2026 11:43

jmartinesp requested review from ganfra and removed request for a team July 2, 2026 11:43

bmarty reviewed Jul 6, 2026

View reviewed changes

jmartinesp mentioned this pull request Jul 6, 2026

Content scanner: scan timeline events for unsafe content #7159

Draft

12 tasks

ganfra reviewed Jul 6, 2026

View reviewed changes

jmartinesp requested a review from ganfra July 7, 2026 07:15

ganfra approved these changes Jul 7, 2026

View reviewed changes

jmartinesp and others added 15 commits July 8, 2026 08:57

Create ContentScannerUrlProvider in a new `:features:contentscaner:…

b5c9cb1

…api` module as a noop implementation Use it as a placeholder for the code to instantiate a `RustContentScanner` with the fetched URL and set it as part of the SDK client.

Expose the optional ContentScanner in the @SessionScope

ee9245c

Split the storage part of the Element well-known retriever so it can …

4622066

…be reused for the non-session bound retriever. Also add the new `content_scanner_url` field to it. This will be used by the enterprise code to fetch the actual content scanner url.

Bump enterprise commit to have access to the actual content scanner u…

e651836

…rl provider implementation

Fix tests and lint issues

11957f1

Bump enterprise again to fix tests

e76e599

More tests and coverage

7d20282

Bump enterprise code yet again

be9d67a

Add tests for DefaultWellknownRetrieverTest

c30caf8

This needed some tweaks to `RetrofitFactory`

Use the right namespace for :features:contentscanner:api

8d49fd3

Co-authored-by: Benoit Marty <benoitm@element.io>

Also use the right namespace for impl

916250f

Co-authored-by: Benoit Marty <benoitm@element.io>

Instantiate a single SDK ContentScanner component

2e6a9db

Document why we need a separate ContentScanner component in the cli…

88a260d

…ent side

Replace if not null check with catching ClassNotFoundException when…

2ada023

… checking if we're running unit tests in `MediaSource.toRustMediaSource`

jmartinesp force-pushed the feat/content-scanner-integration branch from 0271e0c to 2ada023 Compare July 8, 2026 06:57

jmartinesp enabled auto-merge (squash) July 8, 2026 07:01

jmartinesp disabled auto-merge July 8, 2026 07:09

Bump enterprise to latest main

8bf068e

jmartinesp enabled auto-merge (squash) July 8, 2026 07:12

jmartinesp merged commit 885e042 into develop Jul 8, 2026
31 of 32 checks passed

jmartinesp deleted the feat/content-scanner-integration branch July 8, 2026 07:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Initial content scanner integration#7139

Initial content scanner integration#7139
jmartinesp merged 16 commits into
developfrom
feat/content-scanner-integration

jmartinesp commented Jul 1, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jul 1, 2026 •

edited

Loading

Uh oh!

codecov Bot commented Jul 2, 2026 •

edited

Loading

Uh oh!

bmarty left a comment

Uh oh!

Uh oh!

Uh oh!

bmarty Jul 6, 2026

Uh oh!

jmartinesp Jul 6, 2026

Uh oh!

ganfra Jul 7, 2026

Uh oh!

ganfra left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ganfra left a comment

Uh oh!

sonarqubecloud Bot commented Jul 8, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

jmartinesp commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Content

Motivation and context

Tests

Tested devices

Checklist

Uh oh!

github-actions Bot commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov Bot commented Jul 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

bmarty left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

bmarty Jul 6, 2026

Choose a reason for hiding this comment

Uh oh!

jmartinesp Jul 6, 2026

Choose a reason for hiding this comment

Uh oh!

ganfra Jul 7, 2026

Choose a reason for hiding this comment

Uh oh!

ganfra left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ganfra left a comment

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud Bot commented Jul 8, 2026

Quality Gate passed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

jmartinesp commented Jul 1, 2026 •

edited

Loading

github-actions Bot commented Jul 1, 2026 •

edited

Loading

codecov Bot commented Jul 2, 2026 •

edited

Loading