Merge branch 'trz/rebase' into trz/rename

3 files changed, 234 insertions, 131 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java
index 484e77a3..59c54662 100644
--- a/src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java
+++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java
@@ -2,6 +2,10 @@ package de.thedevstack.conversationsplus.http;
 
 import org.apache.http.conn.ssl.StrictHostnameVerifier;
 
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
@@ -17,6 +21,7 @@ import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.services.AbstractConnectionManager;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.utils.CryptoHelper;
+import de.thedevstack.conversationsplus.utils.SSLSocketHelper;
 
 public class HttpConnectionManager extends AbstractConnectionManager {
 
@@ -38,9 +43,9 @@ public class HttpConnectionManager extends AbstractConnectionManager {
 		return connection;
 	}
 
-	public HttpUploadConnection createNewUploadConnection(Message message) {
+	public HttpUploadConnection createNewUploadConnection(Message message, boolean delay) {
 		HttpUploadConnection connection = new HttpUploadConnection(this);
-		connection.init(message);
+		connection.init(message,delay);
 		this.uploadConnections.add(connection);
 		return connection;
 	}
@@ -70,7 +75,7 @@ public class HttpConnectionManager extends AbstractConnectionManager {
 							new StrictHostnameVerifier());
 		}
 		try {
-			final SSLContext sc = SSLContext.getInstance("TLS");
+			final SSLContext sc = SSLSocketHelper.getSSLContext();
 			sc.init(null, new X509TrustManager[]{trustManager},
 					mXmppConnectionService.getRNG());
 
@@ -87,4 +92,8 @@ public class HttpConnectionManager extends AbstractConnectionManager {
 		} catch (final KeyManagementException | NoSuchAlgorithmException ignored) {
 		}
 	}
+
+	public Proxy getProxy() throws IOException {
+		return new Proxy(Proxy.Type.HTTP, new InetSocketAddress(InetAddress.getLocalHost(), 8118));
+	}
 }
diff --git a/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
index d8859df5..4381ed03 100644
--- a/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
@@ -2,30 +2,36 @@ package de.thedevstack.conversationsplus.http;
 
 import android.content.Intent;
 import android.net.Uri;
-import android.os.SystemClock;
+import android.os.PowerManager;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Arrays;
+import java.util.concurrent.CancellationException;
 
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLHandshakeException;
 
 import de.thedevstack.android.logcat.Logging;
-import de.thedevstack.conversationsplus.Config;
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
+import de.thedevstack.conversationsplus.utils.StreamUtil;
+import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.R;
-import de.thedevstack.conversationsplus.entities.Transferable;
 import de.thedevstack.conversationsplus.entities.DownloadableFile;
 import de.thedevstack.conversationsplus.entities.Message;
+import de.thedevstack.conversationsplus.entities.Transferable;
+import de.thedevstack.conversationsplus.entities.TransferablePlaceholder;
 import de.thedevstack.conversationsplus.persistance.FileBackend;
+import de.thedevstack.conversationsplus.services.AbstractConnectionManager;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.utils.CryptoHelper;
-import de.thedevstack.conversationsplus.utils.MessageUtil;
 
 public class HttpDownloadConnection implements Transferable {
 
@@ -38,7 +44,7 @@ public class HttpDownloadConnection implements Transferable {
 	private int mStatus = Transferable.STATUS_UNKNOWN;
 	private boolean acceptedAutomatically = false;
 	private int mProgress = 0;
-	private long mLastGuiRefresh = 0;
+    private boolean canceled = false;
 
 	public HttpDownloadConnection(HttpConnectionManager manager) {
 		this.mHttpConnectionManager = manager;
@@ -64,39 +70,45 @@ public class HttpDownloadConnection implements Transferable {
 	}
 
 	public void init(Message message, boolean interactive) {
-		this.message = message;
-		this.message.setTransferable(this);
-		try {
-			mUrl = new URL(message.getBody());
-			String[] parts = mUrl.getPath().toLowerCase().split("\\.");
-			String lastPart = parts.length >= 1 ? parts[parts.length - 1] : null;
-			String secondToLast = parts.length >= 2 ? parts[parts.length -2] : null;
-			if ("pgp".equals(lastPart) || "gpg".equals(lastPart)) {
-				this.message.setEncryption(Message.ENCRYPTION_PGP);
-			} else if (message.getEncryption() != Message.ENCRYPTION_OTR) {
-				this.message.setEncryption(Message.ENCRYPTION_NONE);
-			}
-			String extension;
-			if (Arrays.asList(VALID_CRYPTO_EXTENSIONS).contains(lastPart)) {
-				extension = secondToLast;
-			} else {
-				extension = lastPart;
-			}
-			message.setRelativeFilePath(message.getUuid()+"."+extension);
-			this.file = FileBackend.getFile(message, false);
-			String reference = mUrl.getRef();
-			if (reference != null && reference.length() == 96) {
-				this.file.setKey(CryptoHelper.hexToBytes(reference));
-			}
-
-			if (this.message.getEncryption() == Message.ENCRYPTION_OTR
-					&& this.file.getKey() == null) {
-				this.message.setEncryption(Message.ENCRYPTION_NONE);
-					}
-			checkFileSize(interactive);
-		} catch (MalformedURLException e) {
-			this.cancel();
-		}
+        this.message = message;
+        this.message.setTransferable(this);
+        try {
+            if (message.hasFileOnRemoteHost()) {
+                mUrl = message.getFileParams().url;
+            } else {
+                mUrl = new URL(message.getBody());
+            }
+            String[] parts = mUrl.getPath().toLowerCase().split("\\.");
+            String lastPart = parts.length >= 1 ? parts[parts.length - 1] : null;
+            String secondToLast = parts.length >= 2 ? parts[parts.length -2] : null;
+            if ("pgp".equals(lastPart) || "gpg".equals(lastPart)) {
+                this.message.setEncryption(Message.ENCRYPTION_PGP);
+            } else if (message.getEncryption() != Message.ENCRYPTION_OTR
+                    && message.getEncryption() != Message.ENCRYPTION_AXOLOTL) {
+                this.message.setEncryption(Message.ENCRYPTION_NONE);
+            }
+            String extension;
+            if (Arrays.asList(VALID_CRYPTO_EXTENSIONS).contains(lastPart)) {
+                extension = secondToLast;
+            } else {
+                extension = lastPart;
+            }
+            message.setRelativeFilePath(message.getUuid()+"."+extension);
+            this.file = FileBackend.getFile(message, false);
+            String reference = mUrl.getRef();
+            if (reference != null && reference.length() == 96) {
+                this.file.setKeyAndIv(CryptoHelper.hexToBytes(reference));
+            }
+
+            if ((this.message.getEncryption() == Message.ENCRYPTION_OTR
+                    || this.message.getEncryption() == Message.ENCRYPTION_AXOLOTL)
+                    && this.file.getKey() == null) {
+                this.message.setEncryption(Message.ENCRYPTION_NONE);
+            }
+            checkFileSize(interactive);
+        } catch (MalformedURLException e) {
+            this.cancel();
+        }
 	}
 
 	private void checkFileSize(boolean interactive) {
@@ -104,21 +116,29 @@ public class HttpDownloadConnection implements Transferable {
 	}
 
 	public void cancel() {
-		mHttpConnectionManager.finishConnection(this);
-		message.setTransferable(null);
-		mXmppConnectionService.updateConversationUi();
+        this.canceled = true;
+        mHttpConnectionManager.finishConnection(this);
+        if (message.isFileOrImage()) {
+            message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_DELETED));
+        } else {
+            message.setTransferable(null);
+        }
+        mXmppConnectionService.updateConversationUi();
 	}
 
 	private void finish() {
-		Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
-		intent.setData(Uri.fromFile(file));
-		mXmppConnectionService.sendBroadcast(intent);
-		message.setTransferable(null);
-		mHttpConnectionManager.finishConnection(this);
-		mXmppConnectionService.updateConversationUi();
-		if (acceptedAutomatically) {
-			mXmppConnectionService.getNotificationService().push(message);
-		}
+        Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
+        intent.setData(Uri.fromFile(file));
+        mXmppConnectionService.sendBroadcast(intent);
+        message.setTransferable(null);
+        mHttpConnectionManager.finishConnection(this);
+        if (message.getEncryption() == Message.ENCRYPTION_PGP) {
+            message.getConversation().getAccount().getPgpDecryptionService().add(message);
+        }
+        mXmppConnectionService.updateConversationUi();
+        if (acceptedAutomatically) {
+            mXmppConnectionService.getNotificationService().push(message);
+        }
 	}
 
 	private void changeStatus(int status) {
@@ -126,6 +146,17 @@ public class HttpDownloadConnection implements Transferable {
 		mXmppConnectionService.updateConversationUi();
 	}
 
+	private void showToastForException(Exception e) {
+		e.printStackTrace();
+		if (e instanceof java.net.UnknownHostException) {
+			mXmppConnectionService.showErrorToastInUi(R.string.download_failed_server_not_found);
+		} else if (e instanceof java.net.ConnectException) {
+			mXmppConnectionService.showErrorToastInUi(R.string.download_failed_could_not_connect);
+		} else if (!(e instanceof CancellationException)) {
+			mXmppConnectionService.showErrorToastInUi(R.string.download_failed_file_not_found);
+		}
+	}
+
 	private class FileSizeChecker implements Runnable {
 
 		private boolean interactive = false;
@@ -147,7 +178,7 @@ public class HttpDownloadConnection implements Transferable {
 			} catch (IOException e) {
 				Logging.d(Config.LOGTAG, "io exception in http file size checker: " + e.getMessage());
 				if (interactive) {
-					mXmppConnectionService.showErrorToastInUi(R.string.file_not_found_on_remote_host);
+					showToastForException(e);
 				}
 				cancel();
 				return;
@@ -164,31 +195,38 @@ public class HttpDownloadConnection implements Transferable {
 		}
 
 		private long retrieveFileSize() throws IOException {
-			Logging.d(Config.LOGTAG,"retrieve file size. interactive:"+String.valueOf(interactive));
-			changeStatus(STATUS_CHECKING);
-			HttpURLConnection connection = (HttpURLConnection) mUrl.openConnection();
-			connection.setRequestMethod("HEAD");
-			if (connection instanceof HttpsURLConnection) {
-				mHttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, interactive);
-			}
-			connection.connect();
-			String contentLength = connection.getHeaderField("Content-Length");
-			if (contentLength == null) {
-				return -1;
-			}
-			try {
-				return Long.parseLong(contentLength, 10);
-			} catch (NumberFormatException e) {
-				return -1;
-			}
+            try {
+                Logging.d(Config.LOGTAG, "retrieve file size. interactive:" + String.valueOf(interactive));
+                changeStatus(STATUS_CHECKING);
+                HttpURLConnection connection = (HttpURLConnection) mUrl.openConnection();
+                connection.setRequestMethod("HEAD");
+                Logging.d(Config.LOGTAG, "url: "+connection.getURL().toString());
+                Logging.d(Config.LOGTAG, "connection: "+connection.toString());
+                connection.setRequestProperty("User-Agent", ConversationsPlusApplication.getNameAndVersion());
+                if (connection instanceof HttpsURLConnection) {
+                    mHttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, interactive);
+                }
+                connection.connect();
+                String contentLength = connection.getHeaderField("Content-Length");
+                connection.disconnect();
+                if (contentLength == null) {
+                    return -1;
+                }
+                return Long.parseLong(contentLength, 10);
+            } catch (IOException e) {
+                return -1;
+            } catch (NumberFormatException e) {
+                return -1;
+            }
 		}
-
 	}
 
 	private class FileDownloader implements Runnable {
 
 		private boolean interactive = false;
 
+        private OutputStream os;
+
 		public FileDownloader(boolean interactive) {
 			this.interactive = interactive;
 		}
@@ -202,37 +240,69 @@ public class HttpDownloadConnection implements Transferable {
 				finish();
 			} catch (SSLHandshakeException e) {
 				changeStatus(STATUS_OFFER);
-			} catch (IOException e) {
-				mXmppConnectionService.showErrorToastInUi(R.string.file_not_found_on_remote_host);
-				cancel();
+			} catch (Exception e) {
+                if (interactive) {
+                    showToastForException(e);
+                }
+                cancel();
 			}
 		}
 
 		private void download() throws SSLHandshakeException, IOException {
-			HttpURLConnection connection = (HttpURLConnection) mUrl.openConnection();
-			if (connection instanceof HttpsURLConnection) {
-				mHttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, interactive);
-			}
-			connection.connect();
-			BufferedInputStream is = new BufferedInputStream(connection.getInputStream());
-			file.getParentFile().mkdirs();
-			file.createNewFile();
-			OutputStream os = file.createOutputStream();
-			if (os == null) {
-				throw new IOException();
-			}
-			long transmitted = 0;
-			long expected = file.getExpectedSize();
-			int count = -1;
-			byte[] buffer = new byte[1024];
-			while ((count = is.read(buffer)) != -1) {
-				transmitted += count;
-				os.write(buffer, 0, count);
-				updateProgress((int) ((((double) transmitted) / expected) * 100));
-			}
-			os.flush();
-			os.close();
-			is.close();
+            InputStream is = null;
+            PowerManager.WakeLock wakeLock = mHttpConnectionManager.createWakeLock("http_download_"+message.getUuid());
+            try {
+                wakeLock.acquire();
+                HttpURLConnection connection = (HttpURLConnection) mUrl.openConnection();
+                if (connection instanceof HttpsURLConnection) {
+                    mHttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, interactive);
+                }
+                connection.setRequestProperty("User-Agent", ConversationsPlusApplication.getNameAndVersion());
+                final boolean tryResume = file.exists() && file.getKey() == null;
+                if (tryResume) {
+                    Logging.d(Config.LOGTAG, "http download trying resume");
+                    long size = file.getSize();
+                    connection.setRequestProperty("Range", "bytes="+size+"-");
+                }
+                connection.connect();
+                is = new BufferedInputStream(connection.getInputStream());
+                boolean serverResumed = "bytes".equals(connection.getHeaderField("Accept-Ranges"));
+                long transmitted = 0;
+                long expected = file.getExpectedSize();
+                if (tryResume && serverResumed) {
+                    Logging.d(Config.LOGTAG, "server resumed");
+                    transmitted = file.getSize();
+                    updateProgress((int) ((((double) transmitted) / expected) * 100));
+                    os = AbstractConnectionManager.createAppendedOutputStream(file);
+                } else {
+                    file.getParentFile().mkdirs();
+                    file.createNewFile();
+                    os = AbstractConnectionManager.createOutputStream(file, true);
+                }
+                int count = -1;
+                byte[] buffer = new byte[1024];
+                while ((count = is.read(buffer)) != -1) {
+                    transmitted += count;
+                    os.write(buffer, 0, count);
+                    updateProgress((int) ((((double) transmitted) / expected) * 100));
+                    if (canceled) {
+                        throw new CancellationException();
+                    }
+                }
+            } catch (CancellationException | IOException e) {
+                throw e;
+            } finally {
+                if (os != null) {
+                    try {
+                        os.flush();
+                    } catch (final IOException ignored) {
+
+                    }
+                }
+                StreamUtil.close(os);
+                StreamUtil.close(is);
+                wakeLock.release();
+            }
 		}
 
 		private void updateImageBounds() {
@@ -240,15 +310,11 @@ public class HttpDownloadConnection implements Transferable {
 			MessageUtil.updateFileParams(message, mUrl);
 			mXmppConnectionService.updateMessage(message);
 		}
-
 	}
 
 	public void updateProgress(int i) {
-		this.mProgress = i;
-		if (SystemClock.elapsedRealtime() - this.mLastGuiRefresh > Config.PROGRESS_UI_UPDATE_INTERVAL) {
-			this.mLastGuiRefresh = SystemClock.elapsedRealtime();
-			mXmppConnectionService.updateConversationUi();
-		}
+        this.mProgress = i;
+        mXmppConnectionService.updateConversationUi();
 	}
 
 	@Override
diff --git a/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
index 58488c99..5eab0a6b 100644
--- a/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
@@ -1,7 +1,12 @@
 package de.thedevstack.conversationsplus.http;
 
 import android.app.PendingIntent;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.PowerManager;
+import android.util.Pair;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -12,17 +17,19 @@ import java.net.URL;
 import javax.net.ssl.HttpsURLConnection;
 
 import de.thedevstack.android.logcat.Logging;
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
+import de.thedevstack.conversationsplus.utils.StreamUtil;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.entities.Account;
-import de.thedevstack.conversationsplus.entities.Transferable;
 import de.thedevstack.conversationsplus.entities.DownloadableFile;
 import de.thedevstack.conversationsplus.entities.Message;
+import de.thedevstack.conversationsplus.entities.Transferable;
 import de.thedevstack.conversationsplus.persistance.FileBackend;
+import de.thedevstack.conversationsplus.services.AbstractConnectionManager;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.ui.UiCallback;
 import de.thedevstack.conversationsplus.utils.CryptoHelper;
-import de.thedevstack.conversationsplus.utils.MessageUtil;
-import de.thedevstack.conversationsplus.utils.StreamUtil;
 import de.thedevstack.conversationsplus.utils.Xmlns;
 import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived;
@@ -35,16 +42,19 @@ public class HttpUploadConnection implements Transferable {
 	private XmppConnectionService mXmppConnectionService;
 
 	private boolean canceled = false;
+	private boolean delayed = false;
 	private Account account;
 	private DownloadableFile file;
 	private Message message;
+	private String mime;
 	private URL mGetUrl;
 	private URL mPutUrl;
 
 	private byte[] key = null;
 
 	private long transmitted = 0;
-	private long expected = 1;
+
+	private InputStream mFileInputStream;
 
 	public HttpUploadConnection(HttpConnectionManager httpConnectionManager) {
 		this.mHttpConnectionManager = httpConnectionManager;
@@ -63,12 +73,15 @@ public class HttpUploadConnection implements Transferable {
 
 	@Override
 	public long getFileSize() {
-		return this.file.getExpectedSize();
+		return file == null ? 0 : file.getExpectedSize();
 	}
 
 	@Override
 	public int getProgress() {
-		return (int) ((((double) transmitted) / expected) * 100);
+		if (file == null) {
+			return 0;
+		}
+		return (int) ((((double) transmitted) / file.getExpectedSize()) * 100);
 	}
 
 	@Override
@@ -79,25 +92,34 @@ public class HttpUploadConnection implements Transferable {
 	private void fail() {
 		mHttpConnectionManager.finishUploadConnection(this);
 		message.setTransferable(null);
-		mXmppConnectionService.markMessage(message,Message.STATUS_SEND_FAILED);
+		mXmppConnectionService.markMessage(message, Message.STATUS_SEND_FAILED);
+		StreamUtil.close(mFileInputStream);
 	}
 
-	public void init(Message message) {
+	public void init(Message message, boolean delay) {
 		this.message = message;
-		message.setTransferable(this);
-		mXmppConnectionService.markMessage(message,Message.STATUS_UNSEND);
 		this.account = message.getConversation().getAccount();
 		this.file = FileBackend.getFile(message, false);
-		this.file.setExpectedSize(this.file.getSize());
-
-		if (Config.ENCRYPT_ON_HTTP_UPLOADED) {
+		this.mime = this.file.getMimeType();
+		this.delayed = delay;
+		if (Config.ENCRYPT_ON_HTTP_UPLOADED
+				|| message.getEncryption() == Message.ENCRYPTION_AXOLOTL
+				|| message.getEncryption() == Message.ENCRYPTION_OTR) {
 			this.key = new byte[48];
 			mXmppConnectionService.getRNG().nextBytes(this.key);
-			this.file.setKey(this.key);
+			this.file.setKeyAndIv(this.key);
 		}
-
+		Pair<InputStream,Integer> pair;
+		try {
+			pair = AbstractConnectionManager.createInputStream(file, true);
+		} catch (FileNotFoundException e) {
+			fail();
+			return;
+		}
+		this.file.setExpectedSize(pair.second);
+		this.mFileInputStream = pair.first;
 		Jid host = account.getXmppConnection().findDiscoItemByFeature(Xmlns.HTTP_UPLOAD);
-		IqPacket request = mXmppConnectionService.getIqGenerator().requestHttpUploadSlot(host,file);
+		IqPacket request = mXmppConnectionService.getIqGenerator().requestHttpUploadSlot(host,file,mime);
 		mXmppConnectionService.sendIqPacket(account, request, new OnIqPacketReceived() {
 			@Override
 			public void onIqPacketReceived(Account account, IqPacket packet) {
@@ -121,6 +143,8 @@ public class HttpUploadConnection implements Transferable {
 				}
 			}
 		});
+		message.setTransferable(this);
+		mXmppConnectionService.markMessage(message, Message.STATUS_UNSEND);
 	}
 
 	private class FileUploader implements Runnable {
@@ -132,47 +156,51 @@ public class HttpUploadConnection implements Transferable {
 
 		private void upload() {
 			OutputStream os = null;
-			InputStream is = null;
 			HttpURLConnection connection = null;
+			PowerManager.WakeLock wakeLock = mHttpConnectionManager.createWakeLock("http_upload_"+message.getUuid());
 			try {
+				wakeLock.acquire();
 				Logging.d(Config.LOGTAG, "uploading to " + mPutUrl.toString());
 				connection = (HttpURLConnection) mPutUrl.openConnection();
-				if (connection instanceof HttpsURLConnection) {
+
+                if (connection instanceof HttpsURLConnection) {
 					mHttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, true);
 				}
 				connection.setRequestMethod("PUT");
 				connection.setFixedLengthStreamingMode((int) file.getExpectedSize());
+				connection.setRequestProperty("Content-Type", mime == null ? "application/octet-stream" : mime);
+				connection.setRequestProperty("User-Agent", ConversationsPlusApplication.getNameAndVersion());
 				connection.setDoOutput(true);
 				connection.connect();
 				os = connection.getOutputStream();
-				is = file.createInputStream();
 				transmitted = 0;
-				expected = file.getExpectedSize();
 				int count = -1;
 				byte[] buffer = new byte[4096];
-				while (((count = is.read(buffer)) != -1) && !canceled) {
+				while (((count = mFileInputStream.read(buffer)) != -1) && !canceled) {
 					transmitted += count;
 					os.write(buffer, 0, count);
 					mXmppConnectionService.updateConversationUi();
 				}
 				os.flush();
 				os.close();
-				is.close();
+				mFileInputStream.close();
 				int code = connection.getResponseCode();
 				if (code == 200 || code == 201) {
 					Logging.d(Config.LOGTAG, "finished uploading file");
-					Message.FileParams params = message.getFileParams();
 					if (key != null) {
 						mGetUrl = new URL(mGetUrl.toString() + "#" + CryptoHelper.bytesToHex(key));
 					}
 					MessageUtil.updateFileParams(message, mGetUrl);
+					Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
+					intent.setData(Uri.fromFile(file));
+					mXmppConnectionService.sendBroadcast(intent);
 					message.setTransferable(null);
 					message.setCounterpart(message.getConversation().getJid().toBareJid());
 					if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
 						mXmppConnectionService.getPgpEngine().encrypt(message, new UiCallback<Message>() {
 							@Override
 							public void success(Message message) {
-								mXmppConnectionService.resendMessage(message);
+								mXmppConnectionService.resendMessage(message,delayed);
 							}
 
 							@Override
@@ -186,7 +214,7 @@ public class HttpUploadConnection implements Transferable {
 							}
 						});
 					} else {
-						mXmppConnectionService.resendMessage(message);
+						mXmppConnectionService.resendMessage(message, delayed);
 					}
 				} else {
 					fail();
@@ -195,11 +223,11 @@ public class HttpUploadConnection implements Transferable {
 				Logging.d(Config.LOGTAG, e.getMessage());
 				fail();
 			} finally {
-				StreamUtil.close(is);
 				StreamUtil.close(os);
 				if (connection != null) {
 					connection.disconnect();
 				}
+				wakeLock.release();
 			}
 		}
 	}