TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-10 11:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with editing and forwarding a received video.

Browse Source
This commit is contained in:
Greyson Parrelli 2020-05-04 09:41:27 -04:00
parent eca67b1204
commit 9705939489
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java
View File

@ -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);

3
libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View File

@ -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());