Skip to content

Commit a94be22

Browse files
authored
Merge pull request #334 from KryptKode/feat/group-sms
handle sending group SMS
2 parents 43d5a0f + 510dacb commit a94be22

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ class ThreadActivity : SimpleActivity() {
829829
transaction.setExplicitBroadcastForDeliveredSms(deliveredIntent)
830830

831831
refreshedSinceSent = false
832-
transaction.sendNewMessage(message, threadId)
832+
transaction.sendNewMessage(message)
833833
thread_type_message.setText("")
834834
attachmentSelections.clear()
835835
thread_attachments_holder.beGone()

app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,13 @@ fun Context.getMessages(threadId: Long, getImageResolutions: Boolean): ArrayList
103103
val thread = cursor.getLongValue(Sms.THREAD_ID)
104104
val subscriptionId = cursor.getIntValue(Sms.SUBSCRIPTION_ID)
105105
val status = cursor.getIntValue(Sms.STATUS)
106-
val phoneNumber = PhoneNumber(senderNumber, 0, "", senderNumber)
107-
val participant = SimpleContact(0, 0, senderName, photoUri, arrayListOf(phoneNumber), ArrayList(), ArrayList())
106+
val participants = senderNumber.split(" ").map { number ->
107+
val phoneNumber = PhoneNumber(number, 0, "", number)
108+
val participantPhoto = getNameAndPhotoFromPhoneNumber(number)
109+
SimpleContact(0, 0, participantPhoto.name, photoUri, arrayListOf(phoneNumber), ArrayList(), ArrayList())
110+
}
108111
val isMMS = false
109-
val message = Message(id, body, type, status, arrayListOf(participant), date, read, thread, isMMS, null, senderName, photoUri, subscriptionId)
112+
val message = Message(id, body, type, status, ArrayList(participants), date, read, thread, isMMS, null, senderName, photoUri, subscriptionId)
110113
messages.add(message)
111114
}
112115

app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/DirectReplyReceiver.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class DirectReplyReceiver : BroadcastReceiver() {
3535
transaction.setExplicitBroadcastForSentSms(smsSentIntent)
3636
transaction.setExplicitBroadcastForDeliveredSms(deliveredIntent)
3737

38-
transaction.sendNewMessage(message, threadId)
38+
transaction.sendNewMessage(message)
3939
} catch (e: Exception) {
4040
context.showErrorToast(e)
4141
}

app/src/main/kotlin/com/simplemobiletools/smsmessenger/services/HeadlessSmsSendService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class HeadlessSmsSendService : Service() {
3030
transaction.setExplicitBroadcastForSentSms(smsSentIntent)
3131
transaction.setExplicitBroadcastForDeliveredSms(deliveredIntent)
3232

33-
transaction.sendNewMessage(message, getThreadId(number))
33+
transaction.sendNewMessage(message)
3434
} catch (ignored: Exception) {
3535
}
3636

0 commit comments

Comments
 (0)