Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:20:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove legacy attachment fields from Backup.proto

Browse Source
This commit is contained in:
Greyson Parrelli
2025-08-01 16:53:09 -04:00
committed by Cody Henthorne
parent 5aeca1deb1
commit 92e1f68c6d
3 changed files with 8 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@ object CallLinkArchiveImporter {
roomId = CallLinkRoomId.fromCallLinkRootKey(rootKey),
credentials = CallLinkCredentials(
callLink.rootKey.toByteArray(),
callLink.epoch.nullIfEmpty()?.toByteArray(),
callLink.epoch?.nullIfEmpty()?.toByteArray(),
callLink.adminKey?.toByteArray()
),
state = SignalCallLinkState(

32
app/src/main/java/org/thoughtcrime/securesms/backup/v2/util/ArchiveConverterExtensions.kt
View File

@@ -8,7 +8,6 @@ package org.thoughtcrime.securesms.backup.v2.util
import okio.ByteString
import okio.ByteString.Companion.toByteString
import org.signal.core.util.Base64
import org.signal.core.util.Hex
import org.signal.core.util.isNotNullOrBlank
import org.signal.core.util.nullIfBlank
import org.signal.core.util.orNull
@@ -138,39 +137,11 @@ fun DatabaseAttachment.toRemoteFilePointer(contentTypeOverride: String? = null):
builder.height = this.height.takeIf { it > 0 }
builder.caption = this.caption
builder.blurHash = this.blurHash?.hash
builder.setLegacyLocators(this)
builder.locatorInfo = this.toLocatorInfo()
return builder.build()
}
fun FilePointer.Builder.setLegacyLocators(attachment: DatabaseAttachment) {
if (attachment.remoteKey.isNullOrBlank() || attachment.remoteDigest == null || attachment.size == 0L) {
this.invalidAttachmentLocator = FilePointer.InvalidAttachmentLocator()
return
}
if (attachment.transferState == AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE && attachment.archiveTransferState != AttachmentTable.ArchiveTransferState.FINISHED) {
this.invalidAttachmentLocator = FilePointer.InvalidAttachmentLocator()
return
}
if (attachment.remoteLocation.isNullOrBlank()) {
this.invalidAttachmentLocator = FilePointer.InvalidAttachmentLocator()
return
}
this.attachmentLocator = FilePointer.AttachmentLocator(
cdnKey = attachment.remoteLocation,
cdnNumber = attachment.cdn.cdnNumber,
uploadTimestamp = attachment.uploadTimestamp.takeIf { it > 0 }?.clampToValidBackupRange(),
key = Base64.decode(attachment.remoteKey).toByteString(),
size = attachment.size.toInt(),
digest = attachment.remoteDigest.toByteString()
)
}
fun DatabaseAttachment.toLocatorInfo(): FilePointer.LocatorInfo {
val attachmentType = this.toRemoteAttachmentType()
@@ -203,9 +174,6 @@ fun DatabaseAttachment.toLocatorInfo(): FilePointer.LocatorInfo {
AttachmentType.INVALID -> Unit
}
locatorBuilder.legacyDigest = this.remoteDigest?.toByteString() ?: ByteString.EMPTY
locatorBuilder.legacyMediaName = Hex.toStringCondensed(this.remoteDigest ?: byteArrayOf())
return locatorBuilder.build()
}