From 04505696179e8eab8e8fe5f8fde585da30dec4b9 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 27 Feb 2018 22:31:58 -0500 Subject: [PATCH] Apply max mms size to entire message instead of every attachment --- qksms/src/main/java/interactor/SendMessage.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/qksms/src/main/java/interactor/SendMessage.kt b/qksms/src/main/java/interactor/SendMessage.kt index 1a8195b6..f719a97f 100644 --- a/qksms/src/main/java/interactor/SendMessage.kt +++ b/qksms/src/main/java/interactor/SendMessage.kt @@ -55,9 +55,14 @@ class SendMessage @Inject constructor( val settings = Settings() val message = Message(body, addresses.toTypedArray()) - attachments - .map { uri -> RxImageConverters.uriToBitmap(context, uri).blockingFirst() } - .map { bitmap -> shrink(bitmap, prefs.mmsSize.get() * 1024) } + val bitmaps = attachments.map { uri -> RxImageConverters.uriToBitmap(context, uri).blockingFirst() } + val totalBytes = bitmaps.sumBy { it.allocationByteCount } + + bitmaps + .map { bitmap -> + val byteRatio = bitmap.allocationByteCount / totalBytes.toFloat() + shrink(bitmap, (prefs.mmsSize.get() * 1024 * byteRatio).toInt()) + } .forEach { bitmap -> message.addMedia(bitmap, "image/jpeg") } val transaction = Transaction(context, settings)