From 8838a5094812e0540ccfef3334e49e1a5c1a564b Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Fri, 6 Nov 2015 20:23:43 +0100
Subject: FileBackend splitted into several util classes for separate concerns:
 AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.

---
 .../conversationsplus/http/HttpDownloadConnection.java           | 5 +++--
 .../thedevstack/conversationsplus/http/HttpUploadConnection.java | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/http')

diff --git a/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
index b7f3cc67..b958e57e 100644
--- a/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
@@ -22,6 +22,7 @@ import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.Transferable;
 import de.thedevstack.conversationsplus.entities.DownloadableFile;
 import de.thedevstack.conversationsplus.entities.Message;
+import de.thedevstack.conversationsplus.persistance.FileBackend;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.utils.CryptoHelper;
 
@@ -81,7 +82,7 @@ public class HttpDownloadConnection implements Transferable {
 				extension = lastPart;
 			}
 			message.setRelativeFilePath(message.getUuid()+"."+extension);
-			this.file = mXmppConnectionService.getFileBackend().getFile(message, false);
+			this.file = FileBackend.getFile(message, false);
 			String reference = mUrl.getRef();
 			if (reference != null && reference.length() == 96) {
 				this.file.setKey(CryptoHelper.hexToBytes(reference));
@@ -235,7 +236,7 @@ public class HttpDownloadConnection implements Transferable {
 
 		private void updateImageBounds() {
 			message.setType(Message.TYPE_FILE);
-			mXmppConnectionService.getFileBackend().updateFileParams(message, mUrl);
+			FileBackend.updateFileParams(message, mUrl);
 			mXmppConnectionService.updateMessage(message);
 		}
 
diff --git a/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
index a9682718..05d3a129 100644
--- a/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
@@ -21,6 +21,7 @@ import de.thedevstack.conversationsplus.persistance.FileBackend;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.ui.UiCallback;
 import de.thedevstack.conversationsplus.utils.CryptoHelper;
+import de.thedevstack.conversationsplus.utils.StreamUtil;
 import de.thedevstack.conversationsplus.utils.Xmlns;
 import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived;
@@ -85,7 +86,7 @@ public class HttpUploadConnection implements Transferable {
 		message.setTransferable(this);
 		mXmppConnectionService.markMessage(message,Message.STATUS_UNSEND);
 		this.account = message.getConversation().getAccount();
-		this.file = mXmppConnectionService.getFileBackend().getFile(message, false);
+		this.file = FileBackend.getFile(message, false);
 		this.file.setExpectedSize(this.file.getSize());
 
 		if (Config.ENCRYPT_ON_HTTP_UPLOADED) {
@@ -163,7 +164,7 @@ public class HttpUploadConnection implements Transferable {
 					if (key != null) {
 						mGetUrl = new URL(mGetUrl.toString() + "#" + CryptoHelper.bytesToHex(key));
 					}
-					mXmppConnectionService.getFileBackend().updateFileParams(message, mGetUrl);
+					FileBackend.updateFileParams(message, mGetUrl);
 					message.setTransferable(null);
 					message.setCounterpart(message.getConversation().getJid().toBareJid());
 					if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
@@ -193,8 +194,8 @@ public class HttpUploadConnection implements Transferable {
 				Log.d(Config.LOGTAG, e.getMessage());
 				fail();
 			} finally {
-				FileBackend.close(is);
-				FileBackend.close(os);
+				StreamUtil.close(is);
+				StreamUtil.close(os);
 				if (connection != null) {
 					connection.disconnect();
 				}
-- 
cgit v1.2.3