From c794843bb25ad5d29b0fe2597adc1517002f5517 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 26 Jan 2021 17:16:13 +0100 Subject: [PATCH] Inject the context in the constructor --- .../sdk/internal/session/content/ImageCompressor.kt | 7 +++---- .../sdk/internal/session/content/UploadContentWorker.kt | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt index 6cf65b867c..1d6cd61060 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt @@ -28,9 +28,8 @@ import java.io.File import java.util.UUID import javax.inject.Inject -internal class ImageCompressor @Inject constructor() { +internal class ImageCompressor @Inject constructor(private val context: Context) { suspend fun compress( - context: Context, imageFile: File, desiredWidth: Int, desiredHeight: Int, @@ -46,7 +45,7 @@ internal class ImageCompressor @Inject constructor() { } } ?: return@withContext imageFile - val destinationFile = createDestinationFile(context) + val destinationFile = createDestinationFile() runCatching { destinationFile.outputStream().use { @@ -118,7 +117,7 @@ internal class ImageCompressor @Inject constructor() { } } - private fun createDestinationFile(context: Context): File { + private fun createDestinationFile(): File { return File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir) } } diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt index 672d407d25..3b727690bf 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt @@ -156,7 +156,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter // Do not compress gif && attachment.mimeType != MimeTypes.Gif && params.compressBeforeSending) { - fileToUpload = imageCompressor.compress(context, workingFile, MAX_IMAGE_SIZE, MAX_IMAGE_SIZE) + fileToUpload = imageCompressor.compress(workingFile, MAX_IMAGE_SIZE, MAX_IMAGE_SIZE) .also { compressedFile -> // Get new Bitmap size compressedFile.inputStream().use {