mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-28 21:48:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Better Kotlin code

Browse source
This commit is contained in:
Benoit Marty 2020-02-13 22:56:11 +01:00
parent e6bd09859f
commit b66b96899e
1 changed files with 20 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/UploadContentWorker.kt
View file

@ -88,18 +88,14 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
File(attachment.path)
} catch (e: Exception) {
Timber.e(e)
params.events
.mapNotNull { it.eventId }
.forEach {
contentUploadStateTracker.setFailure(it, e)
}
notifyTracker(params) { contentUploadStateTracker.setFailure(it, e) }
return Result.success(
WorkerParamsFactory.toData(params.copy(
lastFailureMessage = e.localizedMessage
))
)
}
.let {originalFile ->
.let { originalFile ->
if (attachment.type == ContentAttachmentData.Type.IMAGE) {
if (params.compressBeforeSending) {
Compressor.compress(context, originalFile) {
@ -135,22 +131,14 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
ThumbnailExtractor.extractThumbnail(params.attachment)?.let { thumbnailData ->
val thumbnailProgressListener = object : ProgressRequestBody.Listener {
override fun onProgress(current: Long, total: Long) {
params.events
.mapNotNull { it.eventId }
.forEach {
contentUploadStateTracker.setProgressThumbnail(it, current, total)
}
notifyTracker(params) { contentUploadStateTracker.setProgressThumbnail(it, current, total) }
}
}
try {
val contentUploadResponse = if (params.isRoomEncrypted) {
Timber.v("Encrypt thumbnail")
params.events
.mapNotNull { it.eventId }
.forEach {
contentUploadStateTracker.setEncryptingThumbnail(it)
}
notifyTracker(params) { contentUploadStateTracker.setEncryptingThumbnail(it) }
val encryptionResult = MXEncryptedAttachments.encryptAttachment(ByteArrayInputStream(thumbnailData.bytes), thumbnailData.mimeType)
uploadedThumbnailEncryptedFileInfo = encryptionResult.encryptedFileInfo
fileUploader.uploadByteArray(encryptionResult.encryptedByteArray,
@ -173,15 +161,13 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
val progressListener = object : ProgressRequestBody.Listener {
override fun onProgress(current: Long, total: Long) {
params.events
.mapNotNull { it.eventId }
.forEach {
if (isStopped) {
contentUploadStateTracker.setFailure(it, Throwable("Cancelled"))
} else {
contentUploadStateTracker.setProgress(it, current, total)
}
}
notifyTracker(params) {
if (isStopped) {
contentUploadStateTracker.setFailure(it, Throwable("Cancelled"))
} else {
contentUploadStateTracker.setProgress(it, current, total)
}
}
}
}
@ -190,11 +176,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
return try {
val contentUploadResponse = if (params.isRoomEncrypted) {
Timber.v("Encrypt file")
params.events
.mapNotNull { it.eventId }
.forEach {
contentUploadStateTracker.setEncrypting(it)
}
notifyTracker(params) { contentUploadStateTracker.setEncrypting(it) }
val encryptionResult = MXEncryptedAttachments.encryptAttachment(FileInputStream(attachmentFile), attachment.mimeType)
uploadedFileEncryptedFileInfo = encryptionResult.encryptedFileInfo
@ -219,11 +201,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
}
private fun handleFailure(params: Params, failure: Throwable): Result {
params.events
.mapNotNull { it.eventId }
.forEach {
contentUploadStateTracker.setFailure(it, failure)
}
notifyTracker(params) { contentUploadStateTracker.setFailure(it, failure) }
return Result.success(
WorkerParamsFactory.toData(
@ -241,11 +219,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
thumbnailEncryptedFileInfo: EncryptedFileInfo?,
newImageAttributes: NewImageAttributes?): Result {
Timber.v("handleSuccess $attachmentUrl, work is stopped $isStopped")
params.events
.mapNotNull { it.eventId }
.forEach {
contentUploadStateTracker.setSuccess(it)
}
notifyTracker(params) { contentUploadStateTracker.setSuccess(it) }
val updatedEvents = params.events
.map {
@ -273,6 +247,12 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
return event.copy(content = updatedContent.toContent())
}
private fun notifyTracker(params: Params, function: (String) -> Unit) {
params.events
.mapNotNull { it.eventId }
.forEach { eventId -> function.invoke(eventId) }
}
private fun MessageImageContent.update(url: String,
encryptedFileInfo: EncryptedFileInfo?,
newImageAttributes: NewImageAttributes?): MessageImageContent {