Merge pull request #289 from EveX1/feature/downsize-big-images

Downsize big images

app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt

@@ -677,6 +677,9 @@ class ThreadActivity : SimpleActivity() {
                     if (compressedUri != null) {
                         attachmentSelections[originalUriString] = AttachmentSelection(compressedUri, false)
                         loadAttachmentPreview(attachmentView, compressedUri)
+                    } else {
+                        toast(R.string.compress_error)
+                        removeAttachment(attachmentView, originalUriString)
                     }
                     checkSendMessageAvailability()
                     attachmentView.thread_attachment_progress.beGone()
@@ -690,11 +693,7 @@ class ThreadActivity : SimpleActivity() {
         val attachmentView = layoutInflater.inflate(R.layout.item_attachment, null).apply {
             thread_attachments_wrapper.addView(this)
             thread_remove_attachment.setOnClickListener {
-                thread_attachments_wrapper.removeView(this)
+                removeAttachment(this, originalUri)
-                attachmentSelections.remove(originalUri)
-                if (attachmentSelections.isEmpty()) {
-                    thread_attachments_holder.beGone()
-                }
             }
         }
 
@@ -733,6 +732,14 @@ class ThreadActivity : SimpleActivity() {
             .into(attachmentView.thread_attachment_preview)
     }
 
+    private fun removeAttachment(attachmentView: View, originalUri: String) {
+        thread_attachments_wrapper.removeView(attachmentView)
+        attachmentSelections.remove(originalUri)
+        if (attachmentSelections.isEmpty()) {
+            thread_attachments_holder.beGone()
+        }
+    }
+
     private fun checkSendMessageAvailability() {
         if (thread_type_message.text.isNotEmpty() || (attachmentSelections.isNotEmpty() && !attachmentSelections.values.any { it.isPending })) {
             thread_send_message.isClickable = true

app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/ImageCompressor.kt

@@ -38,9 +38,19 @@ class ImageCompressor(private val context: Context) {
                         val byteArray = contentResolver.openInputStream(uri)?.readBytes()!!
                         var destinationFile = File(outputDirectory, System.currentTimeMillis().toString().plus(mimeType.getExtensionFromMimeType()))
                         destinationFile.writeBytes(byteArray)
-                        val constraint = SizeConstraint(compressSize)
+                        val sizeConstraint = SizeConstraint(compressSize)
-                        while (constraint.isSatisfied(destinationFile).not()) {
+                        val bitmap = loadBitmap(destinationFile)
-                            destinationFile = constraint.satisfy(destinationFile)
+
+                        // if image weight > * 2 targeted size: cut down resolution by 2
+                        if (fileSize > 2 * compressSize) {
+                            val resConstraint = ResolutionConstraint(bitmap.width / 2, bitmap.height / 2)
+                            while (resConstraint.isSatisfied(destinationFile).not()) {
+                                destinationFile = resConstraint.satisfy(destinationFile)
+                            }
+                        }
+                        // do compression
+                        while (sizeConstraint.isSatisfied(destinationFile).not()) {
+                            destinationFile = sizeConstraint.satisfy(destinationFile)
                         }
                         callback.invoke(context.getMyFileUri(destinationFile))
                     } else {
@@ -106,7 +116,11 @@ class ImageCompressor(private val context: Context) {
         private var iteration: Int = 0
 
         fun isSatisfied(imageFile: File): Boolean {
-            return imageFile.length() <= maxFileSize || iteration >= maxIteration
+            // If size requirement is not met and maxIteration is reached
+            if(iteration >= maxIteration && imageFile.length() >= maxFileSize) {
+                throw Exception("Unable to compress image to targeted size")
+            }
+            return imageFile.length() <= maxFileSize
         }
 
         fun satisfy(imageFile: File): File {
@@ -116,4 +130,55 @@ class ImageCompressor(private val context: Context) {
         }
     }
 
+    private inner class ResolutionConstraint(private val width: Int, private val height: Int) {
+
+        private fun decodeSampledBitmapFromFile(imageFile: File, reqWidth: Int, reqHeight: Int): Bitmap {
+            return BitmapFactory.Options().run {
+                inJustDecodeBounds = true
+                BitmapFactory.decodeFile(imageFile.absolutePath, this)
+
+                inSampleSize = calculateInSampleSize(this, reqWidth, reqHeight)
+
+                inJustDecodeBounds = false
+                BitmapFactory.decodeFile(imageFile.absolutePath, this)
+            }
+        }
+
+        private fun calculateInSampleSize(options: BitmapFactory.Options, reqWidth: Int, reqHeight: Int): Int {
+            // Raw height and width of image
+            val (height: Int, width: Int) = options.run { outHeight to outWidth }
+            var inSampleSize = 1
+
+            if (height > reqHeight || width > reqWidth) {
+
+                val halfHeight: Int = height / 2
+                val halfWidth: Int = width / 2
+
+                // Calculate the largest inSampleSize value that is a power of 2 and keeps both
+                // height and width larger than the requested height and width.
+                while (halfHeight / inSampleSize >= reqHeight && halfWidth / inSampleSize >= reqWidth) {
+                    inSampleSize *= 2
+                }
+            }
+
+            return inSampleSize
+        }
+
+        fun isSatisfied(imageFile: File): Boolean {
+            return BitmapFactory.Options().run {
+                inJustDecodeBounds = true
+                BitmapFactory.decodeFile(imageFile.absolutePath, this)
+                calculateInSampleSize(this, width, height) <= 1
+            }
+        }
+
+        fun satisfy(imageFile: File): File {
+            return decodeSampledBitmapFromFile(imageFile, width, height).run {
+                determineImageRotation(imageFile, this).run {
+                    overWrite(imageFile, this)
+                }
+            }
+        }
+    }
+
 }

app/src/main/res/values-ar/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">تثبيت في الأعلى</string>
     <string name="unpin_conversation">ازالة التثبيت</string>
     <string name="forward_message">اعادة ارسال</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">محادثة جديدة</string>
     <string name="add_contact_or_number">إضافة جهة اتصال أو رقم …</string>

app/src/main/res/values-ca/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">Fixa a la part superior</string>
     <string name="unpin_conversation">No fixis</string>
     <string name="forward_message">Reenvia</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">Conversa nova</string>
     <string name="add_contact_or_number">Afegeix un contacte o número…</string>
@@ -74,4 +75,4 @@
     -->
     <string name="faq_2_text">La mida dels MMS està limitada pels operadors, podeu provar d\'establir un límit més petit a la configuració de l\'aplicació.</string>
     <string name="faq_2_title">L\'altre extrem no ha rebut el meu MMS, hi puc fer alguna cosa\?</string>
-</resources>
+</resources>

app/src/main/res/values-cs/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
     <string name="forward_message">Forward</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">Nová konverzace</string>
     <string name="add_contact_or_number">Přidejte kontakt nebo číslo…</string>

app/src/main/res/values-da/strings.xml

@@ -18,6 +18,7 @@
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
     <string name="forward_message">Forward</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
 
     <!-- New conversation -->
     <string name="new_conversation">Ny Samtale</string>

app/src/main/res/values-de/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">Oben anheften</string>
     <string name="unpin_conversation">Losheften</string>
     <string name="forward_message">Weiterleiten</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">Neuer Chat</string>
     <string name="add_contact_or_number">Kontakt oder Nummer hinzufügen …</string>

app/src/main/res/values-el/strings.xml

@@ -18,6 +18,7 @@
     <string name="pin_conversation">Καρφίτσωμα στην κορυφή</string>
     <string name="unpin_conversation">Ξεκαρφίτσωμα</string>
     <string name="forward_message">Προώθηση</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
 
     <!-- New conversation -->
     <string name="new_conversation">Νέα συνομιλία</string>

app/src/main/res/values-eo/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">Alpingli supren</string>
     <string name="unpin_conversation">Depingli</string>
     <string name="forward_message">Forward</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">New conversation</string>
     <string name="add_contact_or_number">Add Contact or Number…</string>

app/src/main/res/values-es/strings.xml

@@ -18,6 +18,7 @@
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
     <string name="forward_message">Forward</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
 
     <!-- New conversation -->
     <string name="new_conversation">Nueva conversación</string>

app/src/main/res/values-et/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Eemalda kinnitus</string>
     <string name="forward_message">Edasta</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">Uus vestlus</string>
     <string name="add_contact_or_number">Add Contact or Number…</string>
@@ -74,4 +75,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
+</resources>

app/src/main/res/values-fi/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
     <string name="forward_message">Forward</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">Uusi keskustelu</string>
     <string name="add_contact_or_number">Lisää yhteystieto tai numero…</string>

app/src/main/res/values-fr/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">Épingler en haut</string>
     <string name="unpin_conversation">Désépingler</string>
     <string name="forward_message">Transférer</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">Nouvelle conversation</string>
     <string name="add_contact_or_number">Ajouter un contact ou un numéro…</string>
@@ -75,4 +76,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
+</resources>

app/src/main/res/values-gl/strings.xml

@@ -18,6 +18,7 @@
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
     <string name="forward_message">Forward</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
 
     <!-- New conversation -->
     <string name="new_conversation">Nova conversa</string>

app/src/main/res/values-hu/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">Kitűzés fentre</string>
     <string name="unpin_conversation">Kitűzés megszüntetése</string>
     <string name="forward_message">Továbbítás</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">Új beszélgetés</string>
     <string name="add_contact_or_number">Névjegy vagy szám hozzáadása…</string>
@@ -74,4 +75,4 @@
     -->
     <string name="faq_2_title">A másik fél nem kapja meg az MMS-emet, tehetek valamit ez ellen\?</string>
     <string name="faq_2_text">Az MMS méretét korlátozzák a szolgáltatók, próbáljon kisebb korlátot beállítani az alkalmazásbeállításokban.</string>
-</resources>
+</resources>

app/src/main/res/values-id/strings.xml

@@ -18,6 +18,7 @@
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
     <string name="forward_message">Forward</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
 
     <!-- New conversation -->
     <string name="new_conversation">Percakapan baru</string>

app/src/main/res/values-it/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">Fissa in alto</string>
     <string name="unpin_conversation">Rimuovi</string>
     <string name="forward_message">Inoltra</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">Nuova conversazione</string>
     <string name="add_contact_or_number">Inserisci contatto o numero…</string>

app/src/main/res/values-ja/strings.xml

@@ -18,6 +18,7 @@
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
     <string name="forward_message">Forward</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
 
     <!-- New conversation -->
     <string name="new_conversation">新しい会話</string>

app/src/main/res/values-lt/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
     <string name="forward_message">Forward</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">Naujas pokalbis</string>
     <string name="add_contact_or_number">Pridėti kontaktą arba numerį…</string>
@@ -93,4 +94,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
+</resources>

app/src/main/res/values-ml/strings.xml

@@ -18,6 +18,7 @@
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
     <string name="forward_message">Forward</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
 
     <!-- New conversation -->
     <string name="new_conversation">പുതിയ സംഭാഷണം</string>

app/src/main/res/values-nb-rNO/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">Fest til toppen</string>
     <string name="unpin_conversation">Løsne</string>
     <string name="forward_message">Videresend</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">Ny samtale</string>
     <string name="add_contact_or_number">Legg til kontakt eller nummer …</string>

app/src/main/res/values-nl/strings.xml

@@ -18,6 +18,7 @@
     <string name="pin_conversation">Bovenaan vastzetten</string>
     <string name="unpin_conversation">Losmaken</string>
     <string name="forward_message">Doorsturen</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
 
     <!-- New conversation -->
     <string name="new_conversation">Nieuw gesprek</string>

app/src/main/res/values-pl/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">Przypnij na górze</string>
     <string name="unpin_conversation">Odepnij</string>
     <string name="forward_message">Przekaż dalej</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">Nowa rozmowa</string>
     <string name="add_contact_or_number">Dodaj kontakt lub numer…</string>
@@ -96,4 +97,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
+</resources>

app/src/main/res/values-pt/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">Fixar no topo</string>
     <string name="unpin_conversation">Desafixar</string>
     <string name="forward_message">Reencaminhar</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">Nova conversa</string>
     <string name="add_contact_or_number">Adicionar contacto ou número…</string>

app/src/main/res/values-ro/strings.xml

@@ -18,6 +18,7 @@
     <string name="pin_conversation">Fixare în vârf</string>
     <string name="unpin_conversation">Elimină fixarea</string>
     <string name="forward_message">Redirecţionare</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
 
     <!-- New conversation -->
     <string name="new_conversation">Conversaţie nouă</string>

app/src/main/res/values-ru/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">Закрепить сверху</string>
     <string name="unpin_conversation">Открепить</string>
     <string name="forward_message">Переслать</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">Новая переписка</string>
     <string name="add_contact_or_number">Добавить контакт или номер…</string>
@@ -96,4 +97,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
+</resources>

app/src/main/res/values-sk/strings.xml

@@ -18,6 +18,7 @@
     <string name="pin_conversation">Pripnúť na vrch</string>
     <string name="unpin_conversation">Odopnúť</string>
     <string name="forward_message">Preposlať</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
 
     <!-- New conversation -->
     <string name="new_conversation">Nová konverzácia</string>

app/src/main/res/values-ta/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">மேலே பொருத்தவும்</string>
     <string name="unpin_conversation">அன்பின்</string>
     <string name="forward_message">முன்னோக்கி</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">புதிய உரையாடல்</string>
     <string name="add_contact_or_number">தொடர்பு அல்லது எண்ணைச் சேர்க்கவும்…</string>

app/src/main/res/values-tr/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">En üste sabitle</string>
     <string name="unpin_conversation">Sabitlemeyi kaldır</string>
     <string name="forward_message">İlet</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">Yeni görüşme</string>
     <string name="add_contact_or_number">Kişi veya Numara Ekle…</string>
@@ -94,4 +95,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
+</resources>

app/src/main/res/values-uk/strings.xml

@@ -18,6 +18,7 @@
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
     <string name="forward_message">Forward</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
 
     <!-- New conversation -->
     <string name="new_conversation">Нове листування</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">置顶固定</string>
     <string name="unpin_conversation">取消固定</string>
     <string name="forward_message">转发</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">新的对话</string>
     <string name="add_contact_or_number">添加联系人或者号码…</string>
@@ -94,4 +95,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
+</resources>

app/src/main/res/values/strings.xml

@@ -19,6 +19,7 @@
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
     <string name="forward_message">Forward</string>
+    <string name="compress_error">Unable to compress image to selected size</string>
     <!-- New conversation -->
     <string name="new_conversation">New conversation</string>
     <string name="add_contact_or_number">Add Contact or Number…</string>