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

1 files changed, 5 insertions, 7 deletions

diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
index a3bcbb386..01a9002e7 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
@@ -313,16 +313,14 @@ public class HttpDownloadConnection implements Transferable {
 						throw new CancellationException();
 					}
 				}
+				try {
+					os.flush();
+				} catch (IOException e) {
+					throw new WriteException();
+				}
 			} catch (CancellationException | IOException e) {
 				throw e;
 			} finally {
-				if (os != null) {
-					try {
-						os.flush();
-					} catch (final IOException ignored) {
-
-					}
-				}
 				FileBackend.close(os);
 				FileBackend.close(is);
 				wakeLock.release();