Merge remote-tracking branch 'refs/remotes/siacs/master'

1 files changed, 12 insertions, 2 deletions

diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
index c7d68de16..4ec31c915 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
@@ -146,12 +146,18 @@ public class HttpDownloadConnection implements Transferable {
 		mXmppConnectionService.updateConversationUi();
 	}
 
+	private class WriteException extends IOException {
+
+	}
+
 	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 WriteException) {
+			mXmppConnectionService.showErrorToastInUi(R.string.download_failed_could_not_write_file);
 		} else if (!(e instanceof  CancellationException)) {
 			mXmppConnectionService.showErrorToastInUi(R.string.download_failed_file_not_found);
 		}
@@ -293,11 +299,15 @@ public class HttpDownloadConnection implements Transferable {
 					file.createNewFile();
 					os = AbstractConnectionManager.createOutputStream(file, true);
 				}
-				int count = -1;
+				int count;
 				byte[] buffer = new byte[1024];
 				while ((count = is.read(buffer)) != -1) {
 					transmitted += count;
-					os.write(buffer, 0, count);
+					try {
+						os.write(buffer, 0, count);
+					} catch (IOException e) {
+						throw new WriteException();
+					}
 					updateProgress((int) ((((double) transmitted) / expected) * 100));
 					if (canceled) {
 						throw new CancellationException();