narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

add explicit encryption hints to outgoing messages

Browse source
This commit is contained in:
Daniel Gultsch 2017-01-26 19:19:08 +01:00
parent c9e6d05fa0
commit 53241f2ef1
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/crypto/OtrService.java
View file

@ -194,8 +194,9 @@ public class OtrService extends OtrCryptoEngineImpl implements OtrEngineHost {
} catch (final InvalidJidException ignored) { } catch (final InvalidJidException ignored) {
} }
packet.setType(MessagePacket.TYPE_CHAT); packet.setType(MessagePacket.TYPE_CHAT);
packet.addChild("encryption","urn:xmpp:eme:0")
.setAttribute("namespace","urn:xmpp:otr:0");
account.getXmppConnection().sendMessagePacket(packet); account.getXmppConnection().sendMessagePacket(packet);
} }

7
src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
View file

@ -79,6 +79,9 @@ public class MessageGenerator extends AbstractGenerator {
packet.setBody(OMEMO_FALLBACK_MESSAGE); packet.setBody(OMEMO_FALLBACK_MESSAGE);
} }
packet.addChild("store", "urn:xmpp:hints"); packet.addChild("store", "urn:xmpp:hints");
packet.addChild("encryption","urn:xmpp:eme:0")
.setAttribute("name","OMEMO")
.setAttribute("namespace",AxolotlService.PEP_PREFIX);
return packet; return packet;
} }
@ -109,6 +112,8 @@ public class MessageGenerator extends AbstractGenerator {
content = message.getBody(); content = message.getBody();
} }
packet.setBody(otrSession.transformSending(content)[0]); packet.setBody(otrSession.transformSending(content)[0]);
packet.addChild("encryption","urn:xmpp:eme:0")
.setAttribute("namespace","urn:xmpp:otr:0");
return packet; return packet;
} catch (OtrException e) { } catch (OtrException e) {
return null; return null;
@ -139,6 +144,8 @@ public class MessageGenerator extends AbstractGenerator {
} else if (message.getEncryption() == Message.ENCRYPTION_PGP) { } else if (message.getEncryption() == Message.ENCRYPTION_PGP) {
packet.addChild("x", "jabber:x:encrypted").setContent(message.getBody()); packet.addChild("x", "jabber:x:encrypted").setContent(message.getBody());
} }
packet.addChild("encryption","urn:xmpp:eme:0")
.setAttribute("namespace","jabber:x:encrypted");
return packet; return packet;
} }