aboutsummaryrefslogtreecommitdiffstats
path: root/src/de/gultsch/chat/entities
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-02-01 01:25:56 +0100
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-02-01 01:25:56 +0100
commit43531113b798cda6b2f76257641f38b0af986437 (patch)
tree73107f086ec5d772a9041aa3ad4b1c7b8e0dcce9 /src/de/gultsch/chat/entities
parentc3e4f0eaacf8ab32ceab32b8f46e8b7d85c71cfb (diff)
more code cleanup for xmpp parser. more eventy. nice unknown contact pictures
Diffstat (limited to '')
-rw-r--r--src/de/gultsch/chat/entities/Contact.java5
-rw-r--r--src/de/gultsch/chat/entities/Conversation.java5
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 30dfc05b..66221f8a 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 a00dd476..10eb7079 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);
}