From 97059394897d9a4b72bfe47c96581912cff095c3 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Mon, 4 May 2020 09:41:27 -0400 Subject: [PATCH] Fix issue with editing and forwarding a received video. --- .../thoughtcrime/securesms/database/AttachmentDatabase.java | 3 ++- .../signalservice/api/SignalServiceMessageSender.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java index 45fbb57d93..0f67f9c8f3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java @@ -1196,7 +1196,8 @@ public class AttachmentDatabase extends Database { boolean useTemplateUpload = template.getUploadTimestamp() > attachment.getUploadTimestamp() && template.getTransferState() == TRANSFER_PROGRESS_DONE && - template.getTransformProperties().shouldSkipTransform(); + template.getTransformProperties().shouldSkipTransform() && + !attachment.getTransformProperties().isVideoEdited(); ContentValues contentValues = new ContentValues(); contentValues.put(MMS_ID, mmsId); diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java index e3d1ea9c0b..20731fe59e 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java @@ -1278,7 +1278,8 @@ public class SignalServiceMessageSender { .setContentType(attachment.getContentType()) .setKey(ByteString.copyFrom(attachment.getKey())) .setDigest(ByteString.copyFrom(attachment.getDigest().get())) - .setSize(attachment.getSize().get()); + .setSize(attachment.getSize().get()) + .setUploadTimestamp(attachment.getUploadTimestamp()); if (attachment.getRemoteId().getV2().isPresent()) { builder.setCdnId(attachment.getRemoteId().getV2().get());