Content scanner (Element Pro): scan timeline events for unsafe content (#7159)
* Simplify how event content with captions are displayed The caption component will now be added in `TimelineItemEventContentView` instead of separately in each `TimelineItem__View` component * Make sure `CoilMediaFetcher` methods to fetch media throw errors We need to catch them later to check if the content scanner marked some thumbnails or medias as invalid/unsafe in `AsyncImage` instances * Add a `ContentScannerService` that allows us to manually scan a list of medias in an event and then update and store the results The results take the form of `ContentValidationValue`, stored in a `ContentValidationState` instance tied to the event * Create `EventContentValidationCache` to keep the `ContentValidationStates` for events in a room * Expose `EventContentValidationCache` to Compose using `LocalEventContentValidationState` Also add a couple of helper functions to avoid having to manually remember the states * Use the new components to display invalid content in the timeline items * Add `blurhash` to most media items so we can use it while validating the thumbnails/medias * Fix custom layout issues with screenshot and UI tests * Also check the validation state for replied-to events in the composer * Fix and add tests * Handle unrecoverable content validation errors too: display a 'not found' UI * Improve the performance of `EqualWidthColumn` for the single item case * Update screenshots --------- Co-authored-by: ElementBot <android@element.io>
This commit is contained in:
committed by
GitHub
parent
56cf00560e
commit
0d03472c60
+31
@@ -124,3 +124,34 @@ data class CallNotifyContent(
|
||||
) : EventContent
|
||||
|
||||
data object UnknownContent : EventContent
|
||||
|
||||
fun EventContent.isMediaContent(): Boolean {
|
||||
return when (this) {
|
||||
is MessageContent -> type is MessageTypeWithAttachment || type is GalleryMessageType
|
||||
is StickerContent -> true
|
||||
else -> false
|
||||
}
|
||||
}
|
||||
|
||||
fun EventContent.mediaSources(): List<MediaSource> {
|
||||
return when (this) {
|
||||
is MessageContent -> mediaSources()
|
||||
is StickerContent -> listOfNotNull(source, info.thumbnailSource)
|
||||
else -> emptyList()
|
||||
}
|
||||
}
|
||||
|
||||
fun MessageContent.mediaSources(): List<MediaSource> {
|
||||
return when (val messageType = type) {
|
||||
is MessageTypeWithAttachment -> when (messageType) {
|
||||
is ImageMessageType -> listOfNotNull(messageType.source, messageType.info?.thumbnailSource)
|
||||
is VideoMessageType -> listOfNotNull(messageType.source, messageType.info?.thumbnailSource)
|
||||
is AudioMessageType -> listOf(messageType.source)
|
||||
is VoiceMessageType -> listOf(messageType.source)
|
||||
is FileMessageType -> listOfNotNull(messageType.source, messageType.info?.thumbnailSource)
|
||||
else -> emptyList()
|
||||
}
|
||||
is GalleryMessageType -> messageType.items.flatMap { it.mediaSources() }
|
||||
else -> emptyList()
|
||||
}
|
||||
}
|
||||
|
||||
+8
@@ -115,6 +115,14 @@ sealed interface GalleryItemType {
|
||||
data class Video(val content: VideoMessageType) : GalleryItemType
|
||||
data class File(val content: FileMessageType) : GalleryItemType
|
||||
data class Other(val itemType: String, val body: String) : GalleryItemType
|
||||
|
||||
fun mediaSources(): List<MediaSource> = when (this) {
|
||||
is Image -> listOfNotNull(content.source, content.info?.thumbnailSource)
|
||||
is Audio -> listOf(content.source)
|
||||
is Video -> listOfNotNull(content.source, content.info?.thumbnailSource)
|
||||
is File -> listOfNotNull(content.source, content.info?.thumbnailSource)
|
||||
is Other -> emptyList()
|
||||
}
|
||||
}
|
||||
|
||||
data class OtherMessageType(
|
||||
|
||||
Reference in New Issue
Block a user