From 5dac7404d3210f8b4d639dca2f4df8570461ba42 Mon Sep 17 00:00:00 2001
From: Moez Bhatti <moez.bhatti@gmail.com>
Date: Mon, 2 Dec 2019 23:41:25 -0500
Subject: [PATCH] Fix MMS appearing to have sent but not going through

Closes #1528
---
 .../java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt
index c25e857e..e7467912 100644
--- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt
@@ -50,6 +50,7 @@ import com.moez.QKSMS.receiver.SendSmsReceiver
 import com.moez.QKSMS.receiver.SmsDeliveredReceiver
 import com.moez.QKSMS.receiver.SmsSentReceiver
 import com.moez.QKSMS.util.ImageUtils
+import com.moez.QKSMS.util.PhoneNumberUtils
 import com.moez.QKSMS.util.Preferences
 import com.moez.QKSMS.util.tryOrNull
 import io.realm.Case
@@ -70,6 +71,7 @@ class MessageRepositoryImpl @Inject constructor(
     private val context: Context,
     private val imageRepository: ImageRepository,
     private val messageIds: KeyManager,
+    private val phoneNumberUtils: PhoneNumberUtils,
     private val prefs: Preferences,
     private val syncRepository: SyncRepository
 ) : MessageRepository {
@@ -337,7 +339,9 @@ class MessageRepositoryImpl @Inject constructor(
                     .map { attachment -> attachment.vCard.toByteArray() }
                     .map { vCard -> MMSPart("contact", ContentType.TEXT_VCARD, vCard) }
 
-            Transaction(context).sendNewMessage(subId, threadId, addresses, parts, null, null)
+            val transaction = Transaction(context)
+            val recipients = addresses.map(phoneNumberUtils::normalizeNumber)
+            transaction.sendNewMessage(subId, threadId, recipients, parts, null, null)
         }
     }