diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-02-11 22:36:17 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-02-11 22:40:48 +0100 |
commit | 9c87e2269cc1d427fab42047cd8993b6bfb07b6f (patch) | |
tree | cff8d8c37e416b43c8eb84216116883bdf1655fa /src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java | |
parent | d38b3c2cf2134738781da626fa7ed49046c9a00f (diff) |
Compilation errors and merge mixups fixed
Diffstat (limited to 'src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java index 553988ae..6d1ea732 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java @@ -99,13 +99,13 @@ public class HttpUploadConnection implements Transferable { mHttpConnectionManager.finishUploadConnection(this); message.setTransferable(null); mXmppConnectionService.markMessage(message, Message.STATUS_SEND_FAILED); - FileBackend.close(mFileInputStream); + StreamUtil.close(mFileInputStream); } public void init(Message message, boolean delay) { this.message = message; this.account = message.getConversation().getAccount(); - this.file = mXmppConnectionService.getFileBackend().getFile(message, false); + this.file = FileBackend.getFile(message, false); this.mime = this.file.getMimeType(); this.delayed = delay; if (Config.ENCRYPT_ON_HTTP_UPLOADED @@ -232,7 +232,6 @@ public class HttpUploadConnection implements Transferable { Logging.d(Config.LOGTAG, e.getMessage()); fail(); } finally { - StreamUtil.close(is); StreamUtil.close(os); if (connection != null) { connection.disconnect(); |