Support gallery messages by bmarty · Pull Request #7112 · element-hq/element-x-android

bmarty · 2026-06-26T14:01:51Z

Follow up for #6519

Support sending and rendering gallery messages (a message with multiple photos)

* Support gallery messages * Address review * Remove unused function * Fix indent * Add "Gallery" message prefix * Support galleries for image editing * Fix tapping on a tile opens the last item * Fix overflow count * Add caption editing to gallery messages * Use the new gallery string for prefix * Lock sending galleries behind a feature flag * Fix detekts * Fix * Ensure image edition is saved when navigating * Fix sending media broken on edited gallery. * Fix tests * Order imports * Remove unused parameters. * Fix copyright header of new files. * Fix Konsist test * Extract new previews to a dedicated file. * Sync strings * Remove unused import * Update screenshots * Trigger CI * Remove parameters with default value. * More cleanup * Restore sendAsFile behavior. * Improve Preview. * Improve Preview. * Improve Preview. * Fix gallery sending cancel and retry issue * Ensure any previous job is cancelled. * Fix issue in summary message * Gallery feature is disabled by default. * Kotlin convention * Remove useless parenthesis * Update screenshots * Fix test * List -> ImmutableList * Remove useless code. * Render formatted caption for attachment list. * Replace set of Booleans by an enum * Remove unused model for individual caption in a gallery Event. * Fix tests * Fix tests * Rework MediaViewer entry point. And ensure that the clicked image from the gallery is displayed first. * Ensure gallery item can be click in the pinned message list Improve the gallery item click handling code. * Improve code and fix separator color Closes #7101 * React on attachment item click Improve code * Improve code and support 0 items in gallery. * Fix click on attachment item not rendering anything. --------- Co-authored-by: Benoit Marty <benoitm@element.io> Co-authored-by: Benoit Marty <benoit@matrix.org> Co-authored-by: ElementBot <android@element.io>

github-actions · 2026-06-26T14:11:57Z

📱 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/SdXPCQ

…er mixed items.

codecov · 2026-06-26T15:08:04Z

Codecov Report

❌ Patch coverage is 78.98783% with 328 lines in your changes missing coverage. Please review.
✅ Project coverage is 80.55%. Comparing base (9e7ae34) to head (762823e).
⚠️ Report is 31 commits behind head on develop.

Files with missing lines	Patch %	Lines
...ctories/event/TimelineItemContentMessageFactory.kt	63.39%	8 Missing and 33 partials ⚠️
...braries/matrix/impl/media/GalleryItemInfoMapper.kt	0.00%	27 Missing ⚠️
...oid/libraries/matrix/impl/timeline/RustTimeline.kt	0.00%	18 Missing ⚠️
...s/impl/messagecomposer/MessageComposerPresenter.kt	29.16%	17 Missing ⚠️
...attachments/preview/AttachmentsPreviewPresenter.kt	86.79%	3 Missing and 11 partials ⚠️
...meline/components/event/TimelineItemGalleryView.kt	93.17%	2 Missing and 12 partials ⚠️
...droid/libraries/mediaupload/api/MediaUploadInfo.kt	22.22%	10 Missing and 4 partials ⚠️
...iewer/impl/datasource/TimelineMediaItemsFactory.kt	43.47%	10 Missing and 3 partials ⚠️
...braries/mediapickers/impl/DefaultPickerProvider.kt	0.00%	12 Missing ⚠️
...es/mediaviewer/impl/datasource/EventItemFactory.kt	87.09%	0 Missing and 12 partials ⚠️
... and 33 more

Additional details and impacted files

@@            Coverage Diff             @@
##           develop    #7112     +/-   ##
==========================================
  Coverage    80.55%   80.55%             
==========================================
  Files         2686     2701     +15     
  Lines        76357    77717   +1360     
  Branches     10271    10488    +217     
==========================================
+ Hits         61510    62606   +1096     
- Misses       10920    11059    +139     
- Partials      3927     4052    +125

☔ 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.

jmartinesp

I've reviewed the first few classes and I've found some issues, mainly with the 'per-item media quality selector' feature, it disables some optimizations and they don't seem to work well together overall.

I'll continue testing and reviewing tomorrow.

jmartinesp · 2026-06-29T15:38:46Z

