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

Update to latest backup protos; Bump to libsignal v0.73.1

Browse Source
This commit is contained in:
Cody Henthorne
2025-05-30 14:09:30 -04:00
parent 340b94f849
commit 13ddd067ef
261 changed files with 368 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/attachments/ArchivedAttachment.kt
View File

@@ -15,8 +15,12 @@ import java.util.UUID
class ArchivedAttachment : Attachment {
companion object {
private const val NO_ARCHIVE_CDN = -404
}
@JvmField
val archiveCdn: Int
val archiveCdn: Int?
@JvmField
val archiveMediaName: String
@@ -31,6 +35,7 @@ class ArchivedAttachment : Attachment {
contentType: String?,
size: Long,
cdn: Int,
uploadTimestamp: Long?,
key: ByteArray,
iv: ByteArray?,
cdnKey: String?,
@@ -71,7 +76,7 @@ class ArchivedAttachment : Attachment {
width = width ?: 0,
height = height ?: 0,
incrementalMacChunkSize = incrementalMacChunkSize ?: 0,
uploadTimestamp = 0,
uploadTimestamp = uploadTimestamp ?: 0,
caption = caption,
stickerLocator = stickerLocator,
blurHash = BlurHash.parseOrNull(blurHash),
@@ -79,14 +84,14 @@ class ArchivedAttachment : Attachment {
transformProperties = null,
uuid = uuid
) {
this.archiveCdn = archiveCdn ?: Cdn.CDN_3.cdnNumber
this.archiveCdn = archiveCdn
this.archiveMediaName = archiveMediaName
this.archiveMediaId = archiveMediaId
this.archiveThumbnailMediaId = archiveThumbnailMediaId
}
constructor(parcel: Parcel) : super(parcel) {
archiveCdn = parcel.readInt()
archiveCdn = parcel.readInt().takeIf { it != NO_ARCHIVE_CDN }
archiveMediaName = parcel.readString()!!
archiveMediaId = parcel.readString()!!
archiveThumbnailMediaId = parcel.readString()!!
@@ -94,7 +99,7 @@ class ArchivedAttachment : Attachment {
override fun writeToParcel(dest: Parcel, flags: Int) {
super.writeToParcel(dest, flags)
dest.writeInt(archiveCdn)
dest.writeInt(archiveCdn ?: NO_ARCHIVE_CDN)
dest.writeString(archiveMediaName)
dest.writeString(archiveMediaId)
dest.writeString(archiveThumbnailMediaId)

12
app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.kt
View File

@@ -14,6 +14,10 @@ import java.util.UUID
class DatabaseAttachment : Attachment {
companion object {
private const val NO_ARCHIVE_CDN = -404
}
@JvmField
val attachmentId: AttachmentId
@@ -27,7 +31,7 @@ class DatabaseAttachment : Attachment {
val dataHash: String?
@JvmField
val archiveCdn: Int
val archiveCdn: Int?
@JvmField
val thumbnailRestoreState: AttachmentTable.ThumbnailRestoreState
@@ -69,7 +73,7 @@ class DatabaseAttachment : Attachment {
displayOrder: Int,
uploadTimestamp: Long,
dataHash: String?,
archiveCdn: Int,
archiveCdn: Int?,
thumbnailRestoreState: AttachmentTable.ThumbnailRestoreState,
archiveTransferState: AttachmentTable.ArchiveTransferState,
uuid: UUID?
@@ -117,7 +121,7 @@ class DatabaseAttachment : Attachment {
hasThumbnail = ParcelUtil.readBoolean(parcel)
mmsId = parcel.readLong()
displayOrder = parcel.readInt()
archiveCdn = parcel.readInt()
archiveCdn = parcel.readInt().takeIf { it != NO_ARCHIVE_CDN }
thumbnailRestoreState = AttachmentTable.ThumbnailRestoreState.deserialize(parcel.readInt())
archiveTransferState = AttachmentTable.ArchiveTransferState.deserialize(parcel.readInt())
}
@@ -130,7 +134,7 @@ class DatabaseAttachment : Attachment {
ParcelUtil.writeBoolean(dest, hasThumbnail)
dest.writeLong(mmsId)
dest.writeInt(displayOrder)
dest.writeInt(archiveCdn)
dest.writeInt(archiveCdn ?: NO_ARCHIVE_CDN)
dest.writeInt(thumbnailRestoreState.value)
dest.writeInt(archiveTransferState.value)
}