From 45e0f99b8841ed64f70c29e5c986509693833f92 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Thu, 16 Oct 2014 15:29:39 +0200
Subject: make image download message to type=image only after completion

---
 src/eu/siacs/conversations/http/HttpConnection.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/eu/siacs/conversations/http/HttpConnection.java b/src/eu/siacs/conversations/http/HttpConnection.java
index 34036412..b0c230d0 100644
--- a/src/eu/siacs/conversations/http/HttpConnection.java
+++ b/src/eu/siacs/conversations/http/HttpConnection.java
@@ -62,8 +62,7 @@ public class HttpConnection implements Downloadable {
 	public void cancel() {
 		mHttpConnectionManager.finishConnection(this);
 		message.setDownloadable(null);
-		message.setBody(mUrl.toString());
-		mXmppConnectionService.updateMessage(message);
+		mXmppConnectionService.updateConversationUi();
 	}
 
 	private void finish() {
@@ -91,7 +90,6 @@ public class HttpConnection implements Downloadable {
 				return;
 			}
 			file.setExpectedSize(size);
-			message.setType(Message.TYPE_IMAGE);
 			if (size <= mHttpConnectionManager.getAutoAcceptFileSize() && mAutostart) {
 				start();
 			} else {
@@ -159,6 +157,7 @@ public class HttpConnection implements Downloadable {
 			int imageWidth = options.outWidth;
 			message.setBody(mUrl.toString() + "," + file.getSize() + ','
 					+ imageWidth + ',' + imageHeight);
+			message.setType(Message.TYPE_IMAGE);
 			mXmppConnectionService.updateMessage(message);
 		}
 
-- 
cgit v1.2.3