diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt index 5d7c5192f7..93e7c92a50 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt @@ -958,9 +958,9 @@ object BackupRepository { val signalStoreSnapshot: SignalStore = createSignalStoreSnapshot(keyValueDbName) eventTimer.emit("store-db-snapshot") - val exportState = ExportState(backupTime = currentTime, forTransfer = forTransfer) val selfAci = signalStoreSnapshot.accountValues.aci!! val selfRecipientId = dbSnapshot.recipientTable.getByAci(selfAci).get().toLong().let { RecipientId.from(it) } + val exportState = ExportState(backupTime = currentTime, forTransfer = forTransfer, selfRecipientId = selfRecipientId) var frameCount = 0L @@ -2446,7 +2446,8 @@ data class ArchivedMediaObject(val mediaId: String, val cdn: Int) class ExportState( val backupTime: Long, - val forTransfer: Boolean + val forTransfer: Boolean, + val selfRecipientId: RecipientId ) { val recipientIds: MutableSet = hashSetOf() val threadIds: MutableSet = hashSetOf() diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/NotificationProfileArchiveProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/NotificationProfileArchiveProcessor.kt index 6de052c9ee..cdde6fefbb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/NotificationProfileArchiveProcessor.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/NotificationProfileArchiveProcessor.kt @@ -39,7 +39,7 @@ object NotificationProfileArchiveProcessor { db.notificationProfileTables .getProfiles() .forEach { profile -> - val frame = profile.toBackupFrame(includeRecipient = { id -> exportState.recipientIds.contains(id.toLong()) }) + val frame = profile.toBackupFrame(includeRecipient = { id -> exportState.recipientIds.contains(id.toLong()) && id != exportState.selfRecipientId }) emitter.emit(frame) } }