diff --git a/Signal/src/util/Backup/OWSBackupExportJob.m b/Signal/src/util/Backup/OWSBackupExportJob.m index 5571b4ee0..ef4bd85bc 100644 --- a/Signal/src/util/Backup/OWSBackupExportJob.m +++ b/Signal/src/util/Backup/OWSBackupExportJob.m @@ -717,6 +717,7 @@ NS_ASSUME_NONNULL_BEGIN // Add one for the manifest NSUInteger unsavedCount = (self.unsavedDatabaseItems.count + self.unsavedAttachmentExports.count + 1); NSUInteger savedCount = (self.savedDatabaseItems.count + self.savedAttachmentItems.count); + // Ignore localProfileAvatarItem for now. CGFloat progress = (savedCount / (CGFloat)(unsavedCount + savedCount)); [self updateProgressWithDescription:NSLocalizedString(@"BACKUP_EXPORT_PHASE_UPLOAD", @@ -1029,6 +1030,12 @@ NS_ASSUME_NONNULL_BEGIN OWSAssertDebug(![activeRecordNames containsObject:item.recordName]); [activeRecordNames addObject:item.recordName]; } + if (self.localProfileAvatarItem) { + OWSBackupExportItem *item = self.localProfileAvatarItem; + OWSAssertDebug(item.recordName.length > 0); + OWSAssertDebug(![activeRecordNames containsObject:item.recordName]); + [activeRecordNames addObject:item.recordName]; + } OWSAssertDebug(self.manifestItem.recordName.length > 0); OWSAssertDebug(![activeRecordNames containsObject:self.manifestItem.recordName]); [activeRecordNames addObject:self.manifestItem.recordName];