aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs
diff options
context:
space:
mode:
authorSteven Dee <steve@smartercode.net>2014-06-15 05:38:15 -0700
committerSteven Dee <steve@smartercode.net>2014-06-15 05:38:15 -0700
commit473cef32fac1f63fd6afd76c314400bf6751d066 (patch)
treef415750c31becbf843c5f2a6425c544042e70691 /src/eu/siacs
parent7f1a4a6fb8f9a56236a3278b5f57348e61590948 (diff)
Send from our full jid (fixes #60)
The problem wasn't with sending to bare jids, but rather sending *from* bare jids, which we did unless we were OTR encrypted for some reason. Google Talk supports the former, but (probably correctly) rejects the latter.
Diffstat (limited to 'src/eu/siacs')
-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 3ba1fdfd..ba26e105 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) {