-                !isApplyingImageEdits) {
-                if (mediaAttachment.localMedia.info.mimeType.isMimeTypeVideo() && mediaOptimizationSelectorState.videoSizeEstimations.dataOrNull() == null) {
-                    Timber.d("Waiting for video size estimations to be able to select the best video compression preset before pre-processing the media")
-                    return@LaunchedEffect
-                }


I think removing this may be breaking selecting the highest preset available automatically in the 'per-media' media quality feature. e.g. your video is short, so it fits in the HS max upload size in high quality (1080p) but instead standard (720p) is selected.

jmartinesp · 2026-06-29T15:42:33Z

+                            val config = MediaOptimizationConfig(
+                                compressImages = mediaOptimizationSelectorState.isImageOptimizationEnabled
+                                    ?: mediaOptimizationConfigProvider.get().compressImages,
+                                videoCompressionPreset = mediaOptimizationSelectorState.selectedVideoPreset
+                                    ?: mediaOptimizationConfigProvider.get().videoCompressionPreset,
                            )
+                            preprocessMediaJob = coroutineScope.launch(dispatchers.io) {
+                                preProcessAttachments(
+                                    attachments = attachmentsAndEdits.map { it.attachment },
+                                    mediaOptimizationConfig = config,
+                                    displayProgress = true,
+                                    sendActionState = sendActionState,
+                                )
+                            }


Why do we need to re-run the pre-processing? Shouldn't this already have happened or be happening and we should just wait for it to finish?

It was not happening and the application was stuck when the user clicked the send buton. I will check the code again

Maybe some of the changes broke something related to this, or maybe there's some case we didn't realise could cause this pre-processing to be cancelled 🤔 .

jmartinesp

Ok, here's another round of comments. I may have missed some stuff since the PR is huge, but I think once the issues with the per-item media quality feature are fixed, it should be mergeable.

…ampleMediaRenderer

bmarty · 2026-07-01T08:05:47Z

@jmartinesp I have pushed a few commits, but I'll do more user tests on my side.

jmartinesp

It seems to work pretty well now, thanks! Great job making it work with the per-item media quality. I added a couple of nits, but nothing important.

My main concern is that some other clients (like Element Web) don't seem to support this event type and there is no fallback version. I guess that's why it's behind a FF.

bmarty · 2026-07-03T07:54:05Z

Thanks for the review @jmartinesp . I have pushed a fix and take your remark into account.

I am wondering when sendAsFile is true if you should display the media quality selection. This is a bit out of scope of this PR, just sharing this point.

sonarqubecloud · 2026-07-03T08:07:40Z

Quality Gate passed

Issues
19 New issues
0 Accepted issues

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

See analysis details on SonarQube Cloud

bmarty added Record-Screenshots Runs the 'Record Screenshots' CI job and adds a commit with any new screenshots found. PR-Wip For anything that isn't ready to ship and will be enabled at a later date labels Jun 26, 2026

github-actions Bot removed the Record-Screenshots Runs the 'Record Screenshots' CI job and adds a commit with any new screenshots found. label Jun 26, 2026

ElementBot and others added 2 commits June 26, 2026 14:18

Update screenshots

e282212

Better fix to render all items in the gallery. Should be able to rend…

a7e6d8a

…er mixed items.

bmarty added 11 commits June 26, 2026 17:36

Fix sharing gallery from pinned event timeline.

b62242c

Fix regression on tests.

95e656c

Add missing test on TimelineItemContentMessageFactory

b2a7c65

Add missing test on EventItemFactory

1a5336e

Rename test class.

fb7bc50

Add unit test on GalleryMediaGalleryDataSource and simplify the code.

dd3beb1

Add unit test on TimelineEventContentMapper.

fd799a3

Revert change on TimelineItemVideoView, it was dead code.

ad84122

Preview: add video item in the list

73ef038

Remove duplicated fixtures.

c80eb12

Fix quality issues

79163b6

bmarty added the Record-Screenshots Runs the 'Record Screenshots' CI job and adds a commit with any new screenshots found. label Jun 29, 2026

github-actions Bot removed the Record-Screenshots Runs the 'Record Screenshots' CI job and adds a commit with any new screenshots found. label Jun 29, 2026

ElementBot and others added 2 commits June 29, 2026 10:04

Update screenshots

5f0461b

Fix name regarding naming convention

5d0d8be

bmarty marked this pull request as ready for review June 29, 2026 15:22

bmarty requested a review from a team as a code owner June 29, 2026 15:22

bmarty requested review from jmartinesp and removed request for a team June 29, 2026 15:22

jmartinesp reviewed Jun 29, 2026

View reviewed changes

jmartinesp reviewed Jun 30, 2026

View reviewed changes

Rename method to sendMedia

f91fd4b

bmarty added 7 commits June 30, 2026 11:50

Introduce derived state editedAttachments

96e1c93

Extract SingleItemPreviewRenderer, make it a class and rename it to S…

9934392

…ampleMediaRenderer

Restore previous code.

89b4722

Some renaming for clarity.

29743d3

Remove dead code.

5ca1435

Simplify code

16eec4d

[Gallery] Set media optimation user choice per media

6cce74d

jmartinesp approved these changes Jul 2, 2026

View reviewed changes

Comment thread .../kotlin/io/element/android/features/messages/impl/attachments/preview/SampleMediaRenderer.kt Outdated

Comment thread ...kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaItemsFactory.kt Outdated

bmarty added 3 commits July 3, 2026 09:49

Take user choice into consideration when pre-processing the media.

4566712

Optimize code

74f69b7

SampleMediaRenderer can be internal.

762823e

bmarty merged commit 8840e2f into develop Jul 3, 2026
32 of 34 checks passed

bmarty deleted the feature/bma/galleryMessages branch July 3, 2026 12:09

Uh oh!

Conversation

bmarty commented Jun 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

jmartinesp left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jmartinesp Jun 29, 2026

Choose a reason for hiding this comment

Uh oh!

jmartinesp Jun 29, 2026

Choose a reason for hiding this comment

Uh oh!

bmarty Jun 30, 2026

Choose a reason for hiding this comment

Uh oh!

jmartinesp Jun 30, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jmartinesp left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bmarty commented Jul 1, 2026

Uh oh!

jmartinesp left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

bmarty commented Jul 3, 2026

Uh oh!

sonarqubecloud Bot commented Jul 3, 2026

Quality Gate passed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

bmarty commented Jun 26, 2026 •

edited

Loading

github-actions Bot commented Jun 26, 2026 •

edited

Loading

codecov Bot commented Jun 26, 2026 •

edited

Loading