Persist sub id when sending sms messages
This commit is contained in:
parent
75bbd5ea0e
commit
e0787d7c83
2 changed files with 0 additions and 24 deletions
|
|
@ -1116,7 +1116,6 @@ class ThreadActivity : SimpleActivity() {
|
|||
val messageIds = messages.map { it.id }
|
||||
val message = getMessages(threadId, getImageResolutions = true, limit = 1).firstOrNull { it.id !in messageIds }
|
||||
if (message != null) {
|
||||
maybeUpdateMessageSubId(message)
|
||||
insertOrUpdateMessage(message)
|
||||
}
|
||||
}
|
||||
|
|
@ -1306,7 +1305,6 @@ class ThreadActivity : SimpleActivity() {
|
|||
}
|
||||
|
||||
messages.filter { !it.isScheduled && !it.isReceivedMessage() && it.id > lastMaxId }.forEach { latestMessage ->
|
||||
maybeUpdateMessageSubId(latestMessage)
|
||||
messagesDB.insertOrIgnore(latestMessage)
|
||||
}
|
||||
|
||||
|
|
@ -1316,18 +1314,6 @@ class ThreadActivity : SimpleActivity() {
|
|||
}
|
||||
}
|
||||
|
||||
@SuppressLint("MissingPermission")
|
||||
private fun maybeUpdateMessageSubId(message: Message) {
|
||||
// subscriptionIds seem to be not filled out at sending with multiple SIM cards, so fill it manually
|
||||
if ((subscriptionManagerCompat().activeSubscriptionInfoList?.size ?: 0) > 1) {
|
||||
val subscriptionId = availableSIMCards.getOrNull(currentSIMCardIndex)?.subscriptionId
|
||||
if (subscriptionId != null) {
|
||||
updateMessageSubscriptionId(message.id, subscriptionId)
|
||||
message.subscriptionId = subscriptionId
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun isMmsMessage(text: String): Boolean {
|
||||
val isGroupMms = participants.size > 1 && config.sendGroupMessageMMS
|
||||
val isLongMmsMessage = isLongMmsMessage(text) && config.sendLongMessageMMS
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue