From 66f851e92a93708c79db1ded438c0035c8a4abae Mon Sep 17 00:00:00 2001 From: Michelle Tang Date: Tue, 19 Nov 2024 13:58:07 -0800 Subject: [PATCH] Fix link+sync uploads. --- .../signalservice/internal/push/PushServiceSocket.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java index aae3b41aba..8658ed956d 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java @@ -1992,7 +1992,11 @@ public class PushServiceSocket { } public void uploadBackupFile(AttachmentUploadForm uploadForm, String resumableUploadUrl, InputStream data, long dataLength) throws IOException { - uploadToCdn3(resumableUploadUrl, data, "application/octet-stream", dataLength, false, new NoCipherOutputStreamFactory(), null, null, uploadForm.headers); + if (uploadForm.cdn == 2) { + uploadToCdn2(resumableUploadUrl, data, "application/octet-stream", dataLength, false, new NoCipherOutputStreamFactory(), null, null); + } else { + uploadToCdn3(resumableUploadUrl, data, "application/octet-stream", dataLength, false, new NoCipherOutputStreamFactory(), null, null, uploadForm.headers); + } } private AttachmentDigest uploadToCdn3(String resumableUrl,