Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

ThumbnailUtils.createImageThumbnail can throw IOException, and we can ignore it.

Browse source
This commit is contained in:
Benoit Marty 2023-12-19 10:47:31 +01:00
parent 58182d925a
commit 4cd3faf936
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/ThumbnailFactory.kt
View file

@ -34,7 +34,9 @@ import io.element.android.libraries.di.ApplicationContext
import io.element.android.libraries.matrix.api.media.ThumbnailInfo import io.element.android.libraries.matrix.api.media.ThumbnailInfo
import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider
import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.coroutines.suspendCancellableCoroutine
import timber.log.Timber
import java.io.File import java.io.File
import java.io.IOException
import javax.inject.Inject import javax.inject.Inject
import kotlin.coroutines.resume import kotlin.coroutines.resume
@ -65,11 +67,16 @@ class ThumbnailFactory @Inject constructor(
return createThumbnail { cancellationSignal -> return createThumbnail { cancellationSignal ->
// This API works correctly with GIF // This API works correctly with GIF
if (sdkIntProvider.isAtLeast(Build.VERSION_CODES.Q)) { if (sdkIntProvider.isAtLeast(Build.VERSION_CODES.Q)) {
ThumbnailUtils.createImageThumbnail( try {
file, ThumbnailUtils.createImageThumbnail(
Size(THUMB_MAX_WIDTH, THUMB_MAX_HEIGHT), file,
cancellationSignal Size(THUMB_MAX_WIDTH, THUMB_MAX_HEIGHT),
) cancellationSignal
)
} catch (ioException: IOException) {
Timber.w(ioException, "Failed to create thumbnail for $file")
null
}
} else { } else {
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
ThumbnailUtils.createImageThumbnail( ThumbnailUtils.createImageThumbnail(