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

Show "you" in MediaPreviewActivity

Browse Source 
Fixes #7038
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2017-10-04 11:35:16 -07:00
parent 677c7732cf
commit 9a876a3672
5 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,17 +67,20 @@ public class MediaDatabase extends Database {
private final DatabaseAttachment attachment;
private final Address address;
private final long date;
private final boolean outgoing;
private MediaRecord(DatabaseAttachment attachment, @Nullable Address address, long date) {
private MediaRecord(DatabaseAttachment attachment, @Nullable Address address, long date, boolean outgoing) {
this.attachment = attachment;
this.address = address;
this.date = date;
this.outgoing = outgoing;
}
public static MediaRecord from(@NonNull Context context, @NonNull MasterSecret masterSecret, @NonNull Cursor cursor) {
AttachmentDatabase attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
DatabaseAttachment attachment = attachmentDatabase.getAttachment(masterSecret, cursor);
String serializedAddress = cursor.getString(cursor.getColumnIndexOrThrow(MmsDatabase.ADDRESS));
boolean outgoing = MessagingDatabase.Types.isOutgoingMessageType(cursor.getLong(cursor.getColumnIndexOrThrow(MmsDatabase.MESSAGE_BOX)));
Address address = null;
if (serializedAddress != null) {
@@ -92,7 +95,7 @@ public class MediaDatabase extends Database {
date = cursor.getLong(cursor.getColumnIndexOrThrow(MmsDatabase.DATE_RECEIVED));
}
return new MediaRecord(attachment, address, date);
return new MediaRecord(attachment, address, date, outgoing);
}
public Attachment getAttachment() {
@@ -111,6 +114,10 @@ public class MediaDatabase extends Database {
return date;
}
public boolean isOutgoing() {
return outgoing;
}
}