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

add xhtml image tag to unencrypted image urls. add oob tag to all files that are on remote hosts

Browse source
This commit is contained in:
Daniel Gultsch 2015-10-07 12:08:25 +02:00
parent 8f066d00e0
commit 043e19dd65
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,6 +68,15 @@ public class MessageGenerator extends AbstractGenerator {
return packet; return packet;
} }
public static void addXhtmlImImage(MessagePacket packet, Message.FileParams params) {
Element html = packet.addChild("html","http://jabber.org/protocol/xhtml-im");
Element body = html.addChild("body","http://www.w3.org/1999/xhtml");
Element img = body.addChild("img");
img.setAttribute("src",params.url.toString());
img.setAttribute("height",params.height);
img.setAttribute("width",params.width);
}
public static void addMessageHints(MessagePacket packet) { public static void addMessageHints(MessagePacket packet) {
packet.addChild("private", "urn:xmpp:carbons:2"); packet.addChild("private", "urn:xmpp:carbons:2");
packet.addChild("no-copy", "urn:xmpp:hints"); packet.addChild("no-copy", "urn:xmpp:hints");
@ -98,11 +107,18 @@ public class MessageGenerator extends AbstractGenerator {
public MessagePacket generateChat(Message message) { public MessagePacket generateChat(Message message) {
MessagePacket packet = preparePacket(message); MessagePacket packet = preparePacket(message);
String content;
if (message.hasFileOnRemoteHost()) { if (message.hasFileOnRemoteHost()) {
packet.setBody(message.getFileParams().url.toString()); Message.FileParams fileParams = message.getFileParams();
content = fileParams.url.toString();
if (fileParams.width > 0 && fileParams.height > 0) {
addXhtmlImImage(packet,fileParams);
}
packet.addChild("x","jabber:x:oob").addChild("url").setContent(fileParams.url.toString());
} else { } else {
packet.setBody(message.getBody()); content = message.getBody();
} }
packet.setBody(content);
return packet; return packet;
} }