Support compressing images on Android 10 and above.

CHANGES.md

@@ -13,7 +13,7 @@ Bugfix 🐛:
  - Incomplete predicate in RealmCryptoStore#getOutgoingRoomKeyRequest (#1519)
  - User could not redact message that they have sent (#1543)
  - Use vendor prefix for non merged MSC (#1537)
- - Compress images before sending (for devices below Android 10) (#1333)
+ - Compress images before sending (#1333)
 
 Translations 🗣:
  -

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

@@ -18,7 +18,6 @@ package im.vector.matrix.android.internal.session.content
 
 import android.content.Context
 import android.graphics.BitmapFactory
-import android.os.Build
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
@@ -43,6 +42,7 @@ import im.vector.matrix.android.internal.worker.getSessionComponent
 import timber.log.Timber
 import java.io.ByteArrayInputStream
 import java.io.File
+import java.io.FileInputStream
 import java.io.FileOutputStream
 import java.util.UUID
 import javax.inject.Inject
@@ -161,70 +161,58 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                 var uploadedFileEncryptedFileInfo: EncryptedFileInfo? = null
 
                 return try {
-                    // Temporary disable compressing for Android 10 and above.
+                    var cacheFile = File.createTempFile(attachment.name ?: UUID.randomUUID().toString(), ".jpg", context.cacheDir)
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    cacheFile.parentFile?.mkdirs()
-                        val contentUploadResponse = if (params.isEncrypted) {
+                    if (cacheFile.exists()) {
-                            Timber.v("Encrypt file")
+                        cacheFile.delete()
-                            notifyTracker(params) { contentUploadStateTracker.setEncrypting(it) }
-
-                            val encryptionResult = MXEncryptedAttachments.encryptAttachment(inputStream, attachment.getSafeMimeType())
-                            uploadedFileEncryptedFileInfo = encryptionResult.encryptedFileInfo
-
-                            fileUploader
-                                    .uploadByteArray(encryptionResult.encryptedByteArray, attachment.name, "application/octet-stream", progressListener)
-                        } else {
-                            fileUploader
-                                    .uploadByteArray(inputStream.readBytes(), attachment.name, attachment.getSafeMimeType(), progressListener)
-                        }
-                        handleSuccess(params,
-                                contentUploadResponse.contentUri,
-                                uploadedFileEncryptedFileInfo,
-                                uploadedThumbnailUrl,
-                                uploadedThumbnailEncryptedFileInfo,
-                                newImageAttributes)
-                    } else {
-                        val cacheFile = File.createTempFile(attachment.name ?: UUID.randomUUID().toString(), ".jpg", context.cacheDir)
-                        cacheFile.parentFile?.mkdirs()
-                        if (cacheFile.exists()) {
-                            cacheFile.delete()
-                        }
-                        cacheFile.createNewFile()
-                        cacheFile.deleteOnExit()
-
-                        val outputStream = FileOutputStream(cacheFile)
-                        outputStream.use {
-                            inputStream.copyTo(outputStream)
-                        }
-
-                        val contentUploadResponse = if (attachment.type == ContentAttachmentData.Type.IMAGE && params.compressBeforeSending) {
-                            Compressor.compress(context, cacheFile) {
-                                default(
-                                        width = MAX_IMAGE_SIZE,
-                                        height = MAX_IMAGE_SIZE
-                                )
-                            }.also { compressedFile ->
-                                val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
-                                BitmapFactory.decodeFile(compressedFile.absolutePath, options)
-                                val fileSize = compressedFile.length().toInt()
-                                newImageAttributes = NewImageAttributes(
-                                        options.outWidth,
-                                        options.outHeight,
-                                        fileSize
-                                )
-                            }.let { compressedFile ->
-                                fileUploader.uploadFile(compressedFile, attachment.name, attachment.getSafeMimeType(), progressListener)
-                            }
-                        } else {
-                            fileUploader.uploadFile(cacheFile, attachment.name, attachment.getSafeMimeType(), progressListener)
-                        }
-
-                        handleSuccess(params,
-                                contentUploadResponse.contentUri,
-                                uploadedFileEncryptedFileInfo,
-                                uploadedThumbnailUrl,
-                                uploadedThumbnailEncryptedFileInfo,
-                                newImageAttributes)
                     }
+                    cacheFile.createNewFile()
+                    cacheFile.deleteOnExit()
+
+                    val outputStream = FileOutputStream(cacheFile)
+                    outputStream.use {
+                        inputStream.copyTo(outputStream)
+                    }
+
+                    if (attachment.type == ContentAttachmentData.Type.IMAGE && params.compressBeforeSending) {
+                        cacheFile = Compressor.compress(context, cacheFile) {
+                            default(
+                                    width = MAX_IMAGE_SIZE,
+                                    height = MAX_IMAGE_SIZE
+                            )
+                        }.also { compressedFile ->
+                            val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+                            BitmapFactory.decodeFile(compressedFile.absolutePath, options)
+                            val fileSize = compressedFile.length().toInt()
+                            newImageAttributes = NewImageAttributes(
+                                    options.outWidth,
+                                    options.outHeight,
+                                    fileSize
+                            )
+                        }
+                    }
+
+                    val contentUploadResponse = if (params.isEncrypted) {
+                        Timber.v("Encrypt file")
+                        notifyTracker(params) { contentUploadStateTracker.setEncrypting(it) }
+
+                        val encryptionResult = MXEncryptedAttachments.encryptAttachment(FileInputStream(cacheFile), attachment.getSafeMimeType())
+                        uploadedFileEncryptedFileInfo = encryptionResult.encryptedFileInfo
+
+                        fileUploader
+                                .uploadByteArray(encryptionResult.encryptedByteArray, attachment.name, "application/octet-stream", progressListener)
+                    } else {
+                        fileUploader
+                                .uploadFile(cacheFile, attachment.name, attachment.getSafeMimeType(), progressListener)
+                    }
+
+                    handleSuccess(params,
+                            contentUploadResponse.contentUri,
+                            uploadedFileEncryptedFileInfo,
+                            uploadedThumbnailUrl,
+                            uploadedThumbnailEncryptedFileInfo,
+                            newImageAttributes)
+
                 } catch (t: Throwable) {
                     Timber.e(t)
                     handleFailure(params, t)

vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewFragment.kt

@@ -21,7 +21,6 @@ import android.app.Activity.RESULT_CANCELED
 import android.app.Activity.RESULT_OK
 import android.content.Intent
 import android.graphics.Color
-import android.os.Build
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.Menu
@@ -144,12 +143,6 @@ class AttachmentsPreviewFragment @Inject constructor(
             attachmentPreviewerBigList.scrollToPosition(state.currentAttachmentIndex)
             attachmentPreviewerMiniatureList.scrollToPosition(state.currentAttachmentIndex)
             attachmentPreviewerSendImageOriginalSize.text = resources.getQuantityString(R.plurals.send_images_with_original_size, state.attachments.size)
-
-            // Temporary disable compressing for Android 10 and above.
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                attachmentPreviewerSendImageOriginalSize.isChecked = true
-                attachmentPreviewerSendImageOriginalSize.isEnabled = false
-            }
         }
     }