5 files changed, 67 insertions, 14 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpFileUploader.java b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpFileUploader.java
index 8cae599c..73c18f15 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpFileUploader.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpFileUploader.java
@@ -2,23 +2,32 @@ package de.thedevstack.conversationsplus.services.filetransfer.http.upload;
 
 import android.os.PowerManager;
 
+import org.apache.http.conn.ssl.StrictHostnameVerifier;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.UnknownHostException;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
 import java.util.Scanner;
 
+import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.X509TrustManager;
 
 import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.entities.DownloadableFile;
 import de.thedevstack.conversationsplus.entities.Message;
-import de.thedevstack.conversationsplus.http.HttpConnectionManager;
 import de.thedevstack.conversationsplus.persistance.FileBackend;
 import de.thedevstack.conversationsplus.services.filetransfer.FileTransferFailureReason;
+import de.thedevstack.conversationsplus.utils.CryptoHelper;
+import de.thedevstack.conversationsplus.utils.SSLSocketHelper;
 import de.thedevstack.conversationsplus.utils.StreamUtil;
 import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
 import de.thedevstack.conversationsplus.utils.XmppConnectionServiceAccessor;
@@ -29,9 +38,9 @@ public class HttpFileUploader implements Runnable {
     private static final String MIME_REQUEST_PROPERTY_NAME = "Content-Type";
     private static final String USER_AGENT_REQUEST_PROPERTY_NAME = "User-Agent";
     private static final int BUFFER_LENGTH = 4096;
-    private final HttpFileTransferEntity entity;
+    private final HttpUploadFileTransferEntity entity;
 
-    public HttpFileUploader(HttpFileTransferEntity entity) {
+    public HttpFileUploader(HttpUploadFileTransferEntity entity) {
         this.entity = entity;
     }
 
@@ -55,7 +64,7 @@ public class HttpFileUploader implements Runnable {
             connection = (HttpURLConnection) putUrl.openConnection();
 
             if (connection instanceof HttpsURLConnection) {
-                HttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, true);
+                setupTrustManager((HttpsURLConnection) connection, true);
             }
             connection.setRequestMethod(HTTP_METHOD);
             connection.setFixedLengthStreamingMode((int) file.getExpectedSize());
@@ -147,4 +156,37 @@ public class HttpFileUploader implements Runnable {
         }
         return httpResponseMessage;
     }
+
+    public static void setupTrustManager(final HttpsURLConnection connection, final boolean interactive) {
+        final X509TrustManager trustManager;
+        final HostnameVerifier hostnameVerifier;
+        if (interactive) {
+            trustManager = ConversationsPlusApplication.getMemorizingTrustManager();
+            hostnameVerifier = ConversationsPlusApplication.getMemorizingTrustManager().wrapHostnameVerifier(
+                    new StrictHostnameVerifier());
+        } else {
+            trustManager = ConversationsPlusApplication.getMemorizingTrustManager()
+                    .getNonInteractive();
+            hostnameVerifier = ConversationsPlusApplication.getMemorizingTrustManager()
+                    .wrapHostnameVerifierNonInteractive(
+                            new StrictHostnameVerifier());
+        }
+        try {
+            final SSLContext sc = SSLSocketHelper.getSSLContext();
+            sc.init(null, new X509TrustManager[]{trustManager},
+                    ConversationsPlusApplication.getSecureRandom());
+
+            final SSLSocketFactory sf = sc.getSocketFactory();
+            final String[] cipherSuites = CryptoHelper.getOrderedCipherSuites(
+                    sf.getSupportedCipherSuites());
+            if (cipherSuites.length > 0) {
+                sc.getDefaultSSLParameters().setCipherSuites(cipherSuites);
+
+            }
+
+            connection.setSSLSocketFactory(sf);
+            connection.setHostnameVerifier(hostnameVerifier);
+        } catch (final KeyManagementException | NoSuchAlgorithmException ignored) {
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpFileTransferEntity.java b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadFileTransferEntity.java
index 985dafcb..54186983 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpFileTransferEntity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadFileTransferEntity.java
@@ -18,15 +18,15 @@ import de.thedevstack.conversationsplus.xmpp.filetransfer.http.upload.HttpUpload
 /**
  *
  */
-public class HttpFileTransferEntity extends FileTransferEntity {
+public class HttpUploadFileTransferEntity extends FileTransferEntity {
     private HttpUploadSlot slot;
     private final byte[] key;
     private final boolean delayed;
 
-    public HttpFileTransferEntity(Message message, boolean delayed) {
-        super(message);
+    public HttpUploadFileTransferEntity(Message message, boolean delayed) {
+        super(message, true);
         this.getMessage().setHttpUploaded(true);
-        this.getMessage().setNoDownloadable(); // TODO Set rmeote file status to uploaded
+        this.getMessage().setNoDownloadable();
         FileParams fileParams = this.getMessage().getFileParams();
         if (null == fileParams) {
             fileParams = new FileParams();
@@ -45,6 +45,17 @@ public class HttpFileTransferEntity extends FileTransferEntity {
         this.delayed = delayed;
     }
 
+    /**
+     * Returns the global transferable status.
+     *
+     * @return {@value STATUS_FAILED} if #isFailed returns <code>true</code>, {@value STATUS_UPLOADING} otherwise
+     */
+    @Override
+    public int getStatus() {
+        int status = (isFailed()) ? STATUS_FAILED : STATUS_UPLOADING;
+        return status;
+    }
+
     public void setSlot(HttpUploadSlot slot) {
         this.slot = slot;
     }
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadFileTransferService.java b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadFileTransferService.java
index f0bb438d..c2e92a9e 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadFileTransferService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadFileTransferService.java
@@ -9,7 +9,6 @@ import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.entities.DownloadableFile;
 import de.thedevstack.conversationsplus.entities.Message;
-import de.thedevstack.conversationsplus.persistance.FileBackend;
 import de.thedevstack.conversationsplus.services.AbstractConnectionManager;
 import de.thedevstack.conversationsplus.services.FileTransferService;
 import de.thedevstack.conversationsplus.services.filetransfer.AbstractFileTransferService;
@@ -53,7 +52,7 @@ public class HttpUploadFileTransferService extends AbstractFileTransferService i
         Logging.d("httpupload", "Starting to upload file");
         boolean started = false;
         try {
-            final HttpFileTransferEntity entity = new HttpFileTransferEntity(message, delay);
+            final HttpUploadFileTransferEntity entity = new HttpUploadFileTransferEntity(message, delay);
             this.addStatusListenerToEntity(entity);
             entity.startAttempt();
             Account account = message.getConversation().getAccount();
@@ -99,6 +98,7 @@ public class HttpUploadFileTransferService extends AbstractFileTransferService i
                 && null != message.getConversation()
                 && null != message.getConversation().getAccount()
                 && null != message.getFileParams()
+                && message.needsUploading()
                 && AccountUtil.isHttpUploadAvailable(message.getConversation().getAccount(), message.getFileParams().getSize());
     }
 }
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadSlotRequestReceived.java b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadSlotRequestReceived.java
index 2687878d..022aedcf 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadSlotRequestReceived.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadSlotRequestReceived.java
@@ -13,9 +13,9 @@ import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
  *
  */
 public class HttpUploadSlotRequestReceived implements OnIqPacketReceived {
-    private final HttpFileTransferEntity entity;
+    private final HttpUploadFileTransferEntity entity;
 
-    public HttpUploadSlotRequestReceived(HttpFileTransferEntity entity) {
+    public HttpUploadSlotRequestReceived(HttpUploadFileTransferEntity entity) {
         this.entity = entity;
     }
 
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadedFileEncryptionUiCallback.java b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadedFileEncryptionUiCallback.java
index f363a675..dc36851f 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadedFileEncryptionUiCallback.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/filetransfer/http/upload/HttpUploadedFileEncryptionUiCallback.java
@@ -11,9 +11,9 @@ import de.thedevstack.conversationsplus.utils.XmppConnectionServiceAccessor;
  *
  */
 public class HttpUploadedFileEncryptionUiCallback implements UiCallback<Message> {
-    private final HttpFileTransferEntity entity;
+    private final HttpUploadFileTransferEntity entity;
 
-    public HttpUploadedFileEncryptionUiCallback(HttpFileTransferEntity entity) {
+    public HttpUploadedFileEncryptionUiCallback(HttpUploadFileTransferEntity entity) {
         this.entity = entity;
     }