From 0a99b68d25e1de1a94974464fd729f56e2cd1572 Mon Sep 17 00:00:00 2001 From: Clark Date: Fri, 31 May 2024 10:17:22 -0400 Subject: [PATCH] Fix shared contacts avatar double upload. --- .../java/org/thoughtcrime/securesms/jobs/PushSendJob.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java index 649618961e..d6f2e1396d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java @@ -76,6 +76,7 @@ import org.whispersystems.signalservice.api.push.ServiceId.ACI; import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException; import org.whispersystems.signalservice.api.push.exceptions.ProofRequiredException; import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException; +import org.whispersystems.signalservice.internal.push.AttachmentPointer; import org.whispersystems.signalservice.internal.push.BodyRange; import java.io.ByteArrayInputStream; @@ -445,7 +446,11 @@ public abstract class PushSendJob extends SendJob { SharedContact.Avatar avatar = null; if (contact.getAvatar() != null && contact.getAvatar().getAttachment() != null) { - avatar = SharedContact.Avatar.newBuilder().withAttachment(getAttachmentFor(contact.getAvatarAttachment())) + SignalServiceAttachment attachment = getAttachmentPointerFor(contact.getAvatar().getAttachment()); + if (attachment == null) { + attachment = getAttachmentFor(contact.getAvatar().getAttachment()); + } + avatar = SharedContact.Avatar.newBuilder().withAttachment(attachment) .withProfileFlag(contact.getAvatar().isProfile()) .build(); }