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

Update attachment content type when updating attachment data

Browse Source 
Fixes #4687
Closes #4688
This commit is contained in:
Geonu Kang
2015-11-23 13:18:54 +09:00
committed by Moxie Marlinspike
parent afb21203b7
commit 8269047c88
4 changed files with 53 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/org/thoughtcrime/securesms/database/AttachmentDatabase.java
View File

@@ -36,6 +36,7 @@ import org.thoughtcrime.securesms.crypto.DecryptingPartInputStream;
import org.thoughtcrime.securesms.crypto.EncryptingPartOutputStream;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.crypto.MasterSecretUnion;
import org.thoughtcrime.securesms.mms.MediaStream;
import org.thoughtcrime.securesms.mms.PartAuthority;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.MediaUtil.ThumbnailData;
@@ -289,7 +290,7 @@ public class AttachmentDatabase extends Database {
public @NonNull Attachment updateAttachmentData(@NonNull MasterSecret masterSecret,
@NonNull Attachment attachment,
@NonNull InputStream inputStream)
@NonNull MediaStream mediaStream)
throws MmsException
{
SQLiteDatabase database = databaseHelper.getWritableDatabase();
@@ -300,19 +301,21 @@ public class AttachmentDatabase extends Database {
throw new MmsException("No attachment data found!");
}
long dataSize = setAttachmentData(masterSecret, dataFile, inputStream);
long dataSize = setAttachmentData(masterSecret, dataFile, mediaStream.getStream());
ContentValues contentValues = new ContentValues();
contentValues.put(SIZE, dataSize);
contentValues.put(CONTENT_TYPE, mediaStream.getMimeType());
database.update(TABLE_NAME, contentValues, PART_ID_WHERE, databaseAttachment.getAttachmentId().toStrings());
return new DatabaseAttachment(databaseAttachment.getAttachmentId(),
databaseAttachment.getMmsId(),
databaseAttachment.hasData(),
databaseAttachment.getContentType(),
mediaStream.getMimeType(),
databaseAttachment.getTransferState(),
dataSize, databaseAttachment.getLocation(),
dataSize,
databaseAttachment.getLocation(),
databaseAttachment.getKey(),
databaseAttachment.getRelay());
}