FileTransfer reworked (first steps - functionality as is), HttpUpload

separated, some bugfixes
- HttpUpload moved into own package
- FileTransfer managed by a central manager class, several
  FileTransferService implementation can be used
  - Security initializations moved to ConversationsPlusApplication
  - Access to PowerManager moved to ConversationsPlusApplication
  - Removed unused code fragments
  - Access to HttpConnectionManager is now static

3 files changed, 48 insertions, 48 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java
index 59c54662..529d12c4 100644
--- a/src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java
+++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java
@@ -17,6 +17,7 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.X509TrustManager;
 
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.services.AbstractConnectionManager;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
@@ -24,29 +25,23 @@ import de.thedevstack.conversationsplus.utils.CryptoHelper;
 import de.thedevstack.conversationsplus.utils.SSLSocketHelper;
 
 public class HttpConnectionManager extends AbstractConnectionManager {
+	private static HttpConnectionManager INSTANCE;
 
-	public HttpConnectionManager(XmppConnectionService service) {
-		super(service);
-	}
+    public static void init() {
+        INSTANCE = new HttpConnectionManager();
+    }
 
 	private List<HttpDownloadConnection> downloadConnections = new CopyOnWriteArrayList<>();
 	private List<HttpUploadConnection> uploadConnections = new CopyOnWriteArrayList<>();
 
-	public HttpDownloadConnection createNewDownloadConnection(Message message) {
-		return this.createNewDownloadConnection(message, false);
+	public static HttpDownloadConnection createNewDownloadConnection(Message message) {
+		return createNewDownloadConnection(message, false);
 	}
 
-	public HttpDownloadConnection createNewDownloadConnection(Message message, boolean interactive) {
-		HttpDownloadConnection connection = new HttpDownloadConnection(this);
+	public static HttpDownloadConnection createNewDownloadConnection(Message message, boolean interactive) {
+		HttpDownloadConnection connection = new HttpDownloadConnection(INSTANCE);
 		connection.init(message,interactive);
-		this.downloadConnections.add(connection);
-		return connection;
-	}
-
-	public HttpUploadConnection createNewUploadConnection(Message message, boolean delay) {
-		HttpUploadConnection connection = new HttpUploadConnection(this);
-		connection.init(message,delay);
-		this.uploadConnections.add(connection);
+		INSTANCE.downloadConnections.add(connection);
 		return connection;
 	}
 
@@ -58,26 +53,24 @@ public class HttpConnectionManager extends AbstractConnectionManager {
 		this.uploadConnections.remove(httpUploadConnection);
 	}
 
-	public void setupTrustManager(final HttpsURLConnection connection, final boolean interactive) {
+	public static void setupTrustManager(final HttpsURLConnection connection, final boolean interactive) {
 		final X509TrustManager trustManager;
 		final HostnameVerifier hostnameVerifier;
 		if (interactive) {
-			trustManager = mXmppConnectionService.getMemorizingTrustManager();
-			hostnameVerifier = mXmppConnectionService
-					.getMemorizingTrustManager().wrapHostnameVerifier(
+			trustManager = ConversationsPlusApplication.getMemorizingTrustManager();
+			hostnameVerifier = ConversationsPlusApplication.getMemorizingTrustManager().wrapHostnameVerifier(
 							new StrictHostnameVerifier());
 		} else {
-			trustManager = mXmppConnectionService.getMemorizingTrustManager()
+			trustManager = ConversationsPlusApplication.getMemorizingTrustManager()
 					.getNonInteractive();
-			hostnameVerifier = mXmppConnectionService
-					.getMemorizingTrustManager()
+			hostnameVerifier = ConversationsPlusApplication.getMemorizingTrustManager()
 					.wrapHostnameVerifierNonInteractive(
 							new StrictHostnameVerifier());
 		}
 		try {
 			final SSLContext sc = SSLSocketHelper.getSSLContext();
 			sc.init(null, new X509TrustManager[]{trustManager},
-					mXmppConnectionService.getRNG());
+					ConversationsPlusApplication.getSecureRandom());
 
 			final SSLSocketFactory sf = sc.getSocketFactory();
 			final String[] cipherSuites = CryptoHelper.getOrderedCipherSuites(
diff --git a/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
index 424dc96a..3facc14a 100644
--- a/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
@@ -32,6 +32,7 @@ import de.thedevstack.conversationsplus.services.AbstractConnectionManager;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.utils.CryptoHelper;
 import de.thedevstack.conversationsplus.utils.FileUtils;
+import de.thedevstack.conversationsplus.utils.XmppConnectionServiceAccessor;
 
 public class HttpDownloadConnection implements Transferable {
 
@@ -48,7 +49,7 @@ public class HttpDownloadConnection implements Transferable {
 
 	public HttpDownloadConnection(HttpConnectionManager manager) {
 		this.mHttpConnectionManager = manager;
-		this.mXmppConnectionService = manager.getXmppConnectionService();
+		this.mXmppConnectionService = XmppConnectionServiceAccessor.xmppConnectionService;
 	}
 
 	@Override
@@ -265,7 +266,7 @@ public class HttpDownloadConnection implements Transferable {
 
 		private void download() throws SSLHandshakeException, IOException {
             InputStream is = null;
-            PowerManager.WakeLock wakeLock = mHttpConnectionManager.createWakeLock("http_download_"+message.getUuid());
+            PowerManager.WakeLock wakeLock = ConversationsPlusApplication.createPartialWakeLock("http_download_"+message.getUuid());
             try {
                 wakeLock.acquire();
                 HttpURLConnection connection = (HttpURLConnection) mUrl.openConnection();
diff --git a/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
index 231a6ca7..7c791e70 100644
--- a/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
@@ -30,11 +30,21 @@ import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.ui.UiCallback;
 import de.thedevstack.conversationsplus.utils.CryptoHelper;
 import de.thedevstack.conversationsplus.utils.Xmlns;
+import de.thedevstack.conversationsplus.utils.XmppConnectionServiceAccessor;
 import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived;
+import de.thedevstack.conversationsplus.xmpp.exceptions.MissingRequiredContentException;
+import de.thedevstack.conversationsplus.xmpp.exceptions.MissingRequiredElementException;
+import de.thedevstack.conversationsplus.xmpp.exceptions.XmppException;
+import de.thedevstack.conversationsplus.xmpp.httpupload.HttpUpload;
+import de.thedevstack.conversationsplus.xmpp.httpupload.HttpUploadRequestSlotPacketGenerator;
+import de.thedevstack.conversationsplus.xmpp.httpupload.HttpUploadSlot;
+import de.thedevstack.conversationsplus.xmpp.httpupload.SlotPacketParser;
+import de.thedevstack.conversationsplus.xmpp.httpupload.SlotRequestPacket;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 
+@Deprecated
 public class HttpUploadConnection implements Transferable {
 
 	private HttpConnectionManager mHttpConnectionManager;
@@ -57,7 +67,7 @@ public class HttpUploadConnection implements Transferable {
 
 	public HttpUploadConnection(HttpConnectionManager httpConnectionManager) {
 		this.mHttpConnectionManager = httpConnectionManager;
-		this.mXmppConnectionService = httpConnectionManager.getXmppConnectionService();
+		this.mXmppConnectionService = XmppConnectionServiceAccessor.xmppConnectionService;
 	}
 
 	@Override
@@ -107,7 +117,7 @@ public class HttpUploadConnection implements Transferable {
 				|| message.getEncryption() == Message.ENCRYPTION_AXOLOTL
 				|| message.getEncryption() == Message.ENCRYPTION_OTR) {
 			this.key = new byte[48];
-			mXmppConnectionService.getRNG().nextBytes(this.key);
+            ConversationsPlusApplication.getSecureRandom().nextBytes(this.key);
 			this.file.setKeyAndIv(this.key);
 		}
 		Pair<InputStream,Integer> pair;
@@ -119,29 +129,25 @@ public class HttpUploadConnection implements Transferable {
 		}
 		this.file.setExpectedSize(pair.second);
 		this.mFileInputStream = pair.first;
-		Jid host = account.getXmppConnection().findDiscoItemByFeature(Xmlns.HTTP_UPLOAD);
-		IqPacket request = mXmppConnectionService.getIqGenerator().requestHttpUploadSlot(host,file,mime);
+		Jid host = account.getXmppConnection().findDiscoItemByFeature(HttpUpload.NAMESPACE);
+        IqPacket request = HttpUploadRequestSlotPacketGenerator.generate(host, file.getName(), file.getSize(), mime);
 		mXmppConnectionService.sendIqPacket(account, request, new OnIqPacketReceived() {
 			@Override
 			public void onIqPacketReceived(Account account, IqPacket packet) {
-				if (packet.getType() == IqPacket.TYPE.RESULT) {
-					Element slot = packet.findChild("slot",Xmlns.HTTP_UPLOAD);
-					if (slot != null) {
-						try {
-							mGetUrl = new URL(slot.findChildContent("get"));
-							mPutUrl = new URL(slot.findChildContent("put"));
-							if (!canceled) {
-								new Thread(new FileUploader()).start();
-							}
-						} catch (MalformedURLException e) {
-							fail();
-						}
-					} else {
-						fail();
-					}
-				} else {
-					fail();
-				}
+                try {
+                    HttpUploadSlot slot = SlotPacketParser.parseGetAndPutUrl(packet);
+                    mGetUrl = new URL(slot.getGetUrl());
+                    mPutUrl = new URL(slot.getPutUrl());
+                    if (!canceled) {
+                        new Thread(new FileUploader()).start();
+                    }
+                } catch (XmppException e) {
+                    Logging.e("httpupload", e.getMessage());
+                    fail();
+                } catch (MalformedURLException e) {
+                    Logging.e("httpupload", "malformed url retrieved from slot", e);
+                    fail();
+                }
 			}
 		});
 		message.setTransferable(this);
@@ -159,7 +165,7 @@ public class HttpUploadConnection implements Transferable {
 			OutputStream os = null;
             InputStream errorStream = null;
 			HttpURLConnection connection = null;
-			PowerManager.WakeLock wakeLock = mHttpConnectionManager.createWakeLock("http_upload_"+message.getUuid());
+			PowerManager.WakeLock wakeLock = ConversationsPlusApplication.createPartialWakeLock("http_upload_"+message.getUuid());
 			try {
 				wakeLock.acquire();
 				Logging.d(Config.LOGTAG, "uploading to " + mPutUrl.toString());