aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-06-15 15:38:52 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-06-15 15:38:52 +0200
commit7a164f7639d586f2b50be3beb583c0b761039d55 (patch)
treef415750c31becbf843c5f2a6425c544042e70691 /src
parent7f1a4a6fb8f9a56236a3278b5f57348e61590948 (diff)
parent473cef32fac1f63fd6afd76c314400bf6751d066 (diff)
Merge pull request #209 from mrdomino/development
Send from our full jid (fixes #60)
Diffstat (limited to 'src')
-rw-r--r--src/eu/siacs/conversations/services/XmppConnectionService.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index 3ba1fdfdb..ba26e105e 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -817,6 +817,7 @@ public class XmppConnectionService extends Service {
MessagePacket packet = new MessagePacket();
if (message.getConversation().getMode() == Conversation.MODE_SINGLE) {
packet.setType(MessagePacket.TYPE_CHAT);
+ packet.setFrom(account.getFullJid());
if (otrSession != null) {
try {
packet.setBody(otrSession.transformSending(message
@@ -831,11 +832,9 @@ public class XmppConnectionService extends Service {
packet.addChild("no-copy", "urn:xmpp:hints");
packet.setTo(otrSession.getSessionID().getAccountID() + "/"
+ otrSession.getSessionID().getUserID());
- packet.setFrom(account.getFullJid());
} else {
packet.setBody(message.getBody());
packet.setTo(message.getCounterpart());
- packet.setFrom(account.getJid());
}
packet.addChild("markable", "urn:xmpp:chat-markers:0");
} else if (message.getConversation().getMode() == Conversation.MODE_MULTI) {