aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/crypto/OtrService.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2017-01-26 19:42:57 +0100
committerGitHub <noreply@github.com>2017-01-26 19:42:57 +0100
commit7651700c2ad11726cf630921c0bcb150b52491a2 (patch)
tree7c94c13c034546ec5264fd8c49cd88a8e188bd4d /src/main/java/eu/siacs/conversations/crypto/OtrService.java
parente4524e2c7ba2d099a71bb5682a55164534adcaa2 (diff)
parenteea1bc809068fdd091a634b84bdfdcb9b31c7cb8 (diff)
Merge branch 'master' into patch-1
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto/OtrService.java')
-rw-r--r--src/main/java/eu/siacs/conversations/crypto/OtrService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/crypto/OtrService.java b/src/main/java/eu/siacs/conversations/crypto/OtrService.java
index 3663cd3b..55f4ebb5 100644
--- a/src/main/java/eu/siacs/conversations/crypto/OtrService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/OtrService.java
@@ -194,8 +194,9 @@ public class OtrService extends OtrCryptoEngineImpl implements OtrEngineHost {
} catch (final InvalidJidException ignored) {
}
-
packet.setType(MessagePacket.TYPE_CHAT);
+ packet.addChild("encryption","urn:xmpp:eme:0")
+ .setAttribute("namespace","urn:xmpp:otr:0");
account.getXmppConnection().sendMessagePacket(packet);
}