empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Don't allow blank Text bodies in backups.

Browse source
This commit is contained in:
Greyson Parrelli 2025-01-22 10:59:30 -05:00
parent a0cb12be8c
commit cf3cee0343
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
View file

@ -14,6 +14,7 @@ import org.signal.core.util.EventTimer
import org.signal.core.util.Hex import org.signal.core.util.Hex
import org.signal.core.util.concurrent.SignalExecutors import org.signal.core.util.concurrent.SignalExecutors
import org.signal.core.util.logging.Log import org.signal.core.util.logging.Log
import org.signal.core.util.nullIfBlank
import org.signal.core.util.nullIfEmpty import org.signal.core.util.nullIfEmpty
import org.signal.core.util.orNull import org.signal.core.util.orNull
import org.signal.core.util.requireBlob import org.signal.core.util.requireBlob
@ -316,7 +317,7 @@ class ChatItemArchiveExporter(
attachments = extraData.attachmentsById[record.id] attachments = extraData.attachmentsById[record.id]
) )
if (standardMessage.text == null && standardMessage.attachments.isEmpty()) { if (standardMessage.text.isNullOrBlank() && standardMessage.attachments.isEmpty()) {
Log.w(TAG, ExportSkips.emptyStandardMessage(record.dateSent)) Log.w(TAG, ExportSkips.emptyStandardMessage(record.dateSent))
continue continue
} }
@ -883,7 +884,7 @@ private fun BackupMessageRecord.toRemoteDirectStoryReplyMessage(mediaArchiveEnab
} }
private fun BackupMessageRecord.toRemoteStandardMessage(db: SignalDatabase, mediaArchiveEnabled: Boolean, reactionRecords: List<ReactionRecord>?, mentions: List<Mention>?, attachments: List<DatabaseAttachment>?): StandardMessage { private fun BackupMessageRecord.toRemoteStandardMessage(db: SignalDatabase, mediaArchiveEnabled: Boolean, reactionRecords: List<ReactionRecord>?, mentions: List<Mention>?, attachments: List<DatabaseAttachment>?): StandardMessage {
val text = body?.let { val text = body.nullIfBlank()?.let {
Text( Text(
body = it, body = it,
bodyRanges = (this.bodyRanges?.toRemoteBodyRanges(this.dateSent) ?: emptyList()) + (mentions?.toRemoteBodyRanges(db) ?: emptyList()) bodyRanges = (this.bodyRanges?.toRemoteBodyRanges(this.dateSent) ?: emptyList()) + (mentions?.toRemoteBodyRanges(db) ?: emptyList())
@ -1378,6 +1379,10 @@ fun List<ChatItem>.repairRevisions(current: ChatItem.Builder): List<ChatItem> {
} }
} }
private fun Text?.isNullOrBlank(): Boolean {
return this == null || this.body.isBlank()
}
private fun Cursor.toBackupMessageRecord(pastIds: Set<Long>, backupStartTime: Long): BackupMessageRecord? { private fun Cursor.toBackupMessageRecord(pastIds: Set<Long>, backupStartTime: Long): BackupMessageRecord? {
val id = this.requireLong(MessageTable.ID) val id = this.requireLong(MessageTable.ID)
if (pastIds.contains(id)) { if (pastIds.contains(id)) {