diff options
| author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-02-20 17:00:50 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-02-20 17:00:50 +0100 |
| commit | c82179c0b8728a9c2cd567d4227c60c758a1e682 (patch) | |
| tree | b866a099bb79225bf31a6498374f24f757af163e /src/de/gultsch/chat/entities | |
| parent | 94ab61d5c0b060e2aea5caf58ac06864f980956b (diff) | |
adding and removing roster items now possible. basic error display on error messages
Diffstat (limited to 'src/de/gultsch/chat/entities')
| -rw-r--r-- | src/de/gultsch/chat/entities/Contact.java | 1 | ||||
| -rw-r--r-- | src/de/gultsch/chat/entities/Message.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/de/gultsch/chat/entities/Contact.java b/src/de/gultsch/chat/entities/Contact.java index c899603f..eff46e53 100644 --- a/src/de/gultsch/chat/entities/Contact.java +++ b/src/de/gultsch/chat/entities/Contact.java @@ -44,6 +44,7 @@ public class Contact extends AbstractEntity implements Serializable { } else { this.accountUuid = account.getUuid(); } + this.account = account; this.displayName = displayName; this.jid = jid; this.photoUri = photoUri; diff --git a/src/de/gultsch/chat/entities/Message.java b/src/de/gultsch/chat/entities/Message.java index 73a6e46c..9b308c75 100644 --- a/src/de/gultsch/chat/entities/Message.java +++ b/src/de/gultsch/chat/entities/Message.java @@ -12,6 +12,7 @@ public class Message extends AbstractEntity { public static final int STATUS_RECIEVED = 0; public static final int STATUS_UNSEND = 1; public static final int STATUS_SEND = 2; + public static final int STATUS_ERROR = 3; public static final int ENCRYPTION_NONE = 0; public static final int ENCRYPTION_PGP = 1; |