From e9c00c0427cb3cb2d9347af69a150324a6a99a84 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 21 Jul 2016 19:17:26 +0200 Subject: [PATCH] push file offered notification when initial HTTP HEAD req. fails --- .../conversations/http/HttpDownloadConnection.java | 13 +++++++------ 1 file 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 f00a6cc5f..3e2b1cad7 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java @@ -146,7 +146,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) { @@ -171,15 +170,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; @@ -250,6 +248,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(); }