basic image over http downloading

8 files changed, 27 insertions, 184 deletions

diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index 92fdbe0b..4dac54f6 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -13,6 +13,7 @@ import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.util.Log;
 import eu.siacs.conversations.Config;
+import eu.siacs.conversations.DownloadableFile;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Downloadable;
@@ -54,7 +55,7 @@ public class JingleConnection implements Downloadable {
 
 	private String transportId;
 	private Element fileOffer;
-	private JingleFile file = null;
+	private DownloadableFile file = null;
 
 	private String contentName;
 	private String contentCreator;
@@ -83,7 +84,7 @@ public class JingleConnection implements Downloadable {
 	final OnFileTransmissionStatusChanged onFileTransmissionSatusChanged = new OnFileTransmissionStatusChanged() {
 
 		@Override
-		public void onFileTransmitted(JingleFile file) {
+		public void onFileTransmitted(DownloadableFile file) {
 			if (responder.equals(account.getFullJid())) {
 				sendSuccess();
 				if (acceptedAutomatically) {
@@ -323,7 +324,7 @@ public class JingleConnection implements Downloadable {
 								.push(message);
 					}
 					this.file = this.mXmppConnectionService.getFileBackend()
-							.getJingleFile(message, false);
+							.getConversationsFile(message, false);
 					if (message.getEncryption() == Message.ENCRYPTION_OTR) {
 						byte[] key = conversation.getSymmetricKey();
 						if (key == null) {
@@ -355,7 +356,7 @@ public class JingleConnection implements Downloadable {
 		if (message.getType() == Message.TYPE_IMAGE) {
 			content.setTransportId(this.transportId);
 			this.file = this.mXmppConnectionService.getFileBackend()
-					.getJingleFile(message, false);
+					.getConversationsFile(message, false);
 			if (message.getEncryption() == Message.ENCRYPTION_OTR) {
 				Conversation conversation = this.message.getConversation();
 				this.mXmppConnectionService.renewSymmetricKey(conversation);
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
index 79090af6..93b03ff8 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import android.annotation.SuppressLint;
 import android.util.Log;
+import eu.siacs.conversations.AbstractConnectionManager;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Message;
@@ -16,10 +17,7 @@ import eu.siacs.conversations.xmpp.OnIqPacketReceived;
 import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket;
 import eu.siacs.conversations.xmpp.stanzas.IqPacket;
 
-public class JingleConnectionManager {
-
-	private XmppConnectionService xmppConnectionService;
-
+public class JingleConnectionManager extends AbstractConnectionManager {
 	private List<JingleConnection> connections = new CopyOnWriteArrayList<JingleConnection>();
 
 	private HashMap<String, JingleCandidate> primaryCandidates = new HashMap<String, JingleCandidate>();
@@ -28,7 +26,7 @@ public class JingleConnectionManager {
 	private SecureRandom random = new SecureRandom();
 
 	public JingleConnectionManager(XmppConnectionService service) {
-		this.xmppConnectionService = service;
+		super(service);
 	}
 
 	public void deliverPacket(Account account, JinglePacket packet) {
@@ -68,10 +66,6 @@ public class JingleConnectionManager {
 		this.connections.remove(connection);
 	}
 
-	public XmppConnectionService getXmppConnectionService() {
-		return this.xmppConnectionService;
-	}
-
 	public void getPrimaryCandidate(Account account,
 			final OnPrimaryCandidateFound listener) {
 		if (!this.primaryCandidates.containsKey(account.getJid())) {
@@ -128,16 +122,6 @@ public class JingleConnectionManager {
 		return new BigInteger(50, random).toString(32);
 	}
 
-	public long getAutoAcceptFileSize() {
-		String config = this.xmppConnectionService.getPreferences().getString(
-				"auto_accept_file_size", "524288");
-		try {
-			return Long.parseLong(config);
-		} catch (NumberFormatException e) {
-			return 524288;
-		}
-	}
-
 	public void deliverIbbPacket(Account account, IqPacket packet) {
 		String sid = null;
 		Element payload = null;
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleFile.java b/src/eu/siacs/conversations/xmpp/jingle/JingleFile.java
deleted file mode 100644
index 9253814b..00000000
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleFile.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package eu.siacs.conversations.xmpp.jingle;
-
-import java.io.File;
-import java.security.Key;
-
-import javax.crypto.spec.SecretKeySpec;
-
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.utils.CryptoHelper;
-import android.util.Log;
-
-public class JingleFile extends File {
-
-	private static final long serialVersionUID = 2247012619505115863L;
-
-	private long expectedSize = 0;
-	private String sha1sum;
-	private Key aeskey;
-
-	public JingleFile(String path) {
-		super(path);
-	}
-
-	public long getSize() {
-		return super.length();
-	}
-
-	public long getExpectedSize() {
-		if (this.aeskey != null) {
-			return (this.expectedSize / 16 + 1) * 16;
-		} else {
-			return this.expectedSize;
-		}
-	}
-
-	public void setExpectedSize(long size) {
-		this.expectedSize = size;
-	}
-
-	public String getSha1Sum() {
-		return this.sha1sum;
-	}
-
-	public void setSha1Sum(String sum) {
-		this.sha1sum = sum;
-	}
-
-	public void setKey(byte[] key) {
-		if (key.length >= 32) {
-			byte[] secretKey = new byte[32];
-			System.arraycopy(key, 0, secretKey, 0, 32);
-			this.aeskey = new SecretKeySpec(secretKey, "AES");
-		} else if (key.length >= 16) {
-			byte[] secretKey = new byte[16];
-			System.arraycopy(key, 0, secretKey, 0, 16);
-			this.aeskey = new SecretKeySpec(secretKey, "AES");
-		} else {
-			Log.d(Config.LOGTAG, "weird key");
-		}
-		Log.d(Config.LOGTAG,
-				"using aes key "
-						+ CryptoHelper.bytesToHex(this.aeskey.getEncoded()));
-	}
-
-	public Key getKey() {
-		return this.aeskey;
-	}
-}
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java b/src/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
index c5498075..ed64c24a 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
@@ -1,6 +1,5 @@
 package eu.siacs.conversations.xmpp.jingle;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -9,6 +8,7 @@ import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
 import android.util.Base64;
+import eu.siacs.conversations.DownloadableFile;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.utils.CryptoHelper;
 import eu.siacs.conversations.xml.Element;
@@ -26,7 +26,7 @@ public class JingleInbandTransport extends JingleTransport {
 
 	private boolean established = false;
 
-	private JingleFile file;
+	private DownloadableFile file;
 
 	private InputStream fileInputStream = null;
 	private OutputStream fileOutputStream;
@@ -77,7 +77,7 @@ public class JingleInbandTransport extends JingleTransport {
 	}
 
 	@Override
-	public void receive(JingleFile file,
+	public void receive(DownloadableFile file,
 			OnFileTransmissionStatusChanged callback) {
 		this.onFileTransmissionStatusChanged = callback;
 		this.file = file;
@@ -86,7 +86,7 @@ public class JingleInbandTransport extends JingleTransport {
 			digest.reset();
 			file.getParentFile().mkdirs();
 			file.createNewFile();
-			this.fileOutputStream = getOutputStream(file);
+			this.fileOutputStream = file.createOutputStream();
 			if (this.fileOutputStream == null) {
 				callback.onFileTransferAborted();
 				return;
@@ -100,20 +100,18 @@ public class JingleInbandTransport extends JingleTransport {
 	}
 
 	@Override
-	public void send(JingleFile file, OnFileTransmissionStatusChanged callback) {
+	public void send(DownloadableFile file, OnFileTransmissionStatusChanged callback) {
 		this.onFileTransmissionStatusChanged = callback;
 		this.file = file;
 		try {
 			this.digest = MessageDigest.getInstance("SHA-1");
 			this.digest.reset();
-			fileInputStream = this.getInputStream(file);
+			fileInputStream = this.file.createInputStream();
 			if (fileInputStream == null) {
 				callback.onFileTransferAborted();
 				return;
 			}
 			this.sendNextBlock();
-		} catch (FileNotFoundException e) {
-			callback.onFileTransferAborted();
 		} catch (NoSuchAlgorithmException e) {
 			callback.onFileTransferAborted();
 		}
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java b/src/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
index 63f5a507..ec6b2c24 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
@@ -10,6 +10,7 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
+import eu.siacs.conversations.DownloadableFile;
 import eu.siacs.conversations.utils.CryptoHelper;
 
 public class JingleSocks5Transport extends JingleTransport {
@@ -86,7 +87,7 @@ public class JingleSocks5Transport extends JingleTransport {
 
 	}
 
-	public void send(final JingleFile file,
+	public void send(final DownloadableFile file,
 			final OnFileTransmissionStatusChanged callback) {
 		new Thread(new Runnable() {
 
@@ -96,7 +97,7 @@ public class JingleSocks5Transport extends JingleTransport {
 				try {
 					MessageDigest digest = MessageDigest.getInstance("SHA-1");
 					digest.reset();
-					fileInputStream = getInputStream(file);
+					fileInputStream = file.createInputStream();
 					if (fileInputStream == null) {
 						callback.onFileTransferAborted();
 						return;
@@ -132,7 +133,7 @@ public class JingleSocks5Transport extends JingleTransport {
 
 	}
 
-	public void receive(final JingleFile file,
+	public void receive(final DownloadableFile file,
 			final OnFileTransmissionStatusChanged callback) {
 		new Thread(new Runnable() {
 
@@ -145,7 +146,7 @@ public class JingleSocks5Transport extends JingleTransport {
 					socket.setSoTimeout(30000);
 					file.getParentFile().mkdirs();
 					file.createNewFile();
-					OutputStream fileOutputStream = getOutputStream(file);
+					OutputStream fileOutputStream = file.createOutputStream();
 					if (fileOutputStream == null) {
 						callback.onFileTransferAborted();
 						return;
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleTransport.java b/src/eu/siacs/conversations/xmpp/jingle/JingleTransport.java
index 07dc8ecc..185018e6 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleTransport.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleTransport.java
@@ -1,88 +1,13 @@
 package eu.siacs.conversations.xmpp.jingle;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.CipherInputStream;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.spec.IvParameterSpec;
-
-import eu.siacs.conversations.Config;
-
-import android.util.Log;
+import eu.siacs.conversations.DownloadableFile;
 
 public abstract class JingleTransport {
 	public abstract void connect(final OnTransportConnected callback);
 
-	public abstract void receive(final JingleFile file,
+	public abstract void receive(final DownloadableFile file,
 			final OnFileTransmissionStatusChanged callback);
 
-	public abstract void send(final JingleFile file,
+	public abstract void send(final DownloadableFile file,
 			final OnFileTransmissionStatusChanged callback);
-
-	private byte[] iv = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-			0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0xf };
-
-	protected InputStream getInputStream(JingleFile file)
-			throws FileNotFoundException {
-		if (file.getKey() == null) {
-			return new FileInputStream(file);
-		} else {
-			try {
-				IvParameterSpec ips = new IvParameterSpec(iv);
-				Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
-				cipher.init(Cipher.ENCRYPT_MODE, file.getKey(), ips);
-				Log.d(Config.LOGTAG, "opening encrypted input stream");
-				return new CipherInputStream(new FileInputStream(file), cipher);
-			} catch (NoSuchAlgorithmException e) {
-				Log.d(Config.LOGTAG, "no such algo: " + e.getMessage());
-				return null;
-			} catch (NoSuchPaddingException e) {
-				Log.d(Config.LOGTAG, "no such padding: " + e.getMessage());
-				return null;
-			} catch (InvalidKeyException e) {
-				Log.d(Config.LOGTAG, "invalid key: " + e.getMessage());
-				return null;
-			} catch (InvalidAlgorithmParameterException e) {
-				Log.d(Config.LOGTAG, "invavid iv:" + e.getMessage());
-				return null;
-			}
-		}
-	}
-
-	protected OutputStream getOutputStream(JingleFile file)
-			throws FileNotFoundException {
-		if (file.getKey() == null) {
-			return new FileOutputStream(file);
-		} else {
-			try {
-				IvParameterSpec ips = new IvParameterSpec(iv);
-				Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
-				cipher.init(Cipher.DECRYPT_MODE, file.getKey(), ips);
-				Log.d(Config.LOGTAG, "opening encrypted output stream");
-				return new CipherOutputStream(new FileOutputStream(file),
-						cipher);
-			} catch (NoSuchAlgorithmException e) {
-				Log.d(Config.LOGTAG, "no such algo: " + e.getMessage());
-				return null;
-			} catch (NoSuchPaddingException e) {
-				Log.d(Config.LOGTAG, "no such padding: " + e.getMessage());
-				return null;
-			} catch (InvalidKeyException e) {
-				Log.d(Config.LOGTAG, "invalid key: " + e.getMessage());
-				return null;
-			} catch (InvalidAlgorithmParameterException e) {
-				Log.d(Config.LOGTAG, "invavid iv:" + e.getMessage());
-				return null;
-			}
-		}
-	}
 }
diff --git a/src/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java b/src/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java
index 19fd4d97..a6df50a5 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java
@@ -1,7 +1,9 @@
 package eu.siacs.conversations.xmpp.jingle;
 
+import eu.siacs.conversations.DownloadableFile;
+
 public interface OnFileTransmissionStatusChanged {
-	public void onFileTransmitted(JingleFile file);
+	public void onFileTransmitted(DownloadableFile file);
 
 	public void onFileTransferAborted();
 }
diff --git a/src/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java b/src/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java
index d19e6dfd..e74d8965 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java
@@ -1,7 +1,7 @@
 package eu.siacs.conversations.xmpp.jingle.stanzas;
 
+import eu.siacs.conversations.DownloadableFile;
 import eu.siacs.conversations.xml.Element;
-import eu.siacs.conversations.xmpp.jingle.JingleFile;
 
 public class Content extends Element {
 
@@ -25,7 +25,7 @@ public class Content extends Element {
 		this.transportId = sid;
 	}
 
-	public void setFileOffer(JingleFile actualFile, boolean otr) {
+	public void setFileOffer(DownloadableFile actualFile, boolean otr) {
 		Element description = this.addChild("description",
 				"urn:xmpp:jingle:apps:file-transfer:3");
 		Element offer = description.addChild("offer");