push file offered notification when initial HTTP HEAD req. fails

1 files changed, 7 insertions, 6 deletions

diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
index 6f141aa86..59116d993 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
@@ -152,7 +152,6 @@ public class HttpDownloadConnection implements Transferable {
 	}
 
 	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) {
@@ -177,15 +176,14 @@ public class HttpDownloadConnection implements Transferable {
 			long size;
 			try {
 				size = retrieveFileSize();
-			} catch (SSLHandshakeException e) {
+			} catch (Exception e) {
 				changeStatus(STATUS_OFFER_CHECK_FILESIZE);
-				HttpDownloadConnection.this.acceptedAutomatically = false;
-				HttpDownloadConnection.this.mXmppConnectionService.getNotificationService().push(message);
-				return;
-			} catch (IOException e) {
 				Log.d(Config.LOGTAG, "io exception in http file size checker: " + e.getMessage());
 				if (interactive) {
 					showToastForException(e);
+				} else {
+					HttpDownloadConnection.this.acceptedAutomatically = false;
+					HttpDownloadConnection.this.mXmppConnectionService.getNotificationService().push(message);
 				}
 				cancel();
 				return;
@@ -259,6 +257,9 @@ public class HttpDownloadConnection implements Transferable {
 			} catch (Exception e) {
 				if (interactive) {
 					showToastForException(e);
+				} else {
+					HttpDownloadConnection.this.acceptedAutomatically = false;
+					HttpDownloadConnection.this.mXmppConnectionService.getNotificationService().push(message);
 				}
 				cancel();
 			}