Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-27 05:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop falling back to CDN0 for attachments.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-10-27 12:02:35 -07:00
parent 7fdd7e89bd
commit c4f5110148
13 changed files with 364 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/test/java/org/thoughtcrime/securesms/sms/UploadDependencyGraphTest.kt
View File

@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.jobmanager.JsonJobData
import org.thoughtcrime.securesms.jobs.AttachmentCompressionJob
import org.thoughtcrime.securesms.jobs.AttachmentCopyJob
import org.thoughtcrime.securesms.jobs.AttachmentUploadJob
import org.thoughtcrime.securesms.jobs.ResumableUploadSpecJob
import org.thoughtcrime.securesms.jobs.protos.AttachmentUploadJobData
import org.thoughtcrime.securesms.mms.OutgoingMessage
import org.thoughtcrime.securesms.mms.SentMediaQuality
import org.thoughtcrime.securesms.recipients.Recipient
@@ -206,16 +206,15 @@ class UploadDependencyGraphTest {
assertTrue(steps.all { it.size == 1 })
assertTrue(steps[0][0] is AttachmentCompressionJob)
assertTrue(steps[1][0] is ResumableUploadSpecJob)
assertTrue(steps[2][0] is AttachmentUploadJob)
assertTrue(steps[1][0] is AttachmentUploadJob)
if (expectedCopyDestinationCount > 0) {
assertTrue(steps[3][0] is AttachmentCopyJob)
assertTrue(steps[2][0] is AttachmentCopyJob)
val uploadData = JsonJobData.deserialize(steps[2][0].serialize())
val copyData = JsonJobData.deserialize(steps[3][0].serialize())
val uploadData = AttachmentUploadJobData.ADAPTER.decode(steps[1][0].serialize()!!)
val copyData = JsonJobData.deserialize(steps[2][0].serialize())
val uploadAttachmentId = AttachmentId(uploadData.getLong("row_id"), uploadData.getLong("unique_id"))
val uploadAttachmentId = AttachmentId(uploadData.attachmentRowId, uploadData.attachmentUniqueId)
val copySourceAttachmentId = JsonUtils.fromJson(copyData.getString("source_id"), AttachmentId::class.java)
assertEquals(uploadAttachmentId, copySourceAttachmentId)
@@ -223,7 +222,7 @@ class UploadDependencyGraphTest {
val copyDestinations = copyData.getStringArray("destination_ids")
assertEquals(expectedCopyDestinationCount, copyDestinations.size)
} else {
assertEquals(3, steps.size)
assertEquals(2, steps.size)
}
}