aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-11-09 17:06:09 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-11-09 17:06:09 +0100
commitcb1a36da7930aaa553ffd525fc9d2d07547d50b9 (patch)
treea24ea0c29c570dc9e10c0dbd6c7d0766855d4ef0 /src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
parent44de982877c04fadc80be0d377f09fab24a3b74c (diff)
parent180a0e44084752431d702677d68d06ae82524d33 (diff)
Merge pull request #642 from SamWhited/accountgetjid
Rework `Account.getJid()' to return full JIDs
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto/OtrEngine.java')
-rw-r--r--src/main/java/eu/siacs/conversations/crypto/OtrEngine.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java b/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
index 82d7145e2..912eea771 100644
--- a/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
+++ b/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
@@ -153,7 +153,7 @@ public class OtrEngine implements OtrEngineHost {
public void injectMessage(SessionID session, String body)
throws OtrException {
MessagePacket packet = new MessagePacket();
- packet.setFrom(account.getFullJid());
+ packet.setFrom(account.getJid());
if (session.getUserID().isEmpty()) {
packet.setAttribute("to", session.getAccountID());
} else {