diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-11-09 17:05:20 +0100 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-11-09 17:05:20 +0100 |
commit | c310ada8b3b2cce0195f3a2056234c3082106d25 (patch) | |
tree | 99e00a4e08619520a246d5acf18f6ce16fae0645 /src/main/java/eu/siacs/conversations/crypto/OtrEngine.java | |
parent | e9af0d4ca70dc01e1e7815261c098cf58cfc2fde (diff) | |
parent | cb1a36da7930aaa553ffd525fc9d2d07547d50b9 (diff) |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto/OtrEngine.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/OtrEngine.java | 2 |
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 82d7145e..912eea77 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 { |