1 files changed, 14 insertions, 17 deletions
diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
index 0d202bb9..356f9417 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
@@ -165,7 +165,7 @@ public class HttpDownloadConnection implements Transferable {
 				return;
 			}
 			file.setExpectedSize(size);
-			if (size <= mHttpConnectionManager.getAutoAcceptFileSize()) {
+			if (size != -1 && size <= mHttpConnectionManager.getAutoAcceptFileSize()) {
 				HttpDownloadConnection.this.acceptedAutomatically = true;
 				new Thread(new FileDownloader(interactive)).start();
 			} else {
@@ -176,25 +176,22 @@ public class HttpDownloadConnection implements Transferable {
 		}
 
 		private long retrieveFileSize() throws IOException {
+			Log.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 {
-				Log.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");
-				connection.disconnect();
-				if (contentLength == null) {
-					throw new IOException();
-				}
 				return Long.parseLong(contentLength, 10);
-			} catch (IOException e) {
-				throw e;
 			} catch (NumberFormatException e) {
-				throw new IOException();
+				return -1;
 			}
 		}