Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

1 files changed, 7 insertions, 2 deletions

diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
index e236cdc0..94347985 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
@@ -97,6 +97,7 @@ public class HttpUploadConnection implements Transferable {
 
 	public void init(Message message, boolean delay) {
 		this.message = message;
+		this.message.setHttpUploaded(true);
 		this.account = message.getConversation().getAccount();
 		this.file = FileBackend.getFile(message, false);
 		this.mime = this.file.getMimeType();
@@ -220,8 +221,12 @@ public class HttpUploadConnection implements Transferable {
 					fail();
 				}
 			} catch (IOException e) {
-                errorStream = connection.getErrorStream();
-                Logging.e("httpupload", "http response: " + new Scanner(errorStream).useDelimiter("\\A").next() + ", exception message: " + e.getMessage());
+                errorStream = (null != connection) ? connection.getErrorStream() : null;
+                String httpResponseMessage = null;
+                if (null != errorStream) {
+                    httpResponseMessage = new Scanner(errorStream).useDelimiter("\\A").next();
+                }
+                Logging.e("httpupload", ((null != httpResponseMessage) ? ("http response: " + httpResponseMessage + ", ") : "") + "exception message: " + e.getMessage());
 				fail();
 			} finally {
 				StreamUtil.close(os);