rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inject the context in the constructor

Browse Source
This commit is contained in:
Benoit Marty 2021-01-26 17:16:13 +01:00 committed by Benoit Marty
parent afa3149504
commit c794843bb2
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,9 +28,8 @@ import java.io.File
import java.util.UUID import java.util.UUID
import javax.inject.Inject import javax.inject.Inject
internal class ImageCompressor @Inject constructor() { internal class ImageCompressor @Inject constructor(private val context: Context) {
suspend fun compress( suspend fun compress(
context: Context,
imageFile: File, imageFile: File,
desiredWidth: Int, desiredWidth: Int,
desiredHeight: Int, desiredHeight: Int,
@ -46,7 +45,7 @@ internal class ImageCompressor @Inject constructor() {
} }
} ?: return@withContext imageFile } ?: return@withContext imageFile
val destinationFile = createDestinationFile(context) val destinationFile = createDestinationFile()
runCatching { runCatching {
destinationFile.outputStream().use { 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) return File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir)
} }
} }

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

@ -156,7 +156,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
// Do not compress gif // Do not compress gif
&& attachment.mimeType != MimeTypes.Gif && attachment.mimeType != MimeTypes.Gif
&& params.compressBeforeSending) { && 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 -> .also { compressedFile ->
// Get new Bitmap size // Get new Bitmap size
compressedFile.inputStream().use { compressedFile.inputStream().use {