Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 02:10:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix view-once sync and quote descriptions.

Browse Source
This commit is contained in:
Greyson Parrelli
2020-01-09 12:03:52 -05:00
parent e2a48d1714
commit fd7aa9ccfa
17 changed files with 87 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -320,8 +320,8 @@ public class AttachmentDatabase extends Database {
notifyAttachmentListeners();
}
public void deleteAttachmentFilesForMessage(long mmsId) {
Log.d(TAG, "[deleteAttachmentFilesForMessage] mmsId: " + mmsId);
public void deleteAttachmentFilesForViewOnceMessage(long mmsId) {
Log.d(TAG, "[deleteAttachmentFilesForViewOnceMessage] mmsId: " + mmsId);
SQLiteDatabase database = databaseHelper.getWritableDatabase();
Cursor cursor = null;
@@ -355,6 +355,7 @@ public class AttachmentDatabase extends Database {
values.put(HEIGHT, 0);
values.put(TRANSFER_STATE, TRANSFER_PROGRESS_DONE);
values.put(BLUR_HASH, (String) null);
values.put(CONTENT_TYPE, MediaUtil.VIEW_ONCE);
database.update(TABLE_NAME, values, MMS_ID + " = ?", new String[] {mmsId + ""});
notifyAttachmentListeners();
@@ -365,7 +366,6 @@ public class AttachmentDatabase extends Database {
}
}
public void deleteAttachment(@NonNull AttachmentId id) {
Log.d(TAG, "[deleteAttachment] attachmentId: " + id);

4
app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
View File

@@ -145,7 +145,9 @@ public class ThreadRecord extends DisplayRecord {
}
private String getViewOnceDescription(@NonNull Context context, @Nullable String contentType) {
if (MediaUtil.isVideoType(contentType)) {
if (MediaUtil.isViewOnceType(contentType)) {
return context.getString(R.string.ThreadRecord_disappearing_media);
} else if (MediaUtil.isVideoType(contentType)) {
return context.getString(R.string.ThreadRecord_disappearing_video);
} else {
return context.getString(R.string.ThreadRecord_disappearing_photo);