diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-11-10 01:24:35 +0100 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-11-10 01:24:35 +0100 |
commit | 89ee999e1b969a935d5b8ae9d7155ca9afe96389 (patch) | |
tree | 3658c68b199eb7e325c0ebd7810381d078a9859f /src/main/java/eu/siacs/conversations/entities/Message.java | |
parent | 26b4788733d9e9e5267bb6b54bb847757c7c25e5 (diff) |
more refactoring for presence selection. removed getTo, getFrom and getJid from Element
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Message.java | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index c4bc86ffc..0a9e5da24 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -67,18 +67,14 @@ public class Message extends AbstractEntity { } public Message(Conversation conversation, String body, int encryption) { - this(java.util.UUID.randomUUID().toString(), conversation.getUuid(), - conversation.getContactJid(), null, body, System - .currentTimeMillis(), encryption, - Message.STATUS_UNSEND, TYPE_TEXT, null); - this.conversation = conversation; + this(conversation,body,encryption,STATUS_UNSEND); } - public Message(final Conversation conversation, final Jid counterpart, final String body, - final int encryption, final int status) { + public Message(Conversation conversation, String body, int encryption, int status) { this(java.util.UUID.randomUUID().toString(), conversation.getUuid(), - counterpart, null, body, System.currentTimeMillis(), - encryption, status, TYPE_TEXT, null); + conversation.getContactJid().toBareJid(), null, body, System + .currentTimeMillis(), encryption, + status, TYPE_TEXT, null); this.conversation = conversation; } |