oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Display contact icons correctly in MMS ConversationItems

This commit is contained in:
Moxie Marlinspike 2012-09-30 12:28:03 -07:00
parent cf9dc51f31
commit 3cf77b6fd0
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/thoughtcrime/securesms/ConversationAdapter.java
View File

@ -43,7 +43,6 @@ import org.thoughtcrime.securesms.service.MessageNotifier;
import ws.com.google.android.mms.MmsException;
import java.util.LinkedHashMap;
import java.util.Map.Entry;
/**
* A cursor adapter for a conversation thread. Ultimately
@ -175,8 +174,8 @@ public class ConversationAdapter extends CursorAdapter {
MessageRecord messageRecord;
if (type.equals("mms")) messageRecord = getNewMmsMessageRecord(messageId, cursor);
else messageRecord = getNewSmsMessageRecord(messageId, cursor);
if (type.equals("mms")) messageRecord = getNewMmsMessageRecord(messageId, cursor);
else messageRecord = getNewSmsMessageRecord(messageId, cursor);
messageRecordCache.put(type + messageId, messageRecord);
return messageRecord;

8
src/org/thoughtcrime/securesms/recipients/Recipient.java
View File

@ -50,9 +50,10 @@ public class Recipient implements Parcelable {
}
public Recipient(Parcel in) {
this.name = in.readString();
this.number = in.readString();
this.contactUri = in.readParcelable(null);
this.name = in.readString();
this.number = in.readString();
this.contactUri = in.readParcelable(null);
this.contactPhoto = in.readParcelable(null);
}
public Uri getContactUri() {
@ -75,6 +76,7 @@ public class Recipient implements Parcelable {
dest.writeString(name);
dest.writeString(number);
dest.writeParcelable(contactUri, 0);
dest.writeParcelable(contactPhoto, 0);
}
public String toShortString() {