Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge database writes for attachment compression."

Browse Source 
This reverts commit c50993bbf7c4a9e10a253f8d234c621ededffc47.
This commit is contained in:
Nicholas Tinsley
2024-01-02 17:49:16 -05:00
committed by Clark Chen
parent 59c75663b1
commit 549ef9dabc
2 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.java
View File

@@ -886,13 +886,11 @@ public class AttachmentTable extends DatabaseTable {
*/
public void updateAttachmentData(@NonNull DatabaseAttachment databaseAttachment,
@NonNull MediaStream mediaStream,
boolean onlyModifyThisAttachment,
boolean withFastStart)
boolean onlyModifyThisAttachment)
throws MmsException, IOException
{
AttachmentId attachmentId = databaseAttachment.getAttachmentId();
SQLiteDatabase database = databaseHelper.getSignalWritableDatabase();
DataInfo oldDataInfo = getAttachmentDataFileInfo(attachmentId, DATA);
SQLiteDatabase database = databaseHelper.getSignalWritableDatabase();
DataInfo oldDataInfo = getAttachmentDataFileInfo(databaseAttachment.getAttachmentId(), DATA);
if (oldDataInfo == null) {
throw new MmsException("No attachment data found!");
@@ -912,15 +910,7 @@ public class AttachmentTable extends DatabaseTable {
database.beginTransaction();
try {
TransformProperties transformProperties = databaseAttachment.getTransformProperties();
dataInfo = deduplicateAttachment(dataInfo, attachmentId, transformProperties);
transformProperties = transformProperties.withSkipTransform();
if (withFastStart) {
transformProperties = transformProperties.withMp4Faststart();
}
dataInfo = deduplicateAttachment(dataInfo, databaseAttachment.getAttachmentId(), databaseAttachment.getTransformProperties());
ContentValues contentValues = new ContentValues();
contentValues.put(SIZE, dataInfo.length);
@@ -930,10 +920,9 @@ public class AttachmentTable extends DatabaseTable {
contentValues.put(DATA, dataInfo.file.getAbsolutePath());
contentValues.put(DATA_RANDOM, dataInfo.random);
contentValues.put(DATA_HASH, dataInfo.hash);
contentValues.put(TRANSFORM_PROPERTIES, transformProperties.serialize());
int updateCount = updateAttachmentAndMatchingHashes(database,
attachmentId,
databaseAttachment.getAttachmentId(),
isSingleUseOfData ? dataInfo.hash : oldDataInfo.hash,
contentValues);