Fix media viewer for medias not related to events displaying invalid state (#7280)

* When no URL is provided to `ContentValidationState.collectMediaState`, assume it's valid

That way we can do:

`if (validationState.isValid() && state.collectMediaState(possiblyNullUrl).isValid()) ...`

* Remove the `eventId` param from `ContentScannerService.scan`

It's not really used, since we then provide a state that can be mutated, and fetching that is what the previous parameter was used for

* Make sure to always validate the medias in the viewer, both the actual media and the thumbnail

* Update screenshots

---------

Co-authored-by: ElementBot <android@element.io>

features/contentscanner/api/src/main/kotlin/io/element/android/features/contentscanner/api/ContentScannerService.kt

@@ -7,17 +7,16 @@
 
 package io.element.android.features.contentscanner.api
 
-import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.scanner.ContentScanner
 import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
 
 /**
- * Service to perform security scans in the contents for a given event and media source.
+ * Service to perform security scans in the contents for a given media source.
  *
  * The default implementation (FOSS) always returns a valid state.
  * This will only process media when a [ContentScanner] is provided when building the client in Pro.
  */
 fun interface ContentScannerService {
-    fun scan(eventId: EventId, mediaSources: List<MediaSource>, contentValidationState: ContentValidationState)
+    fun scan(mediaSources: List<MediaSource>, contentValidationState: ContentValidationState)
 }

features/contentscanner/impl/src/main/kotlin/io/element/android/features/contentscanner/impl/DefaultContentScannerService.kt

@@ -9,7 +9,6 @@ package io.element.android.features.contentscanner.impl
 
 import io.element.android.features.contentscanner.api.ContentScannerService
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.exception.ClientException
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.scanner.ContentScanner
@@ -29,7 +28,7 @@ class DefaultContentScannerService(
 ) : ContentScannerService {
     private val dispatcher = coroutineDispatchers.io.limitedParallelism(4)
 
-    override fun scan(eventId: EventId, mediaSources: List<MediaSource>, contentValidationState: ContentValidationState) {
+    override fun scan(mediaSources: List<MediaSource>, contentValidationState: ContentValidationState) {
         for (mediaSource in mediaSources) {
             val url = mediaSource.safeUrl
             val currentState = contentValidationState.getCurrentMediaState(url)

features/contentscanner/impl/src/main/kotlin/io/element/android/features/contentscanner/impl/di/AlwaysValidContentScannerService.kt

@@ -8,7 +8,6 @@
 package io.element.android.features.contentscanner.impl.di
 
 import io.element.android.features.contentscanner.api.ContentScannerService
-import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationState
 import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
@@ -19,7 +18,7 @@ import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentVal
  * This is used when the content scanner feature is not enabled or available.
  */
 class AlwaysValidContentScannerService : ContentScannerService {
-    override fun scan(eventId: EventId, mediaSources: List<MediaSource>, contentValidationState: ContentValidationState) {
+    override fun scan(mediaSources: List<MediaSource>, contentValidationState: ContentValidationState) {
         // Always return success for the noop implementation
         for (mediaSource in mediaSources) {
             val url = mediaSource.safeUrl

features/contentscanner/impl/src/test/kotlin/io/element/android/features/contentscanner/impl/DefaultContentScannerServiceTest.kt

@@ -11,7 +11,6 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.scanner.ContentScanner
-import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.media.aMediaSource
 import io.element.android.libraries.matrix.test.scanner.FakeContentScanner
 import io.element.android.libraries.matrix.ui.media.contentvalidation.ContentValidationValue
@@ -39,7 +38,6 @@ class DefaultContentScannerServiceTest {
         createDefaultContentScannerService(
             contentScanner = scanner,
         ).scan(
-            eventId = AN_EVENT_ID,
             mediaSources = emptyList(),
             contentValidationState = contentValidationState,
         )
@@ -58,7 +56,6 @@ class DefaultContentScannerServiceTest {
         createDefaultContentScannerService(
             contentScanner = scanner,
         ).scan(
-            eventId = AN_EVENT_ID,
             mediaSources = listOf(mediaSource),
             contentValidationState = contentValidationState,
         )
@@ -87,7 +84,6 @@ class DefaultContentScannerServiceTest {
         createDefaultContentScannerService(
             contentScanner = scanner,
         ).scan(
-            eventId = AN_EVENT_ID,
             mediaSources = listOf(mediaSourceA, mediaSourceB),
             contentValidationState = contentValidationState,
         )
@@ -113,14 +109,12 @@ class DefaultContentScannerServiceTest {
 
         // First scan attempt
         service.scan(
-            eventId = AN_EVENT_ID,
             mediaSources = listOf(mediaSource),
             contentValidationState = contentValidationState,
         )
 
         // Immediately after, a new scan attempt is made for the same media source
         service.scan(
-            eventId = AN_EVENT_ID,
             mediaSources = listOf(mediaSource),
             contentValidationState = contentValidationState,
         )
@@ -144,7 +138,6 @@ class DefaultContentScannerServiceTest {
         )
 
         service.scan(
-            eventId = AN_EVENT_ID,
             mediaSources = listOf(mediaSource),
             contentValidationState = contentValidationState,
         )
@@ -166,7 +159,6 @@ class DefaultContentScannerServiceTest {
         )
 
         service.scan(
-            eventId = AN_EVENT_ID,
             mediaSources = listOf(mediaSource),
             contentValidationState = contentValidationState,
         )
@@ -191,7 +183,6 @@ class DefaultContentScannerServiceTest {
         )
 
         service.scan(
-            eventId = AN_EVENT_ID,
             mediaSources = listOf(mediaSource),
             contentValidationState = contentValidationState,
         )