1 files changed, 26 insertions, 20 deletions

diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
index e337509b..2cd59296 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
@@ -2,7 +2,6 @@ package eu.siacs.conversations.http;
 
 import android.app.PendingIntent;
 import android.os.PowerManager;
-import android.util.Log;
 import android.util.Pair;
 
 import java.io.FileNotFoundException;
@@ -12,9 +11,14 @@ import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Scanner;
 
 import javax.net.ssl.HttpsURLConnection;
 
+import de.thedevstack.android.logcat.Logging;
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
+import de.thedevstack.conversationsplus.utils.StreamUtil;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.DownloadableFile;
@@ -44,7 +48,6 @@ public class HttpUploadConnection implements Transferable {
 	private String mime;
 	private URL mGetUrl;
 	private URL mPutUrl;
-	private boolean mUseTor = false;
 
 	private byte[] key = null;
 
@@ -55,7 +58,6 @@ public class HttpUploadConnection implements Transferable {
 	public HttpUploadConnection(HttpConnectionManager httpConnectionManager) {
 		this.mHttpConnectionManager = httpConnectionManager;
 		this.mXmppConnectionService = httpConnectionManager.getXmppConnectionService();
-		this.mUseTor = mXmppConnectionService.useTorToConnect();
 	}
 
 	@Override
@@ -90,13 +92,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
@@ -153,23 +155,21 @@ public class HttpUploadConnection implements Transferable {
 
 		private void upload() {
 			OutputStream os = null;
+            InputStream errorStream = null;
 			HttpURLConnection connection = null;
 			PowerManager.WakeLock wakeLock = mHttpConnectionManager.createWakeLock("http_upload_"+message.getUuid());
 			try {
 				wakeLock.acquire();
-				Log.d(Config.LOGTAG, "uploading to " + mPutUrl.toString());
-				if (mUseTor) {
-					connection = (HttpURLConnection) mPutUrl.openConnection(mHttpConnectionManager.getProxy());
-				} else {
-					connection = (HttpURLConnection) mPutUrl.openConnection();
-				}
-				if (connection instanceof HttpsURLConnection) {
+				Logging.d(Config.LOGTAG, "uploading to " + mPutUrl.toString());
+				connection = (HttpURLConnection) mPutUrl.openConnection();
+
+                if (connection instanceof HttpsURLConnection) {
 					mHttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, true);
 				}
 				connection.setRequestMethod("PUT");
 				connection.setFixedLengthStreamingMode((int) file.getExpectedSize());
 				connection.setRequestProperty("Content-Type", mime == null ? "application/octet-stream" : mime);
-				connection.setRequestProperty("User-Agent",mXmppConnectionService.getIqGenerator().getIdentityName());
+				connection.setRequestProperty("User-Agent", ConversationsPlusApplication.getNameAndVersion());
 				connection.setDoOutput(true);
 				connection.connect();
 				os = connection.getOutputStream();
@@ -186,12 +186,12 @@ public class HttpUploadConnection implements Transferable {
 				mFileInputStream.close();
 				int code = connection.getResponseCode();
 				if (code == 200 || code == 201) {
-					Log.d(Config.LOGTAG, "finished uploading file");
+					Logging.d(Config.LOGTAG, "finished uploading file");
 					if (key != null) {
 						mGetUrl = new URL(mGetUrl.toString() + "#" + CryptoHelper.bytesToHex(key));
 					}
-					mXmppConnectionService.getFileBackend().updateFileParams(message, mGetUrl);
-					mXmppConnectionService.getFileBackend().updateMediaScanner(file);
+					MessageUtil.updateFileParams(message, mGetUrl);
+					FileBackend.updateMediaScanner(file, mXmppConnectionService);
 					message.setTransferable(null);
 					message.setCounterpart(message.getConversation().getJid().toBareJid());
 					if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
@@ -215,15 +215,21 @@ public class HttpUploadConnection implements Transferable {
 						mXmppConnectionService.resendMessage(message, delayed);
 					}
 				} else {
+                    errorStream = connection.getErrorStream();
+                    Logging.e("httpupload", "file upload failed: http code (" + code + ") " + new Scanner(errorStream).useDelimiter("\\A").next());
 					fail();
 				}
 			} catch (IOException e) {
-				e.printStackTrace();
-				Log.d(Config.LOGTAG,"http upload failed "+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 {
-				FileBackend.close(mFileInputStream);
-				FileBackend.close(os);
+				StreamUtil.close(os);
+                StreamUtil.close(errorStream);
 				if (connection != null) {
 					connection.disconnect();
 				}