empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix quote attachmentV3 usage.

Browse source
This commit is contained in:
Greyson Parrelli 2020-07-14 19:43:17 -04:00
parent d1b61bfed3
commit 58ec669d15
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
View file

@ -36,6 +36,7 @@ import org.thoughtcrime.securesms.recipients.RecipientUtil;
import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.Base64;
import org.thoughtcrime.securesms.util.BitmapDecodingException; import org.thoughtcrime.securesms.util.BitmapDecodingException;
import org.thoughtcrime.securesms.util.BitmapUtil; import org.thoughtcrime.securesms.util.BitmapUtil;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.Hex; import org.thoughtcrime.securesms.util.Hex;
import org.thoughtcrime.securesms.util.MediaUtil; import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
@ -226,7 +227,7 @@ public abstract class PushSendJob extends SendJob {
} }
} }
protected Optional<SignalServiceDataMessage.Quote> getQuoteFor(OutgoingMediaMessage message) { protected Optional<SignalServiceDataMessage.Quote> getQuoteFor(OutgoingMediaMessage message) throws IOException {
if (message.getOutgoingQuote() == null) return Optional.absent(); if (message.getOutgoingQuote() == null) return Optional.absent();
long quoteId = message.getOutgoingQuote().getId(); long quoteId = message.getOutgoingQuote().getId();
@ -253,13 +254,18 @@ public abstract class PushSendJob extends SendJob {
} }
if (thumbnailData != null) { if (thumbnailData != null) {
thumbnail = SignalServiceAttachment.newStreamBuilder() SignalServiceAttachment.Builder builder = SignalServiceAttachment.newStreamBuilder()
.withContentType(thumbnailType) .withContentType(thumbnailType)
.withWidth(thumbnailData.getWidth()) .withWidth(thumbnailData.getWidth())
.withHeight(thumbnailData.getHeight()) .withHeight(thumbnailData.getHeight())
.withLength(thumbnailData.getBitmap().length) .withLength(thumbnailData.getBitmap().length)
.withStream(new ByteArrayInputStream(thumbnailData.getBitmap())) .withStream(new ByteArrayInputStream(thumbnailData.getBitmap()));
.build();
if (FeatureFlags.attachmentsV3()) {
builder.withResumableUploadSpec(ApplicationDependencies.getSignalServiceMessageSender().getResumableUploadSpec());
}
thumbnail = builder.build();
} }
quoteAttachments.add(new SignalServiceDataMessage.Quote.QuotedAttachment(attachment.getContentType(), quoteAttachments.add(new SignalServiceDataMessage.Quote.QuotedAttachment(attachment.getContentType(),