Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 13:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of invalid quote attachment locators in backups.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-09-21 11:22:37 -04:00
parent f3a9f7f91d
commit ba1e8b6c14
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ChatItemExportIterator.kt
View File

@@ -11,7 +11,6 @@ import org.json.JSONArray
import org.json.JSONException
import org.signal.core.util.Base64
import org.signal.core.util.Hex
import org.signal.core.util.emptyIfNull
import org.signal.core.util.logging.Log
import org.signal.core.util.orNull
import org.signal.core.util.requireBlob
@@ -697,10 +696,12 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
Quote(
targetSentTimestamp = this.quoteTargetSentTimestamp.takeIf { !this.quoteMissing && it != MessageTable.QUOTE_TARGET_MISSING_ID },
authorId = this.quoteAuthor,
text = Text(
body = this.quoteBody.emptyIfNull(),
bodyRanges = this.quoteBodyRanges?.toBackupBodyRanges() ?: emptyList()
),
text = this.quoteBody?.let { body ->
Text(
body = body,
bodyRanges = this.quoteBodyRanges?.toBackupBodyRanges() ?: emptyList()
)
},
attachments = attachments?.toBackupQuoteAttachments() ?: emptyList(),
type = when (type) {
QuoteModel.Type.NORMAL -> Quote.Type.NORMAL
@@ -750,7 +751,7 @@ class ChatItemExportIterator(private val cursor: Cursor, private val batchSize:
Quote.QuotedAttachment(
contentType = attachment.contentType,
fileName = attachment.fileName,
thumbnail = attachment.toRemoteMessageAttachment()
thumbnail = attachment.toRemoteMessageAttachment().takeUnless { it.pointer?.invalidAttachmentLocator != null }
)
}
}