ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 01:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor quicklook fixes. (#6112)

Browse Source 
* Only show a spinner when opening the media viewer is slow

* Keep a sent local echo's page in the media viewer

* Fix the caption visibility.

---------

Co-authored-by: Stefan Ceriu <stefan.ceriu@gmail.com>
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
This commit is contained in:
Doug
2026-09-08 09:40:43 +01:00
committed by GitHub
parent 1af16e92db
commit 15627e4512
4 changed files with 112 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/FilePreviewScreen/TimelineMediaPreviewDataSource.swift
+18 -4
View File
@@ -112,8 +112,9 @@ class TimelineMediaPreviewDataSource: NSObject, QLPreviewControllerDataSource {
.flatMap { $0.previewableMedia(allowedGalleryItemTypes: allowedGalleryItemTypes) }
.map { newItem in
// If an item already exists use that instead to preserve the file handle, download error etc.
if let oldItem = previewItems.first(where: { $0.id == newItem.id }) {
if let oldItem = previewItems.first(where: { $0.id == newItem.id || $0.isLocalEcho(of: newItem) }) {
oldItem.content = newItem.content
oldItem.id = newItem.id // Make sure a local echo's transaction ID → event ID.
return oldItem
}
@@ -237,9 +238,22 @@ enum TimelineMediaPreviewItem: Equatable {
var downloadError: Error?
/// A stable identifier that's unique per preview item — including individual gallery
/// attachments that would otherwise share their parent event's ID.
let id: MediaPreviewItemID
/// A stable identifier that's unique per preview item, even for gallery attachments that would
/// otherwise share their parent event's ID. Not stable for local echoes however, those will
/// transition from transaction ID to event ID once sent.
fileprivate(set) var id: MediaPreviewItemID
/// Whether this is the local echo that `sentItem` is the remote echo of. Sending swaps the
/// transaction ID for an event ID but the unique ID remains stable.
fileprivate func isLocalEcho(of sentItem: Media) -> Bool {
guard timelineItem.id.transactionID != nil, sentItem.timelineItem.id.eventID != nil,
timelineItem.id.uniqueID == sentItem.timelineItem.id.uniqueID else { return false }
switch (content, sentItem.content) {
case (.timelineItem, .timelineItem): return true
case (.galleryItem(_, let item), .galleryItem(_, let sentGalleryItem)): return item.id.mediaIndex == sentGalleryItem.id.mediaIndex
default: return false
}
}
init(timelineItem: EventBasedMessageTimelineItemProtocol) {
content = .timelineItem(timelineItem)