jeena/sms-translate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix conversation dates on import

Browse source 
When we insert a message, Android's Telephony provider sets the
conversation date to the current time rather than the time of the
message that was inserted.[1] This commit implements a workaround that
fixes the conversation timestamps.

Fixes #146, #42.

[1] https://android.googlesource.com/platform/packages/providers/TelephonyProvider/+/android14-release/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java#134
This commit is contained in:
Tom Levy 2024-03-23 10:51:17 +00:00
parent bfd5450435
commit 3ad36c0021
2 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/kotlin/org/fossify/messages/helpers/MessagesImporter.kt
View file

@ -96,6 +96,7 @@ class MessagesImporter(private val activity: SimpleActivity) {
messagesFailed++ messagesFailed++
} }
} }
messageWriter.fixCoversationDates()
refreshMessages() refreshMessages()
} catch (e: Exception) { } catch (e: Exception) {
activity.showErrorToast(e) activity.showErrorToast(e)

16
app/src/main/kotlin/org/fossify/messages/helpers/MessagesWriter.kt
View file

@ -11,6 +11,7 @@ import com.klinker.android.send_message.Utils
import org.fossify.commons.extensions.getLongValue import org.fossify.commons.extensions.getLongValue
import org.fossify.commons.extensions.queryCursor import org.fossify.commons.extensions.queryCursor
import org.fossify.commons.helpers.isRPlus import org.fossify.commons.helpers.isRPlus
import org.fossify.messages.extensions.updateLastConversationMessage
import org.fossify.messages.models.MmsAddress import org.fossify.messages.models.MmsAddress
import org.fossify.messages.models.MmsBackup import org.fossify.messages.models.MmsBackup
import org.fossify.messages.models.MmsPart import org.fossify.messages.models.MmsPart
@ -19,12 +20,14 @@ import org.fossify.messages.models.SmsBackup
class MessagesWriter(private val context: Context) { class MessagesWriter(private val context: Context) {
private val INVALID_ID = -1L private val INVALID_ID = -1L
private val contentResolver = context.contentResolver private val contentResolver = context.contentResolver
private val modifiedThreadIds = mutableSetOf<Long>()
fun writeSmsMessage(smsBackup: SmsBackup) { fun writeSmsMessage(smsBackup: SmsBackup) {
val contentValues = smsBackup.toContentValues() val contentValues = smsBackup.toContentValues()
val threadId = Utils.getOrCreateThreadId(context, smsBackup.address) val threadId = Utils.getOrCreateThreadId(context, smsBackup.address)
contentValues.put(Sms.THREAD_ID, threadId) contentValues.put(Sms.THREAD_ID, threadId)
if (!smsExist(smsBackup)) { if (!smsExist(smsBackup)) {
modifiedThreadIds.add(threadId)
contentResolver.insert(Sms.CONTENT_URI, contentValues) contentResolver.insert(Sms.CONTENT_URI, contentValues)
} }
} }
@ -50,6 +53,7 @@ class MessagesWriter(private val context: Context) {
if (threadId != INVALID_ID) { if (threadId != INVALID_ID) {
contentValues.put(Mms.THREAD_ID, threadId) contentValues.put(Mms.THREAD_ID, threadId)
if (!mmsExist(mmsBackup)) { if (!mmsExist(mmsBackup)) {
modifiedThreadIds.add(threadId)
contentResolver.insert(Mms.CONTENT_URI, contentValues) contentResolver.insert(Mms.CONTENT_URI, contentValues)
} }
val messageId = getMmsId(mmsBackup) val messageId = getMmsId(mmsBackup)
@ -152,4 +156,16 @@ class MessagesWriter(private val context: Context) {
} }
return exists return exists
} }
/** Fixes the timestamps of all conversations modified by previous writes. */
fun fixCoversationDates() {
// This method should be called after messages are written, to set the correct conversation
// timestamps.
//
// It is necessary because when we insert a message, Android's Telephony provider sets the
// conversation date to the current time rather than the time of the message that was
// inserted. Source code reference:
// https://android.googlesource.com/platform/packages/providers/TelephonyProvider/+/android14-release/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java#134
context.updateLastConversationMessage(modifiedThreadIds)
}
} }