fenix/Simple-SMS-Messenger
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git synced 2025-03-03 19:08:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid resetting conversation name in tmp threads

Browse Source
This commit is contained in:
Naveen 2023-02-28 19:10:11 +05:30
parent 83cdf0f623
commit c94b8852cd
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
View File

@ -298,6 +298,7 @@ class MainActivity : SimpleActivity() {
.forEach { message -> .forEach { message ->
messagesDB.insertOrUpdate(message.copy(threadId = newConversation.threadId)) messagesDB.insertOrUpdate(message.copy(threadId = newConversation.threadId))
} }
insertOrUpdateConversation(newConversation, cachedConversation)
} }
} }

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

@ -494,7 +494,7 @@ class ThreadActivity : SimpleActivity() {
if (messages.isNotEmpty() && messages.all { it.isScheduled }) { if (messages.isNotEmpty() && messages.all { it.isScheduled }) {
val scheduledMessage = messages.last() val scheduledMessage = messages.last()
val fakeThreadId = generateRandomId() val fakeThreadId = generateRandomId()
createTemporaryThread(scheduledMessage, fakeThreadId) createTemporaryThread(scheduledMessage, fakeThreadId, conversation)
updateScheduledMessagesThreadId(messages, fakeThreadId) updateScheduledMessagesThreadId(messages, fakeThreadId)
threadId = fakeThreadId threadId = fakeThreadId
} }
@ -1198,7 +1198,7 @@ class ThreadActivity : SimpleActivity() {
if (messages.isEmpty()) { if (messages.isEmpty()) {
// create a temporary thread until a real message is sent // create a temporary thread until a real message is sent
threadId = message.threadId threadId = message.threadId
createTemporaryThread(message, message.threadId) createTemporaryThread(message, message.threadId, conversation)
} }
val conversation = conversationsDB.getConversationWithThreadId(threadId) val conversation = conversationsDB.getConversationWithThreadId(threadId)
if (conversation != null) { if (conversation != null) {

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

@ -878,11 +878,17 @@ fun Context.subscriptionManagerCompat(): SubscriptionManager {
return getSystemService(SubscriptionManager::class.java) return getSystemService(SubscriptionManager::class.java)
} }
fun Context.insertOrUpdateConversation(conversation: Conversation) { fun Context.insertOrUpdateConversation(
val cachedConv = conversationsDB.getConversationWithThreadId(conversation.threadId) conversation: Conversation,
cachedConv: Conversation? = conversationsDB.getConversationWithThreadId(conversation.threadId)
) {
val updatedConv = if (cachedConv != null) { val updatedConv = if (cachedConv != null) {
val usesCustomTitle = cachedConv.usesCustomTitle val usesCustomTitle = cachedConv.usesCustomTitle
val title = if (usesCustomTitle) cachedConv.title else conversation.title val title = if (usesCustomTitle) {
cachedConv.title
} else {
conversation.title
}
conversation.copy(title = title, usesCustomTitle = usesCustomTitle) conversation.copy(title = title, usesCustomTitle = usesCustomTitle)
} else { } else {
conversation conversation
@ -900,21 +906,27 @@ fun Context.renameConversation(conversation: Conversation, newTitle: String): Co
return updatedConv return updatedConv
} }
fun Context.createTemporaryThread(message: Message, threadId: Long = generateRandomId()) { fun Context.createTemporaryThread(message: Message, threadId: Long = generateRandomId(), cachedConv: Conversation?) {
val simpleContactHelper = SimpleContactsHelper(this) val simpleContactHelper = SimpleContactsHelper(this)
val addresses = message.participants.getAddresses() val addresses = message.participants.getAddresses()
val photoUri = if (addresses.size == 1) simpleContactHelper.getPhotoUriFromPhoneNumber(addresses.first()) else "" val photoUri = if (addresses.size == 1) simpleContactHelper.getPhotoUriFromPhoneNumber(addresses.first()) else ""
val title = if (cachedConv != null && cachedConv.usesCustomTitle) {
cachedConv.title
} else {
message.participants.getThreadTitle()
}
val conversation = Conversation( val conversation = Conversation(
threadId = threadId, threadId = threadId,
snippet = message.body, snippet = message.body,
date = message.date, date = message.date,
read = true, read = true,
title = message.participants.getThreadTitle(), title = title,
photoUri = photoUri, photoUri = photoUri,
isGroupConversation = addresses.size > 1, isGroupConversation = addresses.size > 1,
phoneNumber = addresses.first(), phoneNumber = addresses.first(),
isScheduled = true isScheduled = true,
usesCustomTitle = cachedConv?.usesCustomTitle == true
) )
try { try {
conversationsDB.insertOrUpdate(conversation) conversationsDB.insertOrUpdate(conversation)