Merge pull request #1274 from session-foundation/fix/store-issues

Capturing exception thrown while uploading attachments

Author: ThomasSession

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -183,6 +183,7 @@ import org.thoughtcrime.securesms.mms.AudioSlide
 import org.thoughtcrime.securesms.mms.GifSlide
 import org.thoughtcrime.securesms.mms.ImageSlide
 import org.thoughtcrime.securesms.mms.MediaConstraints
+import org.thoughtcrime.securesms.mms.MmsException
 import org.thoughtcrime.securesms.mms.Slide
 import org.thoughtcrime.securesms.mms.SlideDeck
 import org.thoughtcrime.securesms.mms.VideoSlide
@@ -2092,25 +2093,36 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
 
         // do the heavy work in the bg
         lifecycleScope.launch(Dispatchers.Default) {
-            // Put the message in the database and send it
-            message.id = MessageId(mmsDb.insertMessageOutbox(
-                outgoingTextMessage,
-                viewModel.threadId,
-                false,
-                runThreadUpdate = true
-            ), mms = true)
+            runCatching {
+                // Put the message in the database and send it
+                message.id = MessageId(
+                    mmsDb.insertMessageOutbox(
+                        outgoingTextMessage,
+                        viewModel.threadId,
+                        false,
+                        runThreadUpdate = true
+                    ), mms = true
+                )
 
-            if (deleteAttachmentFilesAfterSave) {
-                attachments
-                    .asSequence()
-                    .mapNotNull { a -> a.dataUri?.takeIf { it.scheme == "file" }?.path?.let(::File) }
-                    .filter { it.exists() }
-                    .forEach { it.delete() }
-            }
+                if (deleteAttachmentFilesAfterSave) {
+                    attachments
+                        .asSequence()
+                        .mapNotNull { a -> a.dataUri?.takeIf { it.scheme == "file" }?.path?.let(::File) }
+                        .filter { it.exists() }
+                        .forEach { it.delete() }
+                }
 
-            waitForApprovalJobToBeSubmitted()
+                waitForApprovalJobToBeSubmitted()
 
-            MessageSender.send(message, recipient.address, quote, linkPreview)
+                MessageSender.send(message, recipient.address, quote, linkPreview)
+            }.onFailure {
+                withContext(Dispatchers.Main){
+                    when (it) {
+                        is MmsException -> Toast.makeText(this@ConversationActivityV2, R.string.attachmentsErrorSending, Toast.LENGTH_LONG).show()
+                        else -> Toast.makeText(this@ConversationActivityV2, R.string.errorGeneric, Toast.LENGTH_LONG).show()
+                    }
+                }
+            }
         }
 
         // Send a typing stopped message