mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix issue with editing and forwarding a received video.

fork-5.53.8
Greyson Parrelli 2020-05-04 09:41:27 -04:00
rodzic eca67b1204
commit 9705939489
2 zmienionych plików z 4 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java
Wyświetl plik

@ -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
Wyświetl plik

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