aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-11-06 14:33:13 -0500
committerSam Whited <sam@samwhited.com>2014-11-09 07:00:40 -0500
commitbf9207456e7523c2d18f1f9fa007542b5d0e10ea (patch)
tree3a2096ebb66e312d76a713a6b1c2ac9d59b20ef0 /src/main/java/eu/siacs/conversations/entities
parentf15900426d4713b48eb96e0ad0b1cdda5a86becf (diff)
Update another chunk of stuff to use JID objects
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Message.java9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index ce21addc8..53df1ddfc 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -248,13 +248,8 @@ public class Message extends AbstractEntity {
this.trueCounterpart = trueCounterpart;
}
- public String getPresence() {
- if (!counterpart.getResourcepart().isEmpty()) {
- return counterpart.getResourcepart();
- } else {
- // TODO: Return empty string or null?
- return null;
- }
+ public Jid getPresence() {
+ return counterpart;
}
public void setDownloadable(Downloadable downloadable) {