Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-28 13:48:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix backup export/import of quote mentions.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-01-24 10:38:16 -05:00
parent a47714d700
commit 252b1dbb2d
19 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
View File

@@ -940,13 +940,15 @@ private fun BackupMessageRecord.toRemoteQuote(mediaArchiveEnabled: Boolean, atta
QuoteModel.Type.GIFT_BADGE -> Quote.Type.GIFT_BADGE
}
val bodyRanges = this.quoteBodyRanges?.toRemoteBodyRanges(dateSent) ?: emptyList()
return Quote(
targetSentTimestamp = this.quoteTargetSentTimestamp.takeIf { !this.quoteMissing && it != MessageTable.QUOTE_TARGET_MISSING_ID }?.clampToValidBackupRange(),
authorId = this.quoteAuthor,
text = this.quoteBody?.let { body ->
Text(
body = body,
bodyRanges = this.quoteBodyRanges?.toRemoteBodyRanges(this.dateSent) ?: emptyList()
bodyRanges = bodyRanges
)
},
attachments = if (remoteType == Quote.Type.VIEW_ONCE) {

45
app/src/main/java/org/thoughtcrime/securesms/backup/v2/importer/ChatItemArchiveImporter.kt
View File

@@ -383,23 +383,10 @@ class ChatItemArchiveImporter(
}
if (this.standardMessage != null) {
val bodyRanges = this.standardMessage.text?.bodyRanges
if (!bodyRanges.isNullOrEmpty()) {
val mentions = bodyRanges.filter { it.mentionAci != null && it.start != null && it.length != null }
.mapNotNull {
val aci = ServiceId.ACI.parseOrNull(it.mentionAci!!)
if (aci != null && !aci.isUnknown) {
val id = RecipientId.from(aci)
Mention(id, it.start!!, it.length!!)
} else {
null
}
}
if (mentions.isNotEmpty()) {
followUps += { messageId ->
SignalDatabase.mentions.insert(threadId, messageId, mentions)
}
val mentions = this.standardMessage.text?.bodyRanges.filterToLocalMentions()
if (mentions.isNotEmpty()) {
followUps += { messageId ->
SignalDatabase.mentions.insert(threadId, messageId, mentions)
}
}
val linkPreviews = this.standardMessage.linkPreview.map { it.toLocalLinkPreview() }
@@ -929,7 +916,7 @@ class ChatItemArchiveImporter(
this.put(MessageTable.QUOTE_AUTHOR, importState.requireLocalRecipientId(quote.authorId).serialize())
this.put(MessageTable.QUOTE_BODY, quote.text?.body)
this.put(MessageTable.QUOTE_TYPE, quote.type.toLocalQuoteType())
this.put(MessageTable.QUOTE_BODY_RANGES, quote.text?.bodyRanges?.toLocalBodyRanges()?.encode())
this.put(MessageTable.QUOTE_BODY_RANGES, quote.text?.bodyRanges?.toLocalBodyRanges(includeMentions = true)?.encode())
this.put(MessageTable.QUOTE_MISSING, (quote.targetSentTimestamp == null).toInt())
}
@@ -983,13 +970,13 @@ class ChatItemArchiveImporter(
}
}
private fun List<BodyRange>.toLocalBodyRanges(): BodyRangeList? {
private fun List<BodyRange>.toLocalBodyRanges(includeMentions: Boolean = false): BodyRangeList? {
if (this.isEmpty()) {
return null
}
return BodyRangeList(
ranges = this.filter { it.mentionAci == null }.map { bodyRange ->
ranges = this.filter { includeMentions || it.mentionAci == null }.map { bodyRange ->
BodyRangeList.BodyRange(
mentionUuid = bodyRange.mentionAci?.let { UuidUtil.fromByteString(it) }?.toString(),
style = bodyRange.style?.let {
@@ -1135,6 +1122,24 @@ class ChatItemArchiveImporter(
}
}
private fun List<BodyRange>?.filterToLocalMentions(): List<Mention> {
if (this == null) {
return emptyList()
}
return this.filter { it.mentionAci != null && it.start != null && it.length != null }
.mapNotNull {
val aci = ServiceId.ACI.parseOrNull(it.mentionAci!!)
if (aci != null && !aci.isUnknown) {
val id = RecipientId.from(aci)
Mention(id, it.start!!, it.length!!)
} else {
null
}
}
}
private class MessageInsert(
val contentValues: ContentValues,
val followUp: ((Long) -> Unit)?,