aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/xmpp/jingle
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-12 10:02:48 +0200
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-12 10:02:48 +0200
commitd936a830e4866f070ba7726ecb845cc66644a238 (patch)
tree459db6ae6f15c7c6fabb5a25842f099b5183c534 /src/eu/siacs/conversations/xmpp/jingle
parent96be96f9f8a7ccae492f87ac703585bc6ac2e7b1 (diff)
add sha1 sum to file
Diffstat (limited to 'src/eu/siacs/conversations/xmpp/jingle')
-rw-r--r--src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java4
-rw-r--r--src/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index a5453443..31b643c0 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -34,6 +34,7 @@ public class JingleConnection {
private String responder;
private List<Element> candidates = new ArrayList<Element>();
private HashMap<String, SocksConnection> connections = new HashMap<String, SocksConnection>();
+ private File file = null;
private OnIqPacketReceived responseListener = new OnIqPacketReceived() {
@@ -110,7 +111,8 @@ public class JingleConnection {
if (message.getType() == Message.TYPE_IMAGE) {
content.setAttribute("creator", "initiator");
content.setAttribute("name", "a-file-offer");
- content.offerFile(this.mXmppConnectionService.getFileBackend().getImageFile(message));
+ this.file = this.mXmppConnectionService.getFileBackend().getImageFile(message);
+ content.offerFile(file,message.getBody());
content.setCandidates(this.mJingleConnectionManager.nextRandomId(),this.candidates);
packet.setContent(content);
Log.d("xmppService",packet.toString());
diff --git a/src/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java b/src/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java
index 27d6b9e3..304656ee 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java
@@ -15,12 +15,13 @@ public class Content extends Element {
super("content");
}
- public void offerFile(File actualFile) {
+ public void offerFile(File actualFile, String hash) {
Element description = this.addChild("description", "urn:xmpp:jingle:apps:file-transfer:3");
Element offer = description.addChild("offer");
Element file = offer.addChild("file");
file.addChild("size").setContent(""+actualFile.length());
file.addChild("name").setContent(actualFile.getName());
+ file.addChild("hash","urn:xmpp:hashes:1").setAttribute("algo", "sha-1").setContent(hash);
}
public void setCandidates(String transportId, List<Element> canditates) {