Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Also test the effect of completeExceptionally()

Browse Source
This commit is contained in:
Benoit Marty 2021-05-05 11:12:06 +02:00
parent 62207f02f0
commit 590d8fc849
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
View File

@ -210,7 +210,8 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
.also { filesToDelete.add(it) }
}
VideoCompressionResult.CompressionNotNeeded,
VideoCompressionResult.CompressionCancelled -> {
VideoCompressionResult.CompressionCancelled,
is VideoCompressionResult.CompressionFailed -> {
workingFile
}
}
@ -380,7 +381,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
val updatedContent = when (messageContent) {
is MessageImageContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes)
is MessageVideoContent -> messageContent.update(url, encryptedFileInfo, thumbnailUrl, thumbnailEncryptedFileInfo, newAttachmentAttributes)
is MessageFileContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes.newFileSize)
is MessageFileContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes.newFileSize)
is MessageAudioContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes.newFileSize)
else -> messageContent
}

1
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressionResult.kt
View File

@ -22,4 +22,5 @@ internal sealed class VideoCompressionResult {
data class Success(val compressedFile: File) : VideoCompressionResult()
object CompressionNotNeeded : VideoCompressionResult()
object CompressionCancelled : VideoCompressionResult()
data class CompressionFailed(val failure: Throwable) : VideoCompressionResult()
}

29
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
View File

@ -42,6 +42,7 @@ internal class VideoCompressor @Inject constructor(private val context: Context)
progressListener?.onProgress(0, 100)
var result: Int = -1
var failure: Throwable? = null
Transcoder.into(destinationFile.path)
.addDataSource(videoFile.path)
.setListener(object : TranscoderListener {
@ -63,6 +64,7 @@ internal class VideoCompressor @Inject constructor(private val context: Context)
override fun onTranscodeFailed(exception: Throwable) {
Timber.w(exception, "Compressing: failure")
failure = exception
job.completeExceptionally(exception)
}
})
@ -70,13 +72,23 @@ internal class VideoCompressor @Inject constructor(private val context: Context)
job.join()
// Note: job is also cancelled if completeExceptionally() was called
if (job.isCancelled) {
Timber.w("Compressing: Job cancelled")
// Delete now the temporary file
deleteFile(destinationFile)
// We do not throw a CancellationException, because it's not critical, we will try to send the original file
// Anyway this should never occurs, since we never cancel the return value of transcode()
return VideoCompressionResult.CompressionCancelled
return when (val finalFailure = failure) {
null -> {
// We do not throw a CancellationException, because it's not critical, we will try to send the original file
// Anyway this should never occurs, since we never cancel the return value of transcode()
Timber.w("Compressing: A failure occurred")
VideoCompressionResult.CompressionCancelled
}
else -> {
// Compression failure can also be considered as not critical, but let the caller decide
Timber.w("Compressing: Job cancelled")
VideoCompressionResult.CompressionFailed(finalFailure)
}
}
}
progressListener?.onProgress(100, 100)
@ -90,8 +102,13 @@ internal class VideoCompressor @Inject constructor(private val context: Context)
deleteFile(destinationFile)
VideoCompressionResult.CompressionNotNeeded
}
else ->
throw IllegalStateException("Unknown result: $result")
else -> {
// Should not happen...
// Delete now the temporary file
deleteFile(destinationFile)
Timber.w("Unknown result: $result")
VideoCompressionResult.CompressionFailed(IllegalStateException("Unknown result: $result"))
}
}
}