signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Filter out empty emails for contact share message export

Browse Source
This commit is contained in:
Pete Walters 2026-02-17 15:46:59 -06:00 committed by GitHub
parent 3f6a04e14e
commit ddf0efde81
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SignalServiceKit/Backups/Archiving/Archivers/ChatItem/BackupArchiveContactAttachmentArchiver.swift
View File

@ -51,7 +51,7 @@ class BackupArchiveContactAttachmentArchiver: BackupArchiveProtoStreamWriter {
for email in contact.emails {
switch archiveContactEmail(email).bubbleUp(resultType, partialErrors: &partialErrors) {
case .continue(let emailProto):
emailProtos.append(emailProto)
emailProto.map { emailProtos.append($0) }
case .bubbleUpError(let errorResult):
return errorResult
}
@ -148,9 +148,12 @@ class BackupArchiveContactAttachmentArchiver: BackupArchiveProtoStreamWriter {
private func archiveContactEmail(
_ contactEmail: OWSContactEmail,
) -> BackupArchive.ArchiveInteractionResult<BackupProto_ContactAttachment.Email> {
) -> BackupArchive.ArchiveInteractionResult<BackupProto_ContactAttachment.Email?> {
var emailProto = BackupProto_ContactAttachment.Email()
emailProto.value = contactEmail.email
guard let email = contactEmail.email.nilIfEmpty else {
return .success(nil)
}
emailProto.value = email
if let label = contactEmail.label {
emailProto.label = label
}