diff options
Diffstat (limited to 'src/de/gultsch/chat/entities')
| -rw-r--r-- | src/de/gultsch/chat/entities/Contact.java | 5 | ||||
| -rw-r--r-- | src/de/gultsch/chat/entities/Conversation.java | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/de/gultsch/chat/entities/Contact.java b/src/de/gultsch/chat/entities/Contact.java index 30dfc05bc..66221f8a3 100644 --- a/src/de/gultsch/chat/entities/Contact.java +++ b/src/de/gultsch/chat/entities/Contact.java @@ -20,9 +20,8 @@ public class Contact implements Serializable { return this.display_name; } - public Uri getProfilePhoto() { - if (photo == null) return null; - return Uri.parse(photo); + public String getProfilePhoto() { + return photo; } public String getJid() { diff --git a/src/de/gultsch/chat/entities/Conversation.java b/src/de/gultsch/chat/entities/Conversation.java index a00dd476a..10eb70797 100644 --- a/src/de/gultsch/chat/entities/Conversation.java +++ b/src/de/gultsch/chat/entities/Conversation.java @@ -33,10 +33,9 @@ public class Conversation extends AbstractEntity { private transient List<Message> messages = null; - public Conversation(String name, Uri profilePhoto, Account account, + public Conversation(String name, String profilePhoto, Account account, String contactJid) { - this(java.util.UUID.randomUUID().toString(), name, profilePhoto - .toString(), account.getUuid(), contactJid, System + this(java.util.UUID.randomUUID().toString(), name, profilePhoto, account.getUuid(), contactJid, System .currentTimeMillis(), STATUS_AVAILABLE); } |