1 files changed, 12 insertions, 14 deletions

diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
index 1e4b9102..b16d9f79 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
@@ -4,7 +4,6 @@ import android.app.PendingIntent;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.PowerManager;
-import android.util.Log;
 import android.util.Pair;
 
 import java.io.FileNotFoundException;
@@ -12,14 +11,15 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
 import java.net.MalformedURLException;
-import java.net.Proxy;
 import java.net.URL;
 
 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;
@@ -95,13 +95,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
@@ -162,7 +162,7 @@ public class HttpUploadConnection implements Transferable {
 			PowerManager.WakeLock wakeLock = mHttpConnectionManager.createWakeLock("http_upload_"+message.getUuid());
 			try {
 				wakeLock.acquire();
-				Log.d(Config.LOGTAG, "uploading to " + mPutUrl.toString());
+				Logging.d(Config.LOGTAG, "uploading to " + mPutUrl.toString());
 				if (mUseTor) {
 					connection = (HttpURLConnection) mPutUrl.openConnection(mHttpConnectionManager.getProxy());
 				} else {
@@ -174,7 +174,7 @@ public class HttpUploadConnection implements Transferable {
 				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();
@@ -191,11 +191,11 @@ 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);
+					MessageUtil.updateFileParams(message, mGetUrl);
 					Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
 					intent.setData(Uri.fromFile(file));
 					mXmppConnectionService.sendBroadcast(intent);
@@ -225,12 +225,10 @@ public class HttpUploadConnection implements Transferable {
 					fail();
 				}
 			} catch (IOException e) {
-				e.printStackTrace();
-				Log.d(Config.LOGTAG,"http upload failed "+e.getMessage());
+				Logging.d(Config.LOGTAG, e.getMessage());
 				fail();
 			} finally {
-				FileBackend.close(mFileInputStream);
-				FileBackend.close(os);
+				StreamUtil.close(os);
 				if (connection != null) {
 					connection.disconnect();
 				}