Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid the possibility of double-exporting a recipient.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-11-11 15:29:22 -05:00
parent b047f8bc0a
commit a5d5770f2e
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/backup/v2/ArchiveErrorCases.kt
View File

@@ -151,6 +151,10 @@ object ExportSkips {
return log(sentTimestamp, "A call had a ringer with no matching exported Recipient.")
}
fun duplicateRecipientId(recipientId: Long): String {
return log(0, "Tried to export multiple recipients with RecipientId::$recipientId")
}
private fun log(sentTimestamp: Long, message: String): String {
return "[SKIP][$sentTimestamp] $message"
}
@@ -218,6 +222,10 @@ object ExportOddities {
return log(sentTimestamp, "The body length was greater than the max allowed ($length bytes). Trimming to fit.")
}
fun releaseChannelRecipientMissing(): String {
return log(0, "No release channel recipient was found.")
}
private fun log(sentTimestamp: Long, message: String): String {
return "[ODDITY][$sentTimestamp] $message"
}

2
app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
View File

@@ -966,7 +966,7 @@ object BackupRepository {
}
progressEmitter?.onRecipient()
RecipientArchiveProcessor.export(dbSnapshot, signalStoreSnapshot, exportState, selfRecipientId, selfAci) {
RecipientArchiveProcessor.export(dbSnapshot, signalStoreSnapshot, exportState, selfAci) {
writer.write(it)
extraFrameOperation?.invoke(it)
eventTimer.emit("recipient")

28
app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/RecipientArchiveProcessor.kt
View File

@@ -8,6 +8,8 @@ package org.thoughtcrime.securesms.backup.v2.processor
import org.signal.core.util.logging.Log
import org.signal.core.util.update
import org.thoughtcrime.securesms.backup.v2.ArchiveRecipient
import org.thoughtcrime.securesms.backup.v2.ExportOddities
import org.thoughtcrime.securesms.backup.v2.ExportSkips
import org.thoughtcrime.securesms.backup.v2.ExportState
import org.thoughtcrime.securesms.backup.v2.ImportState
import org.thoughtcrime.securesms.backup.v2.database.getAllForBackup
@@ -37,12 +39,7 @@ object RecipientArchiveProcessor {
val TAG = Log.tag(RecipientArchiveProcessor::class.java)
fun export(db: SignalDatabase, signalStore: SignalStore, exportState: ExportState, selfRecipientId: RecipientId, selfAci: ServiceId.ACI, emitter: BackupFrameEmitter) {
exportState.recipientIds.add(selfRecipientId.toLong())
exportState.contactRecipientIds.add(selfRecipientId.toLong())
exportState.recipientIdToAci[selfRecipientId.toLong()] = selfAci.toByteString()
exportState.aciToRecipientId[selfAci.toString()] = selfRecipientId.toLong()
fun export(db: SignalDatabase, signalStore: SignalStore, exportState: ExportState, selfAci: ServiceId.ACI, emitter: BackupFrameEmitter) {
val releaseChannelId = signalStore.releaseChannelValues.releaseChannelRecipientId
if (releaseChannelId != null) {
exportState.recipientIds.add(releaseChannelId.toLong())
@@ -56,13 +53,19 @@ object RecipientArchiveProcessor {
)
)
} else {
Log.w(TAG, "Missing release channel id on export!")
Log.w(TAG, ExportOddities.releaseChannelRecipientMissing())
}
db.recipientTable.getContactsForBackup(selfRecipientId.toLong()).use { reader ->
db.recipientTable.getContactsForBackup(exportState.selfRecipientId.toLong()).use { reader ->
for (recipient in reader) {
if (recipient != null) {
exportState.recipientIds.add(recipient.id)
val successfullyAdded = exportState.recipientIds.add(recipient.id)
if (!successfullyAdded) {
Log.w(TAG, ExportSkips.duplicateRecipientId(recipient.id))
continue
}
exportState.contactRecipientIds.add(recipient.id)
recipient.contact?.aci?.let {
exportState.recipientIdToAci[recipient.id] = it
@@ -77,6 +80,11 @@ object RecipientArchiveProcessor {
}
}
exportState.recipientIds.add(exportState.selfRecipientId.toLong())
exportState.contactRecipientIds.add(exportState.selfRecipientId.toLong())
exportState.recipientIdToAci[exportState.selfRecipientId.toLong()] = selfAci.toByteString()
exportState.aciToRecipientId[selfAci.toString()] = exportState.selfRecipientId.toLong()
db.recipientTable.getGroupsForBackup(selfAci).use { reader ->
for (recipient in reader) {
exportState.recipientIds.add(recipient.id)
@@ -85,7 +93,7 @@ object RecipientArchiveProcessor {
}
}
db.distributionListTables.getAllForBackup(selfRecipientId, exportState).use { reader ->
db.distributionListTables.getAllForBackup(exportState.selfRecipientId, exportState).use { reader ->
for (recipient in reader) {
exportState.recipientIds.add(recipient.id)
emitter.emit(Frame(recipient = recipient))