not working version of otr file transfer

1 files changed, 20 insertions, 4 deletions

diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index 8f88688a..85110c38 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -9,11 +9,11 @@ import java.util.Map.Entry;
 
 import android.graphics.BitmapFactory;
 import android.util.Log;
-
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.services.XmppConnectionService;
+import eu.siacs.conversations.utils.CryptoHelper;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.OnIqPacketReceived;
 import eu.siacs.conversations.xmpp.jingle.stanzas.Content;
@@ -24,7 +24,7 @@ import eu.siacs.conversations.xmpp.stanzas.IqPacket;
 public class JingleConnection {
 
 	private final String[] extensions = {"webp","jpeg","jpg","png"};
-	private final String[] cryptoExtensions = {"pgp","gpg"};
+	private final String[] cryptoExtensions = {"pgp","gpg","otr"};
 	
 	private JingleConnectionManager mJingleConnectionManager;
 	private XmppConnectionService mXmppConnectionService;
@@ -244,6 +244,7 @@ public class JingleConnection {
 			Element fileNameElement = fileOffer.findChild("name");
 			if (fileNameElement!=null) {
 				boolean supportedFile = false;
+				Log.d("xmppService","file offer: "+fileNameElement.getContent());
 				String[] filename = fileNameElement.getContent().toLowerCase().split("\\.");
 				if (Arrays.asList(this.extensions).contains(filename[filename.length - 1])) {
 					supportedFile = true;
@@ -251,7 +252,12 @@ public class JingleConnection {
 					if (filename.length == 3) {
 						if (Arrays.asList(this.extensions).contains(filename[filename.length -2])) {
 							supportedFile = true;
-							this.message.setEncryption(Message.ENCRYPTION_PGP);
+							if (filename[filename.length - 1].equals("otr")) {
+								Log.d("xmppService","receiving otr file");
+								this.message.setEncryption(Message.ENCRYPTION_OTR);
+							} else {
+								this.message.setEncryption(Message.ENCRYPTION_PGP);
+							}
 						}
 					}
 				}
@@ -269,6 +275,9 @@ public class JingleConnection {
 						this.mXmppConnectionService.updateUi(conversation, true);
 					}
 					this.file = this.mXmppConnectionService.getFileBackend().getJingleFile(message,false);
+					if (message.getEncryption() == Message.ENCRYPTION_OTR) {
+						this.file.setKey(conversation.getSymmetricKey());
+					}
 					this.file.setExpectedSize(size);
 				} else {
 					this.sendCancel();
@@ -287,7 +296,14 @@ public class JingleConnection {
 		if (message.getType() == Message.TYPE_IMAGE) {
 			content.setTransportId(this.transportId);
 			this.file = this.mXmppConnectionService.getFileBackend().getJingleFile(message,false);
-			content.setFileOffer(this.file);
+			if (message.getEncryption() == Message.ENCRYPTION_OTR) {
+				Conversation conversation = this.message.getConversation();
+				this.mXmppConnectionService.renewSymmetricKey(conversation);
+				content.setFileOffer(this.file, true);
+				this.file.setKey(conversation.getSymmetricKey());
+			} else {
+				content.setFileOffer(this.file,false);
+			}
 			this.transportId = this.mJingleConnectionManager.nextRandomId();
 			content.setTransportId(this.transportId);
 			content.socks5transport().setChildren(getCandidatesAsElements());