Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-26 20:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add extra validation around shared contact backups.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-03-31 09:38:20 -04:00
parent 42e7f5f4fc
commit a421b5c6bb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -875,21 +875,21 @@ private fun BackupMessageRecord.toRemoteContactMessage(mediaArchiveEnabled: Bool
name = sharedContact.name.toRemote(),
avatar = (sharedContact.avatar?.attachment as? DatabaseAttachment)?.toRemoteMessageAttachment(mediaArchiveEnabled)?.pointer,
organization = sharedContact.organization ?: "",
number = sharedContact.phoneNumbers.map { phone ->
number = sharedContact.phoneNumbers.mapNotNull { phone ->
ContactAttachment.Phone(
value_ = phone.number,
type = phone.type.toRemote(),
label = phone.label ?: ""
)
).takeUnless { it.value_.isBlank() }
},
email = sharedContact.emails.map { email ->
email = sharedContact.emails.mapNotNull { email ->
ContactAttachment.Email(
value_ = email.email,
label = email.label ?: "",
type = email.type.toRemote()
)
).takeUnless { it.value_.isBlank() }
},
address = sharedContact.postalAddresses.map { address ->
address = sharedContact.postalAddresses.mapNotNull { address ->
ContactAttachment.PostalAddress(
type = address.type.toRemote(),
label = address.label ?: "",
@@ -900,7 +900,7 @@ private fun BackupMessageRecord.toRemoteContactMessage(mediaArchiveEnabled: Bool
region = address.region ?: "",
postcode = address.postalCode ?: "",
country = address.country ?: ""
)
).takeUnless { it.street.isBlank() && it.pobox.isBlank() && it.neighborhood.isBlank() && it.city.isBlank() && it.region.isBlank() && it.postcode.isBlank() && it.country.isBlank() }
}
),
reactions = reactionRecords.toRemote